Merge pull request 'edit' (#113) from lyc-dev into main

Reviewed-on: #111

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]);
+    if(res.rows.length > 0){
-    getChildTemplate()
+      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]
 })

src/renderer/src/layout/components/Header.vue

@@ -44,9 +44,9 @@ const breadList = ref([])
 watch(
   () => router.currentRoute.value,
   (newValue) => {
-    let path = newValue.path
+    console.log(newValue)
-
+    const { showBread }  = newValue.meta
-    if (path.includes('/model') && path !== ('/model/index')) {
+    if (showBread) {
       isShowBack.value = true
       breadList.value = newValue.matched.map(item => item.meta)
       let data = sessionStore.get('subject.curNode')

src/renderer/src/layout/index.vue

@@ -8,8 +8,8 @@
         <el-header>
           <Header/>
         </el-header>
-        <el-main :style="{ 'padding-top' : isShowBread ? 0 : '20px'}">
+        <el-main style="padding-top : 20px">
-          <template v-if="isShowBread">
+          <!-- <template v-if="isShowBread">
             <div class="bread-row">
               <div class="back" @click="onBack">
                 <i class="iconfont icon-fanhui"></i>
@@ -19,8 +19,8 @@
                 <el-breadcrumb-item v-for="item in breadList"> {{ item.title }} </el-breadcrumb-item>
               </el-breadcrumb>
             </div>
-          </template>
+          </template> -->
-          <AppMain :style="{ height: isShowBread ? 'calc(100% - 45px)' : '100%' }" />
+          <AppMain  />
         </el-main>
       </el-container>
       <Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />

src/renderer/src/router/index.js

@@ -47,19 +47,19 @@ export const constantRoutes = [
         path: 'curriculum',
         component: () => import('@/views/curriculum-standards/index.vue'),
         name: 'curriculum-standard',
-        meta: { title: '课标研读' }
+        meta: { title: '课标研读', showBread: true }
       },
       {
         path: 'teaching',
         component: () => import('@/views/teaching-material/index.vue'),
         name: 'teaching-material',
-        meta: { title: '教材研读' }
+        meta: { title: '教材研读', showBread: true }
       },
       {
         path: 'examination',
         component: () => import('@/views/examination-analysis/index.vue'),
         name: 'examination-analysis',
-        meta: { title: '考试分析' }
+        meta: { title: '考试分析', showBread: true }
       },
       {
         path: 'management',
@@ -71,13 +71,13 @@ export const constantRoutes = [
         path: 'design',
         component: () => import('@/views/teachingDesign/index.vue'),
         name: 'teaching-design',
-        meta: { title: '教学框架设计' },
+        meta: { title: '教学框架设计' , showBread: true},
       },
       {
         path: 'newClassTaskAssign',
         component: () => import('@/views/classTask/newClassTaskAssign/index.vue'),
         name: 'newClassTaskAssign',
-        meta: { title: '作业管理' }
+        meta: { title: '作业设计', showBread: true }
       },
       {
         path: 'questionUpload',
@@ -89,7 +89,7 @@ export const constantRoutes = [
         path: 'aiKolors',
         component: () => import('@/components/ai-kolors/index.vue'),
         name: 'aiKolors',
-        meta: { title: '文生图片' }
+        meta: { title: '文生图片', showBread: true }
       },
     ]
   },
@@ -132,7 +132,7 @@ const dynamicRoutes = [
         path: 'prepare',
         component: () => import('@/views/prepare/index.vue'),
         name: 'prepare',
-        meta: { title: '教学实践', showBread: true }
+        meta: { title: '教学实践' }
       },
       {
         path: 'newClassTask',
@@ -152,13 +152,6 @@ const dynamicRoutes = [
         name: 'classCorrect',
         meta: { title: '作业批改', showBread: true }
       },
-      {
-        path: '/teach',
-        component: () => import('@/views/teach/index.vue'),
-        name: 'teach',
-        meta: { title: '授课' }
-      },
-
       {
         path: '/profile',
         component: () => import('@/views/profile/index.vue'),

src/renderer/src/views/classTask/classTask.vue

@@ -461,7 +461,6 @@ watch(tabActive, (newVal,oldVal)=>{
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding: 15px 30px;
   .class-reserv-tabs {
     width: 30%;
     text-align: left;

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) {
       // 框架梳理

src/renderer/src/views/classTask/newClassTask.vue

@@ -134,7 +134,6 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .page-newcalsetask {
-  padding-top: 10px;
   height: 100%;
   overflow: hidden;
 

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) {
       // 框架梳理

src/renderer/src/views/teach/index.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>
-    授课Page
-  </div>
-</template>
-
-<script setup>
-
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/renderer/src/views/teach/standardAnalysis/index.vue

@@ -346,7 +346,6 @@ onMounted(async () => {
 </script>
 <style scoped lang="scss">
 .page-con {
-  padding-top: 20px;
   height: 100%;
   &-left{
     width: 300px;

src/renderer/src/views/textbookAnalysis/index.vue

@@ -362,7 +362,6 @@ onMounted(async () => {
 </script>
 <style scoped lang="scss">
 .page-con {
-  padding-top: 20px;
   height: 100%;
   &-left{
     width: 300px;