From d60d8822a607a802b983d04dabd03202830ef113 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Wed, 11 Dec 2024 13:50:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/AixPPTist/src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/AixPPTist/src/App.vue b/src/renderer/src/AixPPTist/src/App.vue
index 7cb504f..20fca42 100644
--- a/src/renderer/src/AixPPTist/src/App.vue
+++ b/src/renderer/src/AixPPTist/src/App.vue
@@ -12,6 +12,7 @@
 
 
 <script lang="ts" setup>
+import 'animate.css'
 import { ref, onMounted, watch, onBeforeMount } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useScreenStore, useMainStore, useSnapshotStore, useSlidesStore } from './store'

From c8dd19382e99a35c8299a3d60208e2280c2fa87c 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: Wed, 11 Dec 2024 14:51:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E4=B8=9A=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/classTask/container/newTask/taskTypeView.vue   | 9 ++++++++-
 .../src/views/classTask/newClassTaskAssign/index.vue     | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 218f71c..0c32397 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -703,6 +703,7 @@ const handleClassWorkSave = async () => {
         entpcourseworklist: '', // 选择的 习题训练 list  需要转字符串
       };
 
+      if(cform.uniquekey.trim() == '') return ElMessage({ type: 'warning', message: '作业名称不能为空!'});
 
       // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
       if(classWorkForm.id != '' ) {// 编辑状态 有id
@@ -741,6 +742,7 @@ const handleClassWorkSave = async () => {
         }
       }
       else if(classWorkForm.worktype === "常规作业"){
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
         fileLoading.value = true
         cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
         cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
@@ -832,7 +834,12 @@ const editWork = async (cform) =>{
     }
   }else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
     // 不做校验
-
+    // 不做校验
+    if(classWorkForm.worktype == '课堂展示'){
+      // 
+    }else{
+      if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
+    }
   }else {
     if (classWorkForm.chooseWorkLists.length == 0) {
       // 框架梳理
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 8d18094..e8e9f7d 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -489,6 +489,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         entpcourseworklist: '', // 选择的 习题训练 list  需要转字符串
       };
 
+      if(cform.uniquekey.trim() == '') return ElMessage({ type: 'warning', message: '作业名称不能为空!'});
 
       // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
       if(isShow.value === false){
@@ -530,6 +531,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         }
       }
       else if(classWorkForm.worktype === "常规作业"){
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
         fileLoading.value = true
         cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
         cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
@@ -634,7 +636,11 @@ const editWork = async (cform) =>{
     }
   }else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
     // 不做校验
-
+    if(classWorkForm.worktype == '课堂展示'){
+      // 
+    }else{
+      if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
+    }
   }else {
     if (classWorkForm.chooseWorkLists.length == 0) {
       // 框架梳理

From cbc12a3d4379445cd87676ca550793d4bf89c6be Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Wed, 11 Dec 2024 15:07:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?edit=20=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template-study/container/right.vue           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
index 8bc77e1..2ac4a57 100644
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -15,10 +15,10 @@
         </template>
       </el-dropdown>
       <div>
-        <el-button type="danger" link @click="removeItem(curTemplate, false)">
+        <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
           删除
         </el-button>
-        <el-button type="primary" link @click="onAdd">
+        <el-button type="primary" link :disabled="!(templateList.length)" @click="onAdd">
           <i class="iconfont icon-jiahao"></i>
           添加提示词
         </el-button>
@@ -137,15 +137,17 @@ const curTemplate = reactive({ name: '', id: '' })
 const templateList = ref([])
 const childTempList = ref([])
 const getTemplateList = () => {
-  modelList({ model: props.type, type: 1, pageNum: 1, pageSize: 10000 }).then(res => {
+  modelList({ model: props.type, type: 1, pageNum: 1, pageSize: 10000, ex1: curNode.edustage, ex2: curNode.edusubject  }).then(res => {
     templateList.value = res.rows
-    Object.assign(curTemplate, res.rows[0]);
-    getChildTemplate()
+    if(res.rows.length > 0){
+      Object.assign(curTemplate, res.rows[0]);
+      getChildTemplate()
+    }
   })
 }
 const getChildTemplate = () => {
   tempLoading.value = true
-  modelList({ model: props.type, type: 2, parentId: curTemplate.id }).then(res => {
+  modelList({ model: props.type, type: 2, parentId: curTemplate.id, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
     childTempList.value = res.rows
     if(childTempList.value.length){
       childTempList.value.forEach(item => item.answer = '')
@@ -398,9 +400,9 @@ emitter.on('onGetMain', () => {
 
 const curNode = reactive({})
 onMounted(() => {
-  getTemplateList()
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);
+  getTemplateList()
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
 })