From 45c2e35a664993fb8d5f8be08ee57fdcce6c0cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Sat, 19 Oct 2024 14:19:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BD=9C=E4=B8=9A=E5=B8=83=E7=BD=AE]=20-?= =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3[=E8=AF=BE=E5=A0=82=E5=B1=95=E7=A4=BA]?= =?UTF-8?q?=E4=B8=AD[=E9=97=AE=E9=A2=98=E8=BE=93=E5=85=A5=E6=A1=86]?= =?UTF-8?q?=E7=9A=84=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/hooks/useClassTask.js | 3 ++- .../views/classTask/container/newTask/taskTypeView.vue | 8 ++++++-- src/renderer/src/views/classTask/newClassTask.vue | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js index 85966bb..cf960da 100644 --- a/src/renderer/src/hooks/useClassTask.js +++ b/src/renderer/src/hooks/useClassTask.js @@ -34,6 +34,7 @@ export const editListItem = (row, courseObj) => { chooseWorkLists: [],// 设计中的框架梳理list fileHomeworkList: [],// 设计中的常规作业list whiteboardObj: '',// 设计中的课堂展示对象 + question: '', // 设计中的[课堂展示]的问题 }; console.log('编辑的行', row); @@ -99,7 +100,7 @@ export const editListItem = (row, courseObj) => { console.log('row.课堂展示', row.workcodes); const workcodes = JSON.parse(row.workcodes); classtaskObj.whiteboardObj = JSON.stringify(workcodes.json); - // + classtaskObj.question = row.worktag; // console.log('课堂展示', classtaskObj); return resolve(classtaskObj); } diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 022bc4d..99aa83a 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -21,7 +21,7 @@
- +
@@ -345,9 +345,10 @@ let classWorkForm = reactive({ chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表 whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板 + question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题 }); // 提交的作业内容 // --------------------------------------------------- -const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型 +const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型 // 课堂展示------- const boardLoading = ref(false); @@ -633,6 +634,7 @@ const handleClassWorkSave = async () => { let canvasJson = proxy.$refs.boardref.getCanvasJson() let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64() // 课堂展示提交内容 + cform.worktag = classWorkForm.question; cform.title = classWorkForm.title; cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64}); cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]); @@ -643,6 +645,7 @@ const handleClassWorkSave = async () => { classWorkForm.worktype = "课堂展示"; classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称 classWorkForm.title = ""; + classWorkForm.question = ""; classWorkForm.quizlist = [], // 作业习题列表内容 // 情况选择的资源缓存 @@ -851,6 +854,7 @@ const editWork = async (cform) =>{ let canvasJson = proxy.$refs.boardref.getCanvasJson() let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64() cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64}); + cform.worktag = classWorkForm.question; } else if (classWorkForm.worktype=='常规作业') { // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去) diff --git a/src/renderer/src/views/classTask/newClassTask.vue b/src/renderer/src/views/classTask/newClassTask.vue index 16e2df2..a5bbdf4 100644 --- a/src/renderer/src/views/classTask/newClassTask.vue +++ b/src/renderer/src/views/classTask/newClassTask.vue @@ -67,6 +67,7 @@ const classWorkForm = reactive({ chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业 + question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 课堂展示 输入的问题 }) -- 2.44.0.windows.1 From 38b17333ab37d5ee781a8ff55bccd725ef89bc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Sat, 19 Oct 2024 17:17:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/classTask/container/item-dialog.vue | 22 +++++++++---------- .../src/views/classTask/teachClassTask.vue | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/renderer/src/views/classTask/container/item-dialog.vue b/src/renderer/src/views/classTask/container/item-dialog.vue index 1cb08cd..3d76d25 100644 --- a/src/renderer/src/views/classTask/container/item-dialog.vue +++ b/src/renderer/src/views/classTask/container/item-dialog.vue @@ -13,7 +13,7 @@