Merge remote-tracking branch 'origin/master'

package.json

@@ -11,6 +11,7 @@
     "build:prod-hzyy": "vue-cli-service build --mode prod-hzyy",
     "build:prod-jzzx": "vue-cli-service build --mode prod-jzzx",
     "build:prod-hcl": "vue-cli-service build --mode prod-hcl",
+    "build:prod-myhk": "vue-cli-service build --mode prod-myhk",
     "build:prod-sxjz": "vue-cli-service build --mode prod-sxjz",
     "build:prod-jnmy": "vue-cli-service build --mode prod-jnmy",
     "build:prod-hdt": "vue-cli-service build --mode prod-hdt",

src/components/VideoUpload/index.vue

@@ -389,6 +389,9 @@ export default {
       // 设置预览URL
       this.$emit("update:videoUrl", this.selectedVideo.videoUrl);
 
+      // 题目
+      this.$emit("selectProjects", this.selectedVideo.projectIds)
+
       this.libraryOpen = false;
     },
     /** 取消视频选择 */

src/views/components/course/userCourseCatalogDetails.vue

@@ -192,6 +192,7 @@
           :uploadType.sync="form.uploadType"
           @video-duration="handleVideoDuration"
           @change="handleVideoChange"
+          @selectProjects="handleSelectProjects"
           ref="videoUpload"
           append-to-body
         />
@@ -362,6 +363,7 @@ import {
 import QuestionBank from "@/views/course/courseQuestionBank/QuestionBank.vue";
 import VideoUpload from "@/components/VideoUpload/index.vue";
 import { listVideoResource } from '@/api/course/videoResource';
+import { getByIds } from '@/api/course/courseQuestionBank'
 
 export default {
   name: "userCourseCatalog",
@@ -554,6 +556,25 @@ export default {
       }
       // console.log("选择的video=======>>>>>>>",this.videoUrl)
     },
+    // 视频库课题
+    handleSelectProjects(projectIds) {
+      this.form.questionBankList = []
+      if (!projectIds || projectIds.length === 0 || this.isPrivate === 0) {
+        return
+      }
+
+      const params = {ids: projectIds}
+      getByIds(params).then(response => {
+        if (response.code === 200) {
+          response.data.forEach(item => {
+            let isExist = this.form.questionBankList.some(q => q.id === item.id)
+            if (!isExist) {
+              this.form.questionBankList.push(item)
+            }
+          });
+        }
+      })
+    },
     handleVideoDuration(duration) {
       this.form.duration = duration;
     },

src/views/course/courseQuestionBank/index.vue

@@ -118,7 +118,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['course:courseQuestionBank:import']"
+          v-hasPermi="['course:courseQuestionBank:importData']"
         >导入</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>