Compare commits
No commits in common. "04d2e47882c4b4ee76e7040e7458dde28087b619" and "ea2de754154373662a09d532041a461bf301addf" have entirely different histories.
04d2e47882
...
ea2de75415
|
@ -96,7 +96,6 @@ function createMainWindow() {
|
||||||
frame: false, // 无边框
|
frame: false, // 无边框
|
||||||
autoHideMenuBar: true,
|
autoHideMenuBar: true,
|
||||||
maximizable: false,
|
maximizable: false,
|
||||||
fullscreen: true,
|
|
||||||
icon: join(__dirname, '../../resources/logo2.ico'),
|
icon: join(__dirname, '../../resources/logo2.ico'),
|
||||||
...(process.platform === 'linux' ? { icon } : {}),
|
...(process.platform === 'linux' ? { icon } : {}),
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
|
|
|
@ -15,11 +15,10 @@
|
||||||
<!-- 标题 -->
|
<!-- 标题 -->
|
||||||
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
|
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
|
||||||
<el-col :span="12" style="padding-left: 20px; text-align: left;">
|
<el-col :span="12" style="padding-left: 20px; text-align: left;">
|
||||||
<!-- <div class="unit-top-left" @click="isCollapse = !isCollapse"> -->
|
<div class="unit-top-left" @click="isCollapse = !isCollapse">
|
||||||
<div class="unit-top-left">
|
<i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
|
||||||
<!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
|
<span>课程目录</span>
|
||||||
<span>作业布置</span>
|
<i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
|
||||||
<!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
|
@ -908,6 +907,7 @@ watch(() => courseObj.node, (newVal,oldVal) => {
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
}
|
}
|
||||||
.unit-top-left {
|
.unit-top-left {
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
.icon-xiangzuo {
|
.icon-xiangzuo {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<template #header>
|
<template #header>
|
||||||
<div style="font-size: 18px; display: flex; flex-wrap: nowrap">
|
<div style="font-size: 18px; display: flex; flex-wrap: nowrap">
|
||||||
<div style="flex: 1">
|
<div style="flex: 1">
|
||||||
{{ classWorkAnalysis.title }}完成情况
|
{{ classWorkAnalysis.title }}答题情况
|
||||||
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
|
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
|
||||||
classWorkAnalysis.worktype
|
classWorkAnalysis.worktype
|
||||||
}}</el-tag>
|
}}</el-tag>
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
||||||
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
|
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
|
||||||
@click="handleClassOverviewOpen('report')"
|
@click="handleClassOverviewOpen('report')"
|
||||||
>训练报告</el-button
|
>整体分析</el-button
|
||||||
>
|
>
|
||||||
</el-button-group>
|
</el-button-group>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -146,7 +146,7 @@
|
||||||
<quiz-stats :active-data="classWorkActiveData" />
|
<quiz-stats :active-data="classWorkActiveData" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 训练报告-->
|
<!-- 整体分析-->
|
||||||
<div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll">
|
<div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll">
|
||||||
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
|
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
|
||||||
<ClassOverview :table-list="overviewData"></ClassOverview>
|
<ClassOverview :table-list="overviewData"></ClassOverview>
|
||||||
|
@ -217,7 +217,7 @@ const classWorkAnalysisScore = reactive({
|
||||||
// }
|
// }
|
||||||
// )
|
// )
|
||||||
const openDialog = (data) => {
|
const openDialog = (data) => {
|
||||||
console.log(data, '点击的item完成情况')
|
console.log(data, '点击的item答题情况')
|
||||||
|
|
||||||
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
|
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
|
||||||
classWorkAnalysis.worktype = data.worktype
|
classWorkAnalysis.worktype = data.worktype
|
||||||
|
@ -467,7 +467,7 @@ const getStudentClassWorkDataDetail = (row) => {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
console.log('获取完成情况失败')
|
console.log('获取答题情况失败')
|
||||||
ElMessage({
|
ElMessage({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
message: '未获取到答题信息!'
|
message: '未获取到答题信息!'
|
||||||
|
@ -479,7 +479,7 @@ const onClassWorkScoreSubmit = () => {
|
||||||
console.log('批改后返回的方法')
|
console.log('批改后返回的方法')
|
||||||
loading_dt_table.value = true
|
loading_dt_table.value = true
|
||||||
isopen_dtwk_table.value = false
|
isopen_dtwk_table.value = false
|
||||||
// 1、清空完成情况的两个table数据,- 左侧学生列表:classWorkAnalysis.classworkdata;- 右侧学生回答题目列表:classWorkAnalysis.activeStudentQuizlist
|
// 1、清空答题情况的两个table数据,- 左侧学生列表:classWorkAnalysis.classworkdata;- 右侧学生回答题目列表:classWorkAnalysis.activeStudentQuizlist
|
||||||
// - 左侧学生列表
|
// - 左侧学生列表
|
||||||
classWorkAnalysis.classworkdata = []
|
classWorkAnalysis.classworkdata = []
|
||||||
classWorkAnalysis.activeStudentQuizlist = []
|
classWorkAnalysis.activeStudentQuizlist = []
|
||||||
|
@ -571,11 +571,11 @@ const getWorkFeedList = async() =>{
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
//#regin 训练报告
|
//#regin 整体分析
|
||||||
/*
|
/*
|
||||||
author: yangws
|
author: yangws
|
||||||
time: 2024-8-06 16:35:33
|
time: 2024-8-06 16:35:33
|
||||||
function: 训练报告的处理
|
function: 整体分析的处理
|
||||||
*/
|
*/
|
||||||
const handleClassOverviewOpen = (type) =>{
|
const handleClassOverviewOpen = (type) =>{
|
||||||
// 关闭右侧批阅ui
|
// 关闭右侧批阅ui
|
||||||
|
|
|
@ -351,8 +351,7 @@ let classWorkForm = reactive({
|
||||||
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
|
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
|
||||||
}); // 提交的作业内容
|
}); // 提交的作业内容
|
||||||
// ---------------------------------------------------
|
// ---------------------------------------------------
|
||||||
// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
|
const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
|
||||||
const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型
|
|
||||||
|
|
||||||
// 课堂展示-------
|
// 课堂展示-------
|
||||||
const boardLoading = ref(false);
|
const boardLoading = ref(false);
|
||||||
|
|
|
@ -279,7 +279,7 @@ const getStudentName = id => studentList.value.length && (studentList.value.find
|
||||||
// 获取-选中题
|
// 获取-选中题
|
||||||
const getActive = ind => activeTopic.value != ind
|
const getActive = ind => activeTopic.value != ind
|
||||||
|
|
||||||
// 完成情况-点击题
|
// 答题情况-点击题
|
||||||
const clickInfo = async ind => {
|
const clickInfo = async ind => {
|
||||||
activeTopic.value = activeTopic.value != ind ? ind : 0
|
activeTopic.value = activeTopic.value != ind ? ind : 0
|
||||||
setTimeout(() => {scrollToElement('collapse-' + ind)}, 300);
|
setTimeout(() => {scrollToElement('collapse-' + ind)}, 300);
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
<!-- 标题 -->
|
<!-- 标题 -->
|
||||||
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
|
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
|
||||||
<el-col :span="12" style="padding-left: 20px; text-align: left;">
|
<el-col :span="12" style="padding-left: 20px; text-align: left;">
|
||||||
<div v-if="!isOpenLeftBook" class="unit-top-left" @click="onOpenLeftBook">
|
<div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook">
|
||||||
<i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
|
<i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
|
||||||
<!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
|
<i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
|
||||||
<span>作业设计</span>
|
<span>课程目录</span>
|
||||||
<!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
|
<i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="unit-top-left">
|
<div v-else class="unit-top-left">
|
||||||
<i class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
|
<i class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
|
||||||
|
@ -113,7 +113,7 @@ const onOpenLeftBook = () => {
|
||||||
proxy.$modal.msgError(`当前为编辑状态不可选择课程!`);
|
proxy.$modal.msgError(`当前为编辑状态不可选择课程!`);
|
||||||
}else{
|
}else{
|
||||||
// 新增状态
|
// 新增状态
|
||||||
// isCollapse.value = !isCollapse.value
|
isCollapse.value = !isCollapse.value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 返回上一页---返回布置页面
|
// 返回上一页---返回布置页面
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="teachClassTask_header">
|
<div class="teachClassTask_header">
|
||||||
<div style="font-size: 18px; display: flex; flex-wrap: nowrap">
|
<div style="font-size: 18px; display: flex; flex-wrap: nowrap">
|
||||||
<div style="flex: 1">
|
<div style="flex: 1">
|
||||||
{{ classWorkAnalysis.title }}完成情况
|
{{ classWorkAnalysis.title }}答题情况
|
||||||
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
|
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
|
||||||
classWorkAnalysis.worktype
|
classWorkAnalysis.worktype
|
||||||
}}</el-tag>
|
}}</el-tag>
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
||||||
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
|
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
|
||||||
@click="handleClassOverviewOpen('report')"
|
@click="handleClassOverviewOpen('report')"
|
||||||
>训练报告</el-button
|
>整体分析</el-button
|
||||||
>
|
>
|
||||||
</el-button-group>
|
</el-button-group>
|
||||||
</div>
|
</div>
|
||||||
|
@ -136,7 +136,7 @@
|
||||||
<quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
|
<quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 训练报告-->
|
<!-- 整体分析-->
|
||||||
<div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
|
<div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
|
||||||
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
|
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
|
||||||
<ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
|
<ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
|
||||||
|
@ -204,7 +204,7 @@ const classWorkAnalysisScore = reactive({
|
||||||
// }
|
// }
|
||||||
// )
|
// )
|
||||||
const openDialog = (data) => {
|
const openDialog = (data) => {
|
||||||
console.log(data, '点击的item完成情况')
|
console.log(data, '点击的item答题情况')
|
||||||
|
|
||||||
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
|
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
|
||||||
classWorkAnalysis.worktype = data.worktype
|
classWorkAnalysis.worktype = data.worktype
|
||||||
|
@ -459,7 +459,7 @@ const getStudentClassWorkDataDetail = (row) => {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
console.log('获取完成情况失败')
|
console.log('获取答题情况失败')
|
||||||
ElMessage({
|
ElMessage({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
message: '未获取到答题信息!'
|
message: '未获取到答题信息!'
|
||||||
|
@ -471,7 +471,7 @@ const onClassWorkScoreSubmit = () => {
|
||||||
console.log('批改后返回的方法')
|
console.log('批改后返回的方法')
|
||||||
loading_dt_table.value = true
|
loading_dt_table.value = true
|
||||||
isopen_dtwk_table.value = false
|
isopen_dtwk_table.value = false
|
||||||
// 1、清空完成情况的两个table数据,- 左侧学生列表:classWorkAnalysis.classworkdata;- 右侧学生回答题目列表:classWorkAnalysis.activeStudentQuizlist
|
// 1、清空答题情况的两个table数据,- 左侧学生列表:classWorkAnalysis.classworkdata;- 右侧学生回答题目列表:classWorkAnalysis.activeStudentQuizlist
|
||||||
// - 左侧学生列表
|
// - 左侧学生列表
|
||||||
classWorkAnalysis.classworkdata = []
|
classWorkAnalysis.classworkdata = []
|
||||||
classWorkAnalysis.activeStudentQuizlist = []
|
classWorkAnalysis.activeStudentQuizlist = []
|
||||||
|
@ -563,11 +563,11 @@ const getWorkFeedList = async() =>{
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
//#regin 训练报告
|
//#regin 整体分析
|
||||||
/*
|
/*
|
||||||
author: yangws
|
author: yangws
|
||||||
time: 2024-8-06 16:35:33
|
time: 2024-8-06 16:35:33
|
||||||
function: 训练报告的处理
|
function: 整体分析的处理
|
||||||
*/
|
*/
|
||||||
const handleClassOverviewOpen = (type) =>{
|
const handleClassOverviewOpen = (type) =>{
|
||||||
// 关闭右侧批阅ui
|
// 关闭右侧批阅ui
|
||||||
|
|
Loading…
Reference in New Issue