Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/views/learningpath/LearningPath.vue

@@ -867,8 +867,8 @@ export default {
           console.log("获取关卡、任务、学员统计数据", res.data);
           if (res.status === 200) {
             // state.routeStudentsNum = res.data.students;
-            state.routeChapters = res.data.chapters;
+            state.routeChapters = res.data.data.chapters;
-            state.routeTasks = res.data.tasks;
+            state.routeTasks = res.data.data.tasks;
           }
         })
         .catch((err) => {

src/views/learningpath/LevelAdd.vue

@@ -854,7 +854,12 @@
                       <div
                         v-for="item in fileList"
                         :key="item.uid"
-                        style="width:500px;display:flex;justify-content:space-between;align-items:center;"
+                        style="
+                          width: 500px;
+                          display: flex;
+                          justify-content: space-between;
+                          align-items: center;
+                        "
                         class="docListStyle"
                       >
                         <img
@@ -867,9 +872,17 @@
                           "
                           alt=""
                         />
-                        <span style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
+                        <span
-                          item.name
+                          style="
-                        }}</span>
+                            font: oblique bold 16px Sans-serif;
+                            width: 300px;
+                            display: block;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                          "
+                          >{{ item.name }}</span
+                        >
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -1280,7 +1293,7 @@ import TestManage from "../../components/drawers/TestManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
 import SeeStu from "../../components/drawers/SeeStu";
-// import { useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 // import { useStore } from "vuex";
 import { storage } from "../../api/storage";
 import { getRouterOverview } from "@/api/indexLearningPath";
@@ -1308,7 +1321,7 @@ export default {
     TwoDimensionalCode,
   },
   setup() {
-    // const routers = useRoute();
+    const router = useRouter();
     // const store = useStore();
     const state = reactive({
       routerId: storage.get("routerId")
@@ -1844,8 +1857,8 @@ export default {
           if (res.status === 200) {
             // console.log("获取关卡、任务、学员统计数据", res.data);
             // state.routeStudentsNum = res.data.students;
-            state.routeChapters = res.data.chapters;
+            state.routeChapters = res.data.data.chapters;
-            state.routeTasks = res.data.tasks;
+            state.routeTasks = res.data.data.tasks;
           }
         })
         .catch((err) => {
@@ -2295,7 +2308,16 @@ export default {
     );
 
     const totask = () => {
-      state.activeKey = "2";
+      // console.log("state.taskSyllabus", state.taskSyllabus);
+      router.push({
+        path: "/leveladddetail",
+      });
+      //       if (state.taskSyllabus.length===1) {
+      //         if(state.taskSyllabus[0].taskList.length===0){
+      // // /leveladddetail
+      //         }
+      //       }
+      // state.activeKey = "2";
     };
     const tostudent = () => {
       state.activeKey = "3";

src/views/projectcenter/ProjectManage.vue

@@ -1022,8 +1022,8 @@ export default {
       api.getProjectCount(object.projectId).then((res) => {
         console.log("获取关卡、任务、学员统计数据", res.data);
         // state.projectStudentsNum = res.data.students;
-        state.projectStages = res.data.stages;
+        state.projectStages = res.data.data.stages;
-        state.projectTasks = res.data.tasks;
+        state.projectTasks = res.data.data.tasks;
       });
       //获取学员总数
       let obj = {