Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

src/views/course/CoursewareAddOrUpdate.vue

@@ -154,7 +154,7 @@ import { dictionaryDropDown } from '@/api/sys/dictionaryItem';
 export default {
   data() {
     return {
-      pageName: this.$route.query.coursewareId ? '课件编辑' : '课件新增',
+      pageName: '',
       // treeData: [],
       ifResources: this.$route.query.ifResources,
       coursewareClassfiy: [],
@@ -202,6 +202,22 @@ export default {
     this.dictionaryDropDown();
     //判断是否加载数据
     if (this.queryParam.coursewareId) this.load();
+
+      // 是否资源库ifResources
+      console.log("资源库标号"+this.$route.query.ifResources+"课件ID："+this.$route.query.coursewareId)
+
+      if(this.$route.query.coursewareId && this.$route.query.ifResources == 1 ) {
+         this.pageName = '资源库编辑'
+      }else if(!this.$route.query.coursewareId && this.$route.query.ifResources == 1){
+         this.pageName = '资源库新增'
+      }
+
+      if(this.$route.query.coursewareId && this.$route.query.ifResources == 0) {
+        this.pageName = '课件编辑'
+      }else if(!this.$route.query.coursewareId && this.$route.query.ifResources == 0){
+        this.pageName = '课件新增'
+      }
+
 },
   methods: {
     //弹框
@@ -242,8 +258,8 @@ export default {
     callback(key) {
       this.fileUpload.videoForm = {};
       this.fileUpload.textForm = {};
-      console.log("aaaaaaa ",this.fileUpload.videoForm);
-      console.log("aaaaaaa ",this.fileUpload.textForm);
+      console.log('aaaaaaa ', this.fileUpload.videoForm);
+      console.log('aaaaaaa ', this.fileUpload.textForm);
       this.videoPath = []; //置空文件
 
       this.successOssFile = this.successOssFile.splice(this.successOssFile.length, 0); //清空数组
@@ -423,7 +439,7 @@ export default {
       }
 
       //给课程ID
-      this.fileUpload.videoForm.type = "1"
+      this.fileUpload.videoForm.type = '1';
       this.fileUpload.videoForm.courseId = this.$route.query.courseId;
       this.fileUpload.videoForm.videoPath = this.videoPath;
       this.fileUpload.videoForm.ifResources = this.$route.query.ifResources || 0;
@@ -441,7 +457,7 @@ export default {
       }
 
       //给课程ID
-      this.fileUpload.textForm.type = "2"
+      this.fileUpload.textForm.type = '2';
       this.fileUpload.textForm.courseId = this.$route.query.courseId;
       this.fileUpload.textForm.type = this.fileUpload.tabkey;
       this.fileUpload.textForm.videoPath = this.videoPath;
@@ -487,7 +503,7 @@ export default {
 
     //加载数据
     load() {
-      //判断是否是编辑
+      //判断是否是编1辑
       if (this.queryParam.coursewareId) {
         let parameter = {};
         coursewareDeatil(Object.assign(parameter, this.queryParam)).then(res => {
@@ -562,7 +578,6 @@ export default {
     //     this.fileUpload.textForm.learnScore= 0.0
     //   }
     // },
-
   },
 };
 </script>

src/views/course/CoursewareList.vue

@@ -93,6 +93,7 @@ export default {
           courseId: this.$route.query.id,
           type: record.type,
           types: this.$route.query.type,
+          ifResources:0
         },
       })
     },