Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/drawers/AssessmentAll.vue

src/views/learningpath/LevelAdd.vue

@@ -327,7 +327,7 @@
               <div class="taskmain">任务大纲</div>
 
               <router-link
-                :to="{ path: '/leveladddetail', query:{ routerId: routerId } }"
+                :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
                 class="editright"
                 v-if="checkPer(permissions)"
               >
@@ -340,7 +340,9 @@
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
-              <router-link :to="{ path: '/leveladddetail', query:{ routerId: routerId } }">
+              <router-link
+                :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
+              >
                 <div
                   class="taskbox"
                   style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -529,17 +531,17 @@
                           item.type === 6 ||
                           item.type === 11 ||
                           item.type === 9
-                            ? commonModel(item, value.name)
+                            ? commonModel(item, value.name, value.chapterId)
                             : item.type === 2
                             ? faceTeachModel(item)
                             : item.type === 4
                             ? homeworkModel(item)
                             : item.type === 5
-                            ? examinationModel(item, value.name)
+                            ? examinationModel(item, value.name, value.chapterId)
                             : item.type === 10
                             ? evaluationModel(item, value.name)
                             : item.type === 12
-                            ? voteModel(item, value.name)
+                            ? voteModel(item, value.name, value.chapterId)
                             : item.type === 13
                             ? projectModel(item, value.name)
                             : null
@@ -1301,6 +1303,7 @@
       v-model:ExaminationExaminaModelVisible="examinationExaminaModelVisible"
       :title="examinationModelVisibleTitle"
       :datasource="examinationData"
+      :outchapter="outchapter"
       :levelName="examLevelName"
     />
     <!-- 外部考试管理抽屉 结束-->
@@ -1327,6 +1330,7 @@
       v-model:CommonModelVisible="commonModelVisible"
       :title="commonModelVisibleTitle"
       :datasource="commonData"
+      :outchapter="outchapter"
       :levelName="commonLevelName"
     />
     <!-- 公共管理抽屉 结束-->
@@ -1336,6 +1340,7 @@
       v-model:VoteModelVisible="voteModelVisible"
       :title="voteModelVisibleTitle"
       :datasource="voteData"
+      :outchapter="outchapter"
       :levelName="voteLevelName"
     />
     <!-- 投票管理抽屉 结束-->
@@ -1364,7 +1369,7 @@ import TestManage from "../../components/drawers/TestManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
 import SeeStu from "../../components/drawers/SeeStu";
-import { useRouter,useRoute } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import { getRouterOverview } from "@/api/indexLearningPath";
 import { handleLearnPath } from "../../api/index1";
 import { GetRouterDetail } from "@/api/indexTask";
@@ -1590,6 +1595,7 @@ export default {
       projectModelVisible: false,
       faceTeachModelVisibleTitle: "",
       examinationModelVisibleTitle: "",
+      outchapter:"",
       evaluationModelVisibleTitle: "",
       homeworkModelVisibleTitle: "",
       commonModelVisibleTitle: "",
@@ -1900,11 +1906,12 @@ export default {
       // 面授课弹框名称 RouterFaceTeachManage
     };
     // 考试点击管理弹框
-    const examinationModel = (data, levelname) => {
+    const examinationModel = (data, levelname, outchapterid) => {
       console.log(data);
       if (data.startTime == null && data.endTime == null) {
         // 外部考试
         state.examinationExaminaModelVisible = true;
+        state.outchapter = outchapterid;
       } else {
         // 系统考试
         state.examinationModelVisible = true;
@@ -1924,12 +1931,13 @@ export default {
       // 测评弹框名称 RouterEvaluationManage
     };
     // 投票点击管理弹框
-    const voteModel = (data, levelname) => {
+    const voteModel = (data, levelname, outchapterid) => {
       console.log(data);
       state.voteLevelName = levelname;
       state.voteModelVisible = true;
       state.voteModelVisibleTitle = data.name;
       state.voteData = data;
+      state.outchapter = outchapterid;
       // 投票弹框名称 RouterVoteManage
     };
     // 项目点击管理弹框
@@ -1950,12 +1958,13 @@ export default {
       // 作业弹框名称 RouterHomeworkManage
     };
     // 在线、案例、外链、评估、直播、活动点击管理弹框
-    const commonModel = (data, levelname) => {
+    const commonModel = (data, levelname, outchapterid) => {
       state.commonLevelName = levelname;
       console.log(data);
       state.commonModelVisible = true;
       state.commonModelVisibleTitle = data.name;
       state.commonData = data;
+      state.outchapter = outchapterid;
       // 公共模块弹框名称 RouterCommonManage
     };
 
@@ -2278,6 +2287,7 @@ export default {
             state.nodata = false;
           }
           let data = res.data.data.chapterList;
+          console.log('----------------111111111111111-----------------2222222222', res.data.data.chapterList)
           state.stage = res.data.data.chapterList.map((e) => ({
             id: e.chapterId,
             name: e.name,
@@ -2549,7 +2559,7 @@ export default {
       // console.log("state.taskSyllabus", state.taskSyllabus);
       router.push({
         path: "/leveladddetail",
-        query:{ routerId: state.routerId } 
+        query: { routerId: state.routerId },
       });
       //       if (state.taskSyllabus.length===1) {
       //         if(state.taskSyllabus[0].taskList.length===0){
@@ -2594,6 +2604,7 @@ export default {
           "&id=" +
           item.projectTaskId;
       }
+      if (item.type == 3) return message.error("请在pc端完成");
 
       if (item.type == 4) {
         let date1 = new Date(item.endTime).getTime();