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

# Conflicts:
#	src/views/projectcenter/TaskAdd.vue
#	src/views/projectcenter/TaskPage.vue

src/api/config.js

@@ -2,10 +2,11 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-04 11:13:37
+ * @LastEditTime: 2022-12-04 13:27:07
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
+import { message } from "ant-design-vue";
 import axios from "axios";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
@@ -23,6 +24,7 @@ const http = axios.create({
 
 http.interceptors.request.use(
   (config) => {
+    // console.log('config', config)
     // const token = localStorage.getItem("token");
     // // const token = getCookie('token')
     // // console.log('token', token)
@@ -61,6 +63,10 @@ http.interceptors.response.use(
     return response;
   },
   function (error) {
+    if (error.message == "timeout of 1ms exceeded") {
+      message.destroy()
+      message.error("请求超时")
+    }
     console.log("api error %o", error);
     return Promise.reject(error);
   }

src/components/drawers/AddHomework.vue

@@ -31,6 +31,7 @@
               <div class="btnbox">
                 <a-form-item has-feedback label="作业名称" name="workName">
                   <a-input
+                    maxLength="20"
                     v-model:value="formState.workName"
                     style="width: 424px; height: 32px; margin-left: 35px"
                     placeholder="请输入作业名称"
@@ -46,7 +47,7 @@
                   placeholder="请输入作业要求"
                   autocomplete="off"
                   allow-clear
-                  style="margin-left: 35px"
+                  style="margin-left: 35px;width: 426px;height: 200px;"
                   maxlength="150"
                 />
               </a-form-item>

src/views/learningpath/LevelAdd.vue

@@ -1914,6 +1914,7 @@ export default {
       GetRouterDetail(state.routerId)
         .then((res) => {
           console.log('router-list',res)
+          state.fileList = JSON.parse(res.data.data.routerInfo.attach)
           if (res.data.data.routerInfo.status == 1) {
             state.nodata = false;
           }

src/views/projectcenter/ProjectAdd.vue

@@ -171,7 +171,19 @@
             <div class="inname">同步学习记录</div>
           </div>
           <div class="in">
-            <a-switch
+            <a-checkbox
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
+            >
+            <!-- <a-switch
               v-model:checked="projectInfo.courseSyncFlag"
               :checkedValue="1"
               :unCheckedValue="0"
@@ -184,7 +196,7 @@
                 "
                 >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
               ></a-switch
-            >
+            > -->
           </div>
         </div>
         <div class="name">
@@ -317,6 +329,7 @@ export default {
         keyWord: "",
       },
       classifyList5: [],
+      courseSyncFlag: false,
     });
 
     onMounted(() => {
@@ -349,6 +362,9 @@ export default {
             state.projectInfo.endTime,
           ];
           state.projectInfo.parentName = routers.query.parentName;
+          state.courseSyncFlag = state.projectInfo.courseSyncFlag
+            ? true
+            : false;
         });
     }
 
@@ -432,6 +448,7 @@ export default {
         return;
       }
       state.projectInfo.type = 3;
+      state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
       api.createProject(state.projectInfo).then(() => {
         message.destroy();
         message.success("编辑成功");