fix

src/api/index.js

@@ -526,6 +526,18 @@ export default {
   modifyCourse: `nakadai/nakadai/curriculum/modifyCourse`,
   schoolCourseProject: `nakadai/nakadai/curriculum/schoolCourseProject`,
   configureCourseProjectBySchool: `nakadai/nakadai/curriculum/configureCourseProjectBySchool`,
+  curriculumTree: `nakadai/nakadai/curriculum/curriculumTree`,
+  boutiqueCurriculumTree: `occupationlab/occupationlab/theoreticalCourse/boutiqueCurriculumTree`,
+  combinationResource: `nakadai/nakadai/curriculum/combinationResource`,
+  deleteChapterCurriculm: `nakadai/nakadai/curriculum/chapter/deleteChapter`,
+  editChapterCurriculm: `nakadai/nakadai/curriculum/chapter/editChapter`,
+  addChapterCurriculm: `nakadai/nakadai/curriculum/chapter/addChapter`,
+  deleteSubsectionBatch: `nakadai/nakadai/curriculum/subsection/deleteSubsectionBatch`,
+  reorderCurriculm: `nakadai/nakadai/curriculum/chapter/reorder`,
+  addSubsectionCurriculm: `nakadai/nakadai/curriculum/subsection/addSubsection`,
+  editSubsectionCurriculm: `nakadai/nakadai/curriculum/subsection/editSubsection`,
+  deleteSubsectionCurriculm: `nakadai/nakadai/curriculum/subsection/deleteSubsection`,
+  schoolCourseShelf: `nakadai/nakadai/curriculum/schoolCourseShelf`,
 
   // 教师评语
   addComment: `evaluation/cevaluation/comment/addComment`,

src/pages/lesson/content/index.vue

@@ -386,11 +386,11 @@ export default {
       this.fileUrl = ''
     },
     uploadSure () {
-      this.importVisible = false;
-      this.pageNo = 1;
-      this.staffGradeId = "";
-      this.keyword = "";
-      this.getTeacher();
+      this.importVisible = false
+      this.pageNo = 1
+      this.staffGradeId = ''
+      this.keyword = ''
+      this.getTeacher()
     },
     transferType (ext) {
       if ("jpg,jpeg,png,gif,svg,psd".includes(ext)) return "图片";
@@ -398,9 +398,9 @@ export default {
       return ext;
     },
     addChapter () {
-      this.chapterName = "";
-      this.chapterId = "";
-      this.chapterVisible = true;
+      this.chapterName = ''
+      this.chapterId = ''
+      this.chapterVisible = true
     },
     sort () {
       this.originChapters = JSON.parse(JSON.stringify(this.chapters))
@@ -467,7 +467,7 @@ export default {
           j.chapterId = n.id
         })
       })
-      await this.$post(this.api.reorder, {
+      await this.$post(this.api.reorderCurriculm, {
         chapterVOList: chapters
       })
       this.getData()
@@ -525,7 +525,7 @@ export default {
           j.chapterId = n.id
         })
       })
-      await this.$post(this.api.reorder, {
+      await this.$post(this.api.reorderCurriculm, {
         chapterVOList: this.chapters
       })
       this.getData()
@@ -546,7 +546,7 @@ export default {
       this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
         type: "warning"
       }).then(() => {
-        this.$del(`${this.api.deleteChapter}/${id}`).then(res => {
+        this.$del(`${this.api.deleteChapterCurriculm}/${id}`).then(res => {
           this.$message.success("删除成功")
           this.getData()
         }).catch(res => { })
@@ -577,7 +577,7 @@ export default {
       };
       if (this.chapterId) {
         data.id = this.chapterId;
-        this.$put(this.api.editChapter, data).then(res => {
+        this.$put(this.api.editChapterCurriculm, data).then(res => {
           this.$message.success("修改成功");
           this.chapterVisible = false;
           this.getData();
@@ -585,13 +585,11 @@ export default {
           .catch(err => {
           });
       } else {
-        this.$post(this.api.addChapter, data).then(res => {
+        this.$post(this.api.addChapterCurriculm, data).then(res => {
           this.$message.success("添加成功");
           this.chapterVisible = false;
           this.getData();
-        })
-          .catch(err => {
-          });
+        }).catch(err => { })
       }
     },
     sectionSubmit (e) {
@@ -609,7 +607,7 @@ export default {
         fileType: this.fileType,
         originalFileName: this.originalFileName
       };
-      this.$post(this.api.addSubsection, data).then(res => {
+      this.$post(this.api.addSubsectionCurriculm, data).then(res => {
         this.$message.success("添加成功");
         this.sectionVisible = false;
         this.getData();
@@ -737,7 +735,7 @@ export default {
         fileUrl: this.fileUrl,
         originalFileName: this.originalFileName
       };
-      this.$put(this.api.editSubsection, data).then(res => {
+      this.$put(this.api.editSubsectionCurriculm, data).then(res => {
         this.$message.success("更换成功");
         this.switchVisible = false;
         this.getData();
@@ -753,12 +751,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.$del(`${this.api.deleteSubsection}/${row.id}`).then(res => {
+          this.$del(`${this.api.deleteSubsectionCurriculm}/${row.id}`).then(res => {
             row.fileUrl && Oss.del(row.fileUrl)
-            this.$message.success("删除成功");
-            this.getData();
-          }).catch(res => {
-          });
+            this.$message.success("删除成功")
+            this.getData()
+          }).catch(res => { })
         }).catch(() => { })
     },
     sortChapter (row, type, disabled, index) {
@@ -774,7 +771,7 @@ export default {
     },
     sectionNameSubmit () {
       if (!this.sectionForm.sectionName) return this.$message.warning("请填写小节名称")
-      this.$put(this.api.editSubsection, {
+      this.$put(this.api.editSubsectionCurriculm, {
         id: this.sectionId,
         cid: this.id,
         chapterId: this.chapterId,

src/pages/lesson/content/source.vue

@@ -77,7 +77,7 @@
             </template>
           </div>
         </template>
-        <div v-else class="empty">
+        <div v-else class="none">
           <img class="icon" src="@/assets/img/empty.svg" alt="">
           <p>暂无数据</p>
         </div>
@@ -303,7 +303,7 @@ export default {
   }
 
 
-  .empty {
+  .none {
     display: flex;
     flex-direction: column;
     justify-content: center;

src/pages/lesson/detail/index.vue

@@ -160,7 +160,7 @@
 
           <!-- 第三步 -->
           <template v-else-if="step === 3">
-            <div class="mgb20" style="text-align: right;">
+            <div class="m-b-20 text-right">
               <el-button @click="handleBatchDelete(1)">批量移除</el-button>
               <el-button @click="handleConfig(1)" icon="el-icon-plus" circle></el-button>
             </div>
@@ -273,7 +273,7 @@
 
             <div class="lines">
               <template v-for="(item, i) in checkeds">
-                <div v-if="item.projectName.includes(checkedKeyword)" :key="i" class="line">
+                <div v-if="item.projectName && item.projectName.includes(checkedKeyword)" :key="i" class="line">
                   <div class="check-left">
                     <el-checkbox v-model="item.check"></el-checkbox>
                     <span class="serial">{{ i + 1 }}</span>
@@ -703,8 +703,11 @@ export default {
         }
       }
     },
-    handleSelectionPractice (val) { // 多选练习项目
-      this.multiplePractice = val;
+    handleSelectionPractice (val) {
+      this.multiplePractice = val
+    },
+    handleSelectionAssessment (val) {
+      this.multipleAssessment = val
     },
 
     // 练习考核弹框
@@ -1018,7 +1021,7 @@ export default {
 
 .modal {
   width: 500px;
-  padding-top: 150px;
+  padding: 150px 0;
   margin: 0 auto;
 
   h1 {
@@ -1080,7 +1083,7 @@ export default {
   }
 
   .systems {
-    max-height: calc(100vh - 133px);
+    max-height: calc(100vh - 181px);
     margin-top: 10px;
     overflow: auto;
 
@@ -1095,7 +1098,7 @@ export default {
 
   .projects {
     margin-top: 10px;
-    max-height: calc(100vh - 174px);
+    max-height: calc(100vh - 226px);
     overflow: auto;
 
     li {

src/pages/lesson/list/index.vue

@@ -105,12 +105,12 @@
       </div>
     </el-card>
 
-    <el-dialog title="请选择上架范围" :visible.sync="onVisible" width="540px" :close-on-click-modal="false">
-      <el-radio-group v-model="isSpecify">
+    <el-dialog title="请选择上架范围" :visible.sync="onVisible" width="540px" :close-on-click-modal="false" @close="onClose">
+      <el-radio-group v-model="range">
         <el-radio :label="1">指定范围</el-radio>
         <el-radio :label="0">无指定范围</el-radio>
       </el-radio-group>
-      <el-tree class="m-t-10" ref="class" :data="classes" show-checkbox node-key="id" :props="{
+      <el-tree v-if="range" class="m-t-10" ref="class" :data="classes" show-checkbox node-key="id" :props="{
         label: 'organizationName'
       }">
       </el-tree>
@@ -152,7 +152,7 @@ export default {
 
       onVisible: false,
       classes: [],
-      isSpecify: 0,
+      range: 1,
       curRow: {},
     };
   },
@@ -267,14 +267,13 @@ export default {
               this.getData();
               this.$message.success("删除成功");
             }).catch(err => { })
-          }).catch(() => {
-          });
+          }).catch(() => { })
         }
       }).catch(err => { })
     },
     // 处理多选
     handleSelectionChange (val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     // 批量删除
     delAllSelection () {
@@ -296,7 +295,7 @@ export default {
                   }
                 }
                 this.getData();
-                this.$message.success("删除成功");
+                this.$message.success("删除成功")
                 this.$refs.table.clearSelection()
               }).catch(err => { })
             }).catch(() => { })
@@ -316,10 +315,15 @@ export default {
     async changeSwitch (val, row) {
       if (val) {
         row.isShelves = 0
+        this.range = 1
         this.curRow = row
         this.onVisible = true
       } else {
-        await this.$post(`${this.api.isShelves}?cid=${row.cid}&isShelves=${val}`)
+        await this.$post(this.api.schoolCourseShelf, {
+          cid: row.cid,
+          isShelves: val
+        })
+
         this.getData()
         this.$message.success("修改上下架状态成功！")
       }
@@ -331,13 +335,22 @@ export default {
     },
     // 上架提交
     async onSubmit () {
-      const check = this.$refs.class.getCheckedKeys()
-      if (!check.length) return Util.warningMsg('请选择班级')
-      console.log(this.$refs.class.getCheckedKeys())
-      // await this.$post(`${this.api.isShelves}?cid=${row.cid}&isShelves=${value}`)
+      const { range } = this
+      const check = range ? this.$refs.class.getCheckedKeys() : []
+      if (range && !check.length) return Util.warningMsg('请选择班级')
+      await this.$post(this.api.schoolCourseShelf, {
+        cid: this.curRow.cid,
+        classIds: range ? check : [1],
+        isShelves: 1
+      })
+      this.onVisible = false
       this.getData()
       this.$message.success('修改上下架状态成功！')
     },
+    onClose () {
+      const el = this.$refs.class
+      el && el.setCheckedKeys(el.getCheckedNodes(), false)
+    }
   }
 };
 </script>