From 502c772b4602c3cdf33975395ebd19e1afaed18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 20 Dec 2024 15:42:19 +0800 Subject: [PATCH] 1 --- .../Editor/Toolbar/ElementStylePanel/Active/index.vue | 10 ++++++++++ src/renderer/src/hooks/useGetHomework.js | 2 ++ .../src/views/classTask/newClassTaskAssign/index.vue | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue index 0354fba..9f36ccc 100644 --- a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue +++ b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue @@ -25,6 +25,12 @@
常规作业
+ +
+ +
科学实验
+
+ @@ -157,6 +163,10 @@ const type = ref([ { label: '框架梳理', value: 'primary' + }, + { + label: '科学实验', + value: 'primary' } ]) diff --git a/src/renderer/src/hooks/useGetHomework.js b/src/renderer/src/hooks/useGetHomework.js index e07a2de..0f78590 100644 --- a/src/renderer/src/hooks/useGetHomework.js +++ b/src/renderer/src/hooks/useGetHomework.js @@ -94,6 +94,8 @@ const getHomeWorkList = async () => { res.rows[i].workclass = 'info'; } else if (res.rows[i].worktype == '习题训练') { res.rows[i].workclass = 'danger'; + } else if (res.rows[i].worktype == '科学实验') { + res.rows[i].workclass = 'danger'; } else { res.rows[i].workclass = 'primary'; } diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue index dcef29f..7af5ff9 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue @@ -607,7 +607,7 @@ const handleClassWorkFormQuizRemove = (index) =>{ addClassworkReturnId(cform).then((res) => { ElMessage({ type: 'success', message: '作业设计成功!'}); // 重置提交表单 - classWorkForm.worktype = "常规作业"; + classWorkForm.worktype = "科学实验"; classWorkForm.uniquekey = ''; // props.propsformobj.uniquekey, // 作业唯一标识 作业名称 classWorkForm.title = ""; classWorkForm.quizlist = [], // 作业习题列表内容 @@ -617,7 +617,7 @@ const handleClassWorkFormQuizRemove = (index) =>{ classWorkForm.whiteboardObj = ''; // ? // 清空白板 classWorkForm.fileHomeworkList = []; // 常规作业list classWorkForm.id = res - // emits('getData',classWorkForm) + emits('getData',classWorkForm) // TODO 科学实验 待完善 }) } finally{