Merge branch 'zcwy-zsx0223' into dev0223

src/views/learningpath/LevelAdd.vue

@@ -46,8 +46,11 @@
         @change="changeTabs"
         :tabBarStyle="{ marginLeft: '10px' }"
       >
-        <a-tab-pane key="1" tab="概览">
+        <a-tab-pane key="1" tab="概览" style="position: relative;">
           <div class="split"></div> 
+          <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+            <a-spin :spinning="addLoading" tip="" />
+          </div>
           <!-- 概览（无数据） -->
           <div v-if="!hasTask">
             <div v-if="reuse" class="reuse">
@@ -268,8 +271,19 @@
           </div>
           <!-- 概览（有数据） -->
         </a-tab-pane>
-        <a-tab-pane key="2" tab="路径管理">
+        <a-tab-pane key="2" tab="路径管理" style="position: relative;">
           <div class="split"></div>
+          <div class="aeLoading" :style="{ display: addLoadingL ? 'flex' : 'none' }">
+            <a-spin :spinning="addLoadingL" tip="" />
+          </div>
+          <div v-if="reuseL" class="reuse">
+              <div class="onerow">
+                <div class="taskmain">路径管理</div>
+              </div>
+              <div>
+                <a-button class="reuse_btn" type="primary" @click="totaskaaaL">重新加载</a-button>
+              </div>
+            </div>
           <!-- <div class="cont">
             <div class="pad"></div>
             <div class="sametab">
@@ -1158,9 +1172,9 @@
       />
     </div>
     <!--  加载动画 -->
-    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+    <!-- <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
       <a-spin :spinning="addLoading" tip="" />
-    </div>
+    </div> -->
     <!-- 发布弹窗 -->
     <a-modal
       v-model:visible="pub"
@@ -1524,17 +1538,24 @@ export default {
   },
   setup() {
   const totaskaaa = ()=>{
-    setHttpTimeout(1000*60);
+    setHttpTimeout(1000*30);
     state.addLoading = true;
     getOverview();
-    myGetRouterDetail();
+    // myGetRouterDetail();
     reget();
   }
-    const getTaskListAll = () =>{
+  const totaskaaaL = ()=>{
-      state.addLoading = true;
+    setHttpTimeout(1000*30);
-      getOverview();
+    state.addLoadingL = true;
+    // getOverview();
     myGetRouterDetail();
-      reget();
+    // reget();
+  }
+    const getTaskListAll = () =>{
+      state.addLoadingL = true;
+      // getOverview();
+      myGetRouterDetail();
+      // reget();
     }
     const exportScore = (item) => {
       window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/export?type=${2}&pid=${item.id}&courseId=${item.courseId}`)
@@ -1640,6 +1661,7 @@ export default {
     // const store = useStore();
     const state = reactive({
       reuse:false,
+      reuseL: false,
       createId: null,
       permissions: "",
       hasTask: false,
@@ -1668,6 +1690,7 @@ export default {
       AddImpStuvisible: false, //导入学员抽屉
       CheckStuvisible: false, //学员管理的查看抽屉
       addLoading: false, // 加载动画
+      addLoadingL: false,
       choosedStageId: 1, // 选择的阶段id
       choosedStageIndex: 0, // 选择的阶段ID
       selectedRowKeys: [],
@@ -2115,6 +2138,7 @@ export default {
       console.log("切换tabs", e, state.routerId);
       if (e == 2) {
         myGetRouterDetail();
+        state.addLoadingL = true
       }
       //学员管理
       if (e == 3) {
@@ -2268,7 +2292,7 @@ export default {
 
       state.addLoading = true;
       getOverview();
-      myGetRouterDetail();
+      // myGetRouterDetail();
       reget();
     });
     const closePub = () => {
@@ -2577,8 +2601,12 @@ export default {
               }
             }
           }
+          state.addLoadingL = false;
+          state.reuseL = false
         })
         .catch((err) => {
+          state.addLoadingL = false;
+          state.reuseL = true
           console.log(err);
           // message.error("获取路径列表失败" + err);
         });
@@ -3188,7 +3216,8 @@ export default {
       openCourse,
       exportScore,
       getTaskListAll,
-      totaskaaa
+      totaskaaa,
+      totaskaaaL,
     };
   },
 };