diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js index cf960da..d091a1b 100644 --- a/src/renderer/src/hooks/useClassTask.js +++ b/src/renderer/src/hooks/useClassTask.js @@ -32,9 +32,9 @@ export const editListItem = (row, courseObj) => { worktype: '', // 设计中的作业类型 quizlist: [], // 设计中的试题列表 chooseWorkLists: [],// 设计中的框架梳理list - fileHomeworkList: [],// 设计中的常规作业list - whiteboardObj: '',// 设计中的课堂展示对象 - question: '', // 设计中的[课堂展示]的问题 + fileHomeworkList: [],// 设计中的主题作业list + whiteboardObj: '',// 设计中的创作展示对象 + question: '', // 设计中的[创作展示]的问题 }; console.log('编辑的行', row); @@ -53,8 +53,8 @@ export const editListItem = (row, courseObj) => { classtaskObj.worktype= row.worktype; // 设计中的作业类型 classtaskObj.quizlist= []; // 设计中的试题列表 classtaskObj.chooseWorkLists = []; //设计中的 框架梳理list - classtaskObj.fileHomeworkList = []; //设计中的 常规作业list - classtaskObj.whiteboardObj = ''; //设计中的 课堂展示对象 + classtaskObj.fileHomeworkList = []; //设计中的 主题作业list + classtaskObj.whiteboardObj = ''; //设计中的 创作展示对象 if (row.worktype == '框架梳理') { @@ -96,19 +96,19 @@ export const editListItem = (row, courseObj) => { } }) } - else if (row.worktype == '课堂展示') { - console.log('row.课堂展示', row.workcodes); + else if (row.worktype == '创作展示') { + console.log('row.创作展示', row.workcodes); const workcodes = JSON.parse(row.workcodes); classtaskObj.whiteboardObj = JSON.stringify(workcodes.json); classtaskObj.question = row.worktag; - // console.log('课堂展示', classtaskObj); + // console.log('创作展示', classtaskObj); return resolve(classtaskObj); } - else if (row.worktype == '常规作业') { + else if (row.worktype == '主题作业') { if(isJson(row.workcodes)){ classtaskObj.fileHomeworkList = JSON.parse(row.workcodes); // - // console.log('常规作业', classtaskObj); + // console.log('主题作业', classtaskObj); return resolve(classtaskObj); } } diff --git a/src/renderer/src/hooks/useGetHomework.js b/src/renderer/src/hooks/useGetHomework.js index e07a2de..506067f 100644 --- a/src/renderer/src/hooks/useGetHomework.js +++ b/src/renderer/src/hooks/useGetHomework.js @@ -86,11 +86,11 @@ const getHomeWorkList = async () => { // res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes); // } else // 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加 - if (res.rows[i].worktype == '课堂展示') { + if (res.rows[i].worktype == '创作展示') { res.rows[i].workclass = 'primary'; } else if (res.rows[i].worktype == '框架梳理') { res.rows[i].workclass = 'warning'; - } else if (res.rows[i].worktype == '常规作业') { + } else if (res.rows[i].worktype == '主题作业') { res.rows[i].workclass = 'info'; } else if (res.rows[i].worktype == '习题训练') { res.rows[i].workclass = 'danger'; diff --git a/src/renderer/src/hooks/useProcessList.js b/src/renderer/src/hooks/useProcessList.js index 1a1ca4f..e7329eb 100644 --- a/src/renderer/src/hooks/useProcessList.js +++ b/src/renderer/src/hooks/useProcessList.js @@ -15,9 +15,10 @@ export const isJson = (str) => { /** * @description processList 格式化试题 - * @param {*} row + * @param {*} row + * @param {*} aloneOption 选择题中选项是否为每行一个 */ -export const processList = (row) => { +export const processList = (row, aloneOption=false) => { for (var i = 0; i < row.length; i++) { if (isJson(row[i].workanalysis)) { //1、先默认格式化 格式化各项内容(待优化, 后续界面显示的为format的值) @@ -55,19 +56,25 @@ export const processList = (row) => { const workDescArr = element.split('#&') let tmp = '' let j = 0 - for (; j < workDescArr.length; j++) { - if (j % 2 == 0) { - tmp += `
` + for(; j${char}.${workDescArr[j]}
`; } - const char = String.fromCharCode(65 + j) - tmp += `
${char}.${workDescArr[j]}
` - if (j % 2 == 1) { - tmp += '' + else { + if(j%2 == 0){ + tmp += `
`; + } + + tmp += `
${char}.${workDescArr[j]}
`; + if(j%2 == 1){ + tmp += '
'; + } } } // j此刻已自增1, 故当选项为单数时, 需要补充结束标签 - if (j % 2 == 1) { - tmp += '' + if(!aloneOption && j%2 == 1){ + tmp += ''; } // workDescArr为 [''] 表示为 判断题或者填空题，这里不需要选项 @@ -136,31 +143,36 @@ export const processList = (row) => { * ] */ let workDescArr = JSON.parse(row[i].workdesc) - let workDescHtml = `
` workDescArr.map((item, index) => { if (item.type == '单选题' || item.type == '多选题') { - workDescHtml += `
${index + 1}. ${item.title}
` + workDescHtml += `
${index + 1}. ${item.title}
` let tmp = '' let j = 0 let optionsArr = item.options - for (; j < optionsArr.length; j++) { - if (j % 2 == 0) { - tmp += `
` + for(; j${char}.${optionsArr[j]}
`; } - const char = String.fromCharCode(65 + j) - tmp += `
${char}.${optionsArr[j]}
` - if (j % 2 == 1) { - tmp += '
' + else { + if(j%2 == 0){ + tmp += `
`; + } + + tmp += `
${char}.${optionsArr[j]}
`; + if(j%2 == 1){ + tmp += '
'; + } } } // j此刻已自增1, 故当选项为单数时, 需要补充结束标签 - if (j % 2 == 1) { - tmp += '' + if(!aloneOption && j%2 == 1){ + tmp += ''; } - workDescHtml += tmp } else if (item.type == '填空题' || item.type == '判断题' || item.type == '主观题') { - workDescHtml += `
${index + 1}. ${item.title}
` + workDescHtml += `
${index + 1}. ${item.title}
` } }) workDescHtml += '' @@ -265,18 +277,24 @@ export const processList = (row) => { // 处理[选项显示] - 拼接ABCD首序号 let tmp = '' let j = 0 - for (; j < workDescArr.length; j++) { - if (j % 2 == 0) { - tmp += `
` + for(; j${char}.${workDescArr[j]}
`; } - const char = String.fromCharCode(65 + j) - tmp += `
${char}.${workDescArr[j]}
` - if (j % 2 == 1) { - tmp += '' + else { + if(j%2 == 0){ + tmp += `
`; + } + + tmp += `
${char}.${workDescArr[j]}
`; + if(j%2 == 1){ + tmp += '
'; + } } } - if (j % 2 == 0) { - tmp += '' + if(!aloneOption && j%2== 0){ + tmp += ''; } row[i].workdescFormat = tmp diff --git a/src/renderer/src/plugins/imChat/msgEnum.js b/src/renderer/src/plugins/imChat/msgEnum.js index da8e486..a69afb4 100644 --- a/src/renderer/src/plugins/imChat/msgEnum.js +++ b/src/renderer/src/plugins/imChat/msgEnum.js @@ -36,8 +36,8 @@ export class MsgEnum { * | MSG_pushQuizOfClassWorkdata2Public | 老师端：把选中的学生习题作业，推到大屏 | pushQuizOfClassWorkdata2Public | * | MSG_pushClassWorkdata2Public | 老师端：把选中的学生作业，推到大屏 | pushClassWorkdata2Public | * | MSG_shareStudentPresentdata2All | 把某个学生的展示成果数据推给全班所有学生 | shareStudentPresentdata2All | - * | MSG_pushStudentPresentdata2Public | 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public | - * | MSG_pushClassWorkPresentList2Public | 老师端：课堂展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public | + * | MSG_pushStudentPresentdata2Public | 老师端：创作展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public | + * | MSG_pushClassWorkPresentList2Public | 老师端：创作展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public | * | MSG_activePageType | 课标研读-分页切换 | activePageType | * | MSG_slideFlapping | 幻灯片-切换 | slideFlapping | * | MSG_anmationclick | 幻灯片-动画切换 | anmationclick | @@ -46,7 +46,7 @@ export class MsgEnum { * | MSG_classtaskfeedback | 老师端：接收到学生反馈消息-课堂测练中的其他任务 | classtaskfeedback | * | MSG_studentfeedback | 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 | studentfeedback | * | MSG_studentfeedbackcancel | 老师端：学生反馈的消息取消，如取消学会了，取消困惑 | studentfeedbackcancel | - * | MSG_classshowdata | 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata | + * | MSG_classshowdata | 学生提交的创作展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata | * | MSG_classWorkOfPresentDataUpdate | 学生在公屏上展示并完善后，保存后，老师端要更新 | classWorkOfPresentDataUpdate | * | MSG_classlecturePagesrc | 课堂讲授活动，选择不同的内容 | classlecturePagesrc | * | --- | 以下为新定义-消息头 | --- | @@ -66,9 +66,9 @@ export class MsgEnum { MSG_pushClassWorkdata2Public : 'pushClassWorkdata2Public', /** @desc: 把某个学生的展示成果数据推给全班所有学生 */ MSG_shareStudentPresentdata2All : 'shareStudentPresentdata2All', - /** @desc: 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 */ + /** @desc: 老师端：创作展示活动，把选中的学生展示数据，推到大屏 */ MSG_pushStudentPresentdata2Public : 'pushStudentPresentdata2Public', - /** @desc: 老师端：课堂展示活动，任务列表，推到大屏 */ + /** @desc: 老师端：创作展示活动，任务列表，推到大屏 */ MSG_pushClassWorkPresentList2Public : 'pushClassWorkPresentList2Public', /** @desc: 课标研读-分页切换 */ MSG_activePageType : 'activePageType', @@ -86,7 +86,7 @@ export class MsgEnum { MSG_studentfeedback : 'studentfeedback', /** @desc: 老师端：学生反馈的消息取消，如取消学会了，取消困惑 */ MSG_studentfeedbackcancel : 'studentfeedbackcancel', - /** @desc: 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 */ + /** @desc: 学生提交的创作展示数据-要在老师端显示，再由老师选择推送到公屏上 */ MSG_classshowdata : 'classshowdata', /** @desc: 学生在公屏上展示并完善后，保存后，老师端要更新 */ MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate', diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index 445cf22..1c800cd 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -340,7 +340,7 @@ const eventHandles = (type, win) => { // 监听窗口的激活事件 win.on('focus', async () => { toolState.isTaskWin=true - win&&win.reload(); //刷新该窗口 + // win&&win.reload(); //刷新该窗口 }); // 监听窗口关闭事件 win.on('closed', function () { diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue index 055fa37..3c0969a 100644 --- a/src/renderer/src/views/classTask/classTask.vue +++ b/src/renderer/src/views/classTask/classTask.vue @@ -291,7 +291,7 @@ const getStudentClassWorkData = async() => { } for (var e = 0; e < evalarray.length; e++) { - if (res.rows[i].worktype == '常规作业') { + if (res.rows[i].worktype == '主题作业') { evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace( /"(\[.*\])"/g, '$1' diff --git a/src/renderer/src/views/classTask/classTaskAssign.vue b/src/renderer/src/views/classTask/classTaskAssign.vue index 8b58f5b..716bb83 100644 --- a/src/renderer/src/views/classTask/classTaskAssign.vue +++ b/src/renderer/src/views/classTask/classTaskAssign.vue @@ -148,9 +148,9 @@ - - -
+ + +
@@ -362,9 +362,9 @@ const currentTag = ref('');// 当前作业类型 const workConfObj = reactive({ quizlist: [], // 习题list chooseWorkLists: [], // 框架梳理 - teacherFeedContentList: [],//常规作业 - teachFileList: [], // 常规作业文件list - teachImageList: [],// 常规作业图片list + teacherFeedContentList: [],//主题作业 + teachFileList: [], // 主题作业文件list + teachImageList: [],// 主题作业图片list }); // 推送相关 @@ -440,11 +440,11 @@ const queryPushRecords = (row) => { // res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes); // } else // 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加 - if (res.rows[i].worktype == '课堂展示') { + if (res.rows[i].worktype == '创作展示') { res.rows[i].workclass = 'primary'; } else if (res.rows[i].worktype == '框架梳理') { res.rows[i].workclass = 'warning'; - } else if (res.rows[i].worktype == '常规作业') { + } else if (res.rows[i].worktype == '主题作业') { res.rows[i].workclass = 'info'; } else if (res.rows[i].worktype == '习题训练') { res.rows[i].workclass = 'danger'; @@ -686,9 +686,9 @@ const handleWorkTitleEdit = (row, index, type) => { }) } - //TODO 待完善 课堂展示 - if(row.worktype == '常规作业'){ - console.log(row,'常规作业'); + //TODO 待完善 创作展示 + if(row.worktype == '主题作业'){ + console.log(row,'主题作业'); workConfObj.teacherFeedContentList = []; workConfObj.teachImageList = []; workConfObj.teachFileList = []; @@ -795,13 +795,13 @@ const prevRead = (item) => { proxy.$refs.prevReadMsgDialogRef.openDialog(item); } /** - * 常规作业：其他附件预览 + * 主题作业：其他附件预览 */ const openFile = () => { const obj = { - teacherFeedContentList: workConfObj.teacherFeedContentList,//常规作业 - teachFileList: workConfObj.teachFileList, // 常规作业文件list - teachImageList: workConfObj.teachImageList,// 常规作业图片list + teacherFeedContentList: workConfObj.teacherFeedContentList,//主题作业 + teachFileList: workConfObj.teachFileList, // 主题作业文件list + teachImageList: workConfObj.teachImageList,// 主题作业图片list } proxy.$refs.prevReadImgFileDialogRef.acceptParams(obj); } diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index e8d2475..79b5d0a 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -136,11 +136,11 @@
- +
@@ -152,11 +152,11 @@ {{ sIndex + 1 }}、{{ stuItem.score ? stuItem.score : 0 }}分
- +
@@ -210,8 +210,8 @@
-
- +
+

学生答复内容

{{stuItem.rightanswer}}
@@ -450,11 +450,11 @@ const dialogProps = ref({ studentQuizAllList: [], //学生答题的list quizlist: [] // 当前学生的所有题目list }) -//学生常规作业list +//学生主题作业list const feedContentList = ref([]) const imageList = ref([]) const fileList = ref([]) -// 老师常规作业、课堂展示布置题目附件list +// 老师主题作业、创作展示布置题目附件list const teacherFeedContentList = ref([]) const teachImageList = ref([]) const teachFileList = ref([]) @@ -674,9 +674,9 @@ const acceptParams = async (params) => { }) } else { // 学生回答 - if (params.studentObj.worktype == '常规作业') { + if (params.studentObj.worktype == '主题作业') { try { - // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入 + // 老师布置的附件 datacontent TODO：主题作业、其他类型还未接入 const res = await getClassworkdata(params.studentObj.id); if(res.data.datacontent != ''){ const teachWorkFileList = JSON.parse(res.data.datacontent); @@ -728,7 +728,7 @@ const acceptParams = async (params) => { } }) } else if ( - params.studentObj.worktype == '课堂展示' || + params.studentObj.worktype == '创作展示' || params.studentObj.worktype == '框架梳理' ) { params.studentQuizAllList.forEach((item) => { @@ -740,7 +740,7 @@ const acceptParams = async (params) => { classWorkFormScore.teacherremark = item.teacherremark // 评价语 // 根据移动端返回定义：只返回一张图片：rightanswer："https://wzyzoss.eos-chongqing-3.cmecloud.cn/2024/9/5/c5d8e00a93364dd3b975f669afa217f9.png" // 这里只有一张图片； - console.log(item.rightanswer, '----------课堂展示学生答题------------------') + console.log(item.rightanswer, '----------创作展示学生答题------------------') if (item.rightanswer != '' && item.rightanswer != null) { if ( diff --git a/src/renderer/src/views/classTask/container/classTask/prevReadImgFileDialog.vue b/src/renderer/src/views/classTask/container/classTask/prevReadImgFileDialog.vue index 2205b17..f7f58e9 100644 --- a/src/renderer/src/views/classTask/container/classTask/prevReadImgFileDialog.vue +++ b/src/renderer/src/views/classTask/container/classTask/prevReadImgFileDialog.vue @@ -59,7 +59,7 @@ const props = defineProps({}) const fileReadopen = ref(false) -// 老师常规作业、课堂展示布置题目附件list +// 老师主题作业、创作展示布置题目附件list const teacherFeedContentList = ref([]) const teachImageList = ref([]) const teachFileList = ref([]) diff --git a/src/renderer/src/views/classTask/container/item-dialog.vue b/src/renderer/src/views/classTask/container/item-dialog.vue index 819082e..acd8732 100644 --- a/src/renderer/src/views/classTask/container/item-dialog.vue +++ b/src/renderer/src/views/classTask/container/item-dialog.vue @@ -261,6 +261,7 @@ const openDialog = (data) => { } classWorkAnalysis.quizlist = idres.rows classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用 + processList(classWorkActiveData.quizlist); // 统计每个题目的正误率 // 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100 @@ -428,7 +429,7 @@ const getStudentClassWorkDataDetail = (row) => { // ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '') // : wevalres.rows[w].feedcontent - if (classWorkAnalysis.row.worktype == '常规作业') { + if (classWorkAnalysis.row.worktype == '主题作业') { wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent) } if (wevalres.rows[w].feedcontent != '') { diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 3252c0f..622589c 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -18,7 +18,7 @@ -
+
@@ -130,7 +130,7 @@
-