Merge branch 'zcwy-zsx0223' into 'master'

Zcwy zsx0223

See merge request !165

src/api/config.js

@@ -83,3 +83,6 @@ http.interceptors.response.use(
 );
 
 export default http;
+export function setHttpTimeout(newTimeout) {
+    http.defaults.timeout = newTimeout;
+  }

src/components/common/QrCode.vue

@@ -90,7 +90,10 @@ onMounted(() => props.duration && setTimeout(() => props.close(), props.duration
 function download() {
   html2canvas(
     document.querySelector(".downloadCode"),
-    { useCORS: true }
+    { useCORS: true,
+      allowTaint: true,
+      logging: true,
+    }
   ).then((canvas) => {
     let a = document.createElement("a");
     a.style.display = "none";
@@ -98,7 +101,7 @@ function download() {
     a.href = canvas.toDataURL("image/png");
     document.body.appendChild(a);
     a.click();
-  });
+  }).catch((err) => console.log('html2canvas',err));
 }
 
 function copyUrl() {

src/views/learningpath/LevelAdd.vue

@@ -47,9 +47,17 @@
         :tabBarStyle="{ marginLeft: '10px' }"
       >
         <a-tab-pane key="1" tab="概览">
-          <div class="split"></div>
+          <div class="split"></div> 
           <!-- 概览（无数据） -->
           <div v-if="!hasTask">
+            <!-- <div v-if="reuse" class="reuse">
+              <div class="onerow">
+                <div class="taskmain">关卡概览</div>
+              </div>
+              <div>
+                <a-button class="reuse_btn" type="primary" @click="totaskaaa">重新加载</a-button>
+              </div>
+            </div> -->
             <div class="onerow">
               <div class="taskmain">快速创建路径图详情</div>
             </div>
@@ -1150,9 +1158,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"
@@ -1486,6 +1494,7 @@ import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import { checkPer,fixDoublePer } from "@/utils/utils";
 import {getCookieForName} from "@/api/method";
 import qrCode from "@/utils/qrCode";
+import { setHttpTimeout } from '@/api/config';
 export default {
   name: "LevelAdd",
   components: {
@@ -1514,6 +1523,13 @@ export default {
     AddOpenCourse
   },
   setup() {
+  const totaskaaa = ()=>{
+    setHttpTimeout(1000*60);
+    state.addLoading = true;
+    getOverview();
+    myGetRouterDetail();
+    reget();
+  }
     const getTaskListAll = () =>{
       state.addLoading = true;
       getOverview();
@@ -1623,6 +1639,7 @@ export default {
     const headers = { token: getCookieForName("token") };
     // const store = useStore();
     const state = reactive({
+      reuse:false,
       createId: null,
       permissions: "",
       hasTask: false,
@@ -2251,7 +2268,7 @@ export default {
 
       state.addLoading = true;
       getOverview();
-      myGetRouterDetail();
+      // myGetRouterDetail();
       reget();
     });
     const closePub = () => {
@@ -2456,6 +2473,7 @@ export default {
           state.addLoading = false;
           message.error("概览获取失败");
           console.log("获取失败" + err);
+          // state.reuse = true
         });
     };
 
@@ -3169,7 +3187,8 @@ export default {
       coursePlanRef,
       openCourse,
       exportScore,
-      getTaskListAll
+      getTaskListAll,
+      totaskaaa
     };
   },
 };
@@ -4558,7 +4577,24 @@ export default {
         }
       }
     }
-
+    .reuse{
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 50px;
+      .reuse_btn{
+        width: 102px;
+        height: 42px;
+        text-align: center;
+        line-height: 34px;
+        border-radius: 6px;
+        color: #ffffff;
+        font-size: 16px;
+        background: #4ea6ff;
+        margin-right: 38px;
+        margin-top: 15px;
+        cursor: pointer;
+      }
+    }
     .taskbox {
       width: 412px;
       height: 160px;