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

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.1.6------------");
+console.log("版本2.1.7------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/api/config.js

@@ -60,7 +60,7 @@ http.interceptors.response.use(
         if (code === 1000) {
             (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? 
             router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : 
-            (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VUE_APP_BOE_API_URL + import.meta.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
+            (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
             return Promise.reject(response);
         }
         show && message.error(msg);

src/views/learningpath/LearningPath.vue

@@ -100,7 +100,7 @@
       >
         <template #bodyCell="{ record, column }">
           <template v-if="column.key === 'operation'">
-            <a-space>
+            <a-space :key="record.id">
               <a-button
                 v-if="record.state === '草稿' && checkPer(record.permissions)"
                 @click="showPub(record)"

src/views/learningpath/LevelAdd.vue

@@ -2686,7 +2686,11 @@ export default {
           "/homeworkpage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.chapterId +
+          "&infoId=" +
+          state.routerId;
       }
       // 考试 停用
       if (item.type == 5) {
@@ -2698,7 +2702,13 @@ export default {
             window.location.protocol +
             process.env.VUE_APP_H5 +
             "/externalexam?type=2&courseId=" +
-            item.courseId;
+            item.courseId +
+            "&id=" +
+            item.id +
+            "&chapterOrStageId=" +
+            item.chapterId +
+            "&infoId=" +
+            state.routerId;
         } else {
           codeUrl =
             window.location.protocol +
@@ -2717,7 +2727,11 @@ export default {
           "/liveboradcast?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.chapterId +
+          "&infoId=" +
+          state.routerId;
       }
       // 外链
       if (item.type == 7) {
@@ -2741,7 +2755,11 @@ export default {
           "/discusspage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.chapterId +
+          "&infoId=" +
+          state.routerId;
       }
       //活动
       if (item.type == 9) {
@@ -2754,7 +2772,11 @@ export default {
           "/activitiespage?courseId=" +
           item.courseId +
           "&type=2&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.chapterId +
+          "&infoId=" +
+          state.routerId;
       }
       //活动
       if (item.type == 10) {
@@ -2766,7 +2788,13 @@ export default {
           "&evaType=" +
           item.evaType +
           "&type=2&targetId=" +
-          item.targetId;
+          item.targetId +
+          "&id=" +
+          item.id +
+          "&chapterOrStageId=" +
+          item.chapterId +
+          "&infoId=" +
+          state.routerId;
       }
 
       // 评估 停用

src/views/projectcenter/TaskPage.vue

@@ -4633,7 +4633,11 @@ export default {
           "/homeworkpage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.stageId +
+          "&infoId=" +
+          state.projectId;
       }
       // 考试 停用
       if (item.type == 5) {
@@ -4645,7 +4649,13 @@ export default {
             window.location.protocol +
             process.env.VUE_APP_H5 +
             "/externalexam?type=1&courseId=" +
-            item.courseId;
+            item.courseId +
+            "&id=" +
+            item.id +
+            "&chapterOrStageId=" +
+            item.stageId +
+            "&infoId=" +
+            state.projectId;
         } else {
           codeUrl =
             window.location.protocol +
@@ -4664,7 +4674,11 @@ export default {
           "/liveboradcast?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.stageId +
+          "&infoId=" +
+          state.projectId;
       }
       // 外链
       if (item.type == 7) {
@@ -4688,7 +4702,11 @@ export default {
           "/discusspage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.stageId +
+          "&infoId=" +
+          state.projectId;
       }
       //活动
       if (item.type == 9) {
@@ -4702,7 +4720,11 @@ export default {
           "/activitiespage?courseId=" +
           item.courseId +
           "&type=1&id=" +
-          item.id;
+          item.id +
+          "&chapterOrStageId=" +
+          item.stageId +
+          "&infoId=" +
+          state.projectId;
       }
       //活动
       if (item.type == 10) {
@@ -4714,7 +4736,13 @@ export default {
           "&type=1&evaType=" +
           item.evaType +
           "&targetId=" +
-          item.targetId;
+          item.targetId +
+          "&id=" +
+          item.id +
+          "&chapterOrStageId=" +
+          item.stageId +
+          "&infoId=" +
+          state.projectId;
       }
 
       // 评估 停用