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

src/components/drawers/AddLive.vue

@@ -197,7 +197,7 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <button class="xkbtn" @click="showAssessment">选择评估</button>
-              <div v-if="(assessmentId !== '0')">
+              <div v-if="(assessmentId > 0)">
                 <a-tag closable @close="removePG" color="processing">
                   <span style="font-size: 14px; line-height: 33px"
                   >删除评估</span
@@ -591,10 +591,11 @@ export default {
     };
     const showAssessment = () => {
       state.assessmentVisible = true;
-      console.log("hshs======", state.assessmentVisible);
+    
     };
     //创建直播
     const updateLiveBroadcast = () => {
+      console.log("hshs======", state.memberValue);
       if (!state.inputV1) {
         message.destroy();
         return message.warning("请输入直播名称");
@@ -607,6 +608,14 @@ export default {
         message.destroy();
         return message.warning("请输入直播时长");
       }
+      if (state.memberValue.value=="") {
+        message.destroy();
+        return message.warning("请选择授课教师");
+      }
+      if (!state.imageUrl) {
+        message.destroy();
+        return message.warning("请上传封面");
+      }
       const regular = /^[+]{0,1}(\d+)$/;
       if (!regular.test(state.inputV2)) {
         message.destroy();

src/components/drawers/AddTest.vue

@@ -516,6 +516,7 @@ export default {
         return Promise.reject("请选择时间");
       }
     };
+    
     let checkExaminationDuration = async (_rule, value) => {
       if (!value) {
         return Promise.reject("请输入考试时长");
@@ -720,7 +721,7 @@ export default {
       };
       if(!(state.paperId >0)){
         message.destroy();
-       return message.error("请选择考试");
+        return message.error("请选择考试");
       }
       if (props.edit) {
         // 编辑任务

src/views/learningpath/LevelAddDetail.vue

@@ -1385,10 +1385,13 @@ export default {
     const dataAssignment = (id) => {
       console.log(state.level);
       for (let i = 0; i < state.level.length; i++) {
-        if (state.level[i].chapterId === id) {
+        console.log("state.level[i].chapterId", state.level[i].chapterId, id);
+        if (state.level[i].chapterId == Number(id)) {
           let array = [];
           state.chooseProjectList = JSON.stringify(state.level[i].taskList);
+          console.log("state.level[i].taskList", state.level[i].taskList);
           state.level[i].taskList.forEach((element) => {
+            // console.log("element", element);
             let obj = {
               id: element.routerTaskId,
               key: element.routerTaskId,
@@ -1403,9 +1406,12 @@ export default {
               routerId: element.routerId,
               chapterId: element.chapterId,
             };
+            // console.log("obj", obj);
             array.push(obj);
+            // console.log("array", array);
           });
           state.tableData = array;
+          // console.log("tableData", state.tableData);
         }
       }
     };
@@ -1432,12 +1438,15 @@ export default {
           });
           console.log("路径图详情", res);
           if (state.level.length > 0) {
-            let chapter = localStorage.getItem("chapterId");
-            // console.log("chapter", chapter, chapter !== "null");
+            let chapter = localStorage.getItem("chapterId")
+              ? JSON.parse(localStorage.getItem("chapterId"))
+              : null;
+            console.log("chapter", chapter);
             if (chapter) {
               dataAssignment(chapter); //用哪个的任务表
               state.isactive = chapter; //哪个亮
             } else {
+              console.log("state.level[0]", state.level[0]);
               dataAssignment(state.level[0].chapterId);
               state.isactive = state.level[0].chapterId;
             }
@@ -1740,7 +1749,7 @@ export default {
     const moveTask = () => {
       if (state.isactive == state.removeStageId) {
         message.destroy();
-        message.warning("选择的任务已在当前阶段");
+        message.warning("选择的任务已在当前关卡");
       } else if (state.removeStageId == null) {
         message.destroy();
         message.warning("请选择关卡");