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

src/views/homework/HomeworkPage.vue

@@ -18,13 +18,15 @@
       <div class="return">
         <div style="display: flex" @click="returnclick">
           <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
+            style="margin-right: 22px"
             src="../../assets/image/return.png"
           />
           <div class="text">返回</div>
         </div>
       </div>
     </div>
+    <div @click="returnclick">返回</div>
     <!-- 面包屑导航 -->
     <div class="debateTitle" style="color: #fff">
       【作业】管理者进阶腾飞班 - 中级管理者作业
@@ -272,28 +274,29 @@ const fileList = ref([]);
 const uploadRef = ref();
 const showFileList = ref(0);
 const sbValue = ref({
-  content: '',
+  content: "",
-  attach: ''
+  attach: "",
-})
+});
 const router = useRouter();
 const returnclick = () => {
   router.back();
 };
-
 const {
   query: { courseId: workId, type, id: taskId, pName, sName },
 } = useRoute();
 
 const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
-const {data: submitList} = useRequest(TASK_WORK_SUBMIT_LIST, {workerId:workId});
+const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
+  workerId: workId,
+});
 
 const handleClick = () => {
-  console.log(sbValue.value)
+  console.log(sbValue.value);
-  console.log(fileList)
+  console.log(fileList);
   request(TASK_WORK_COMMIT, {
     projectOrRouterLogo: type,
     workUploadContent: sbValue.value.content,
-    workUploadAddress: fileList.value.map(e => e.url).join(',') || '',
+    workUploadAddress: fileList.value.map((e) => e.url).join(",") || "",
     workId,
     type,
     taskId,

src/views/roadmap/LearnPath.vue

@@ -112,7 +112,16 @@
               prop="state"
               label="状态"
             >
-              <img :src="ongoing"
+              <img
+                :src="
+                  scope.row.status === 0
+                    ? ongoing
+                    : scope.row.status === 1
+                    ? completed
+                    : scope.row.status === -1
+                    ? nostarted
+                    : null
+                "
                 style="width: 99px; height: 99px"
               />
             </el-table-column>
@@ -156,7 +165,7 @@ import store from "@/store";
 const detail = ref();
 const userInfo = computed(() => store.state.userInfo);
 const { data } = usePage(ROUTER_LIST, {});
-
+console.log("datadata", data);
 const router = useRouter();
 const returnclick = () => {
   router.back();
@@ -179,17 +188,21 @@ async function gofun({routerId, name: routerName}) {
   // detail.value = data.data
   // state.showmapdetail = true;
   // router.push({path: "/pathdetails", query: {routerId}});
-  import.meta.env.MODE === 'development' ? router.push({
+  import.meta.env.MODE === "development"
+    ? router.push({
         path: "/pathdetails",
-    query: {routerId, routerName}
+        query: { routerId, routerName },
-  }) : window.open(`http://localhost:5173/fe-student/pathdetails&params=${encodeURIComponent(`routerId=${routerId}&routerName=${routerName}`)}`)
+      })
+    : window.open(
+        `http://localhost:5173/fe-student/pathdetails&params=${encodeURIComponent(
+          `routerId=${routerId}&routerName=${routerName}`
+        )}`
+      );
 }
 
-function toUnTask() {
+function toUnTask() {}
-}
 </script>
 <style lang="scss">
-
 .modal {
 }
 

src/views/roadmap/PathDetails.vue

@@ -30,7 +30,9 @@
           </div>
           <div
             class="course"
-              v-for="(value, index) in i.taskProcessList.filter(e =>!whiteTypes(e.type))"
+            v-for="(value, index) in i.taskProcessList.filter(
+              (e) => !whiteTypes(e.type)
+            )"
             :key="index"
           >
             <div>
@@ -149,7 +151,7 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程公告" name="first">
               <div class="notice">
-                {{ data.remark || '暂无公告' }}
+                {{ data.remark || "暂无公告" }}
               </div>
             </el-tab-pane>
             <!--
@@ -176,7 +178,6 @@
             <!--                </div>-->
             <!--              </div>-->
             <!--   </el-tab-pane>-->
-      
           </el-tabs>
         </div>
         <!-- 课程公告及共享文档 -->
@@ -220,7 +221,7 @@
               <div class="box"></div>
             </div>
             <div class="rate">
-              <div class="ratetext">上次学到：启航班-领导寄语</div>
+              <div class="ratetext">上次学到：{{ data.lastLearned }}</div>
               <div class="ratebtn">继续学习</div>
             </div>
             <div style="margin-top: 16px">
@@ -229,11 +230,7 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="
+                      :percentage="parseInt(data.totalProgress * 100)"
-                        parseInt(
-                          (data.currentChapterCnt / data.totalChapterCnt) * 100
-                        )
-                      "
                       :show-text="false"
                       :stroke-width="8"
                       :color="
@@ -244,11 +241,7 @@
                           3: 'rgba(59, 94, 251, 1)',
                           4: 'rgba(57, 219, 183, 1)',
                           5: 'rgba(57, 219, 183, 1)',
-                        }[
+                        }[parseInt(data.totalProgress)]
-                          parseInt(
-                            data.currentChapterCnt / data.totalChapterCnt
-                          )
-                        ]
                       "
                     />
                   </div>
@@ -262,16 +255,10 @@
                         3: 'rgba(59, 94, 251, 1)',
                         4: 'rgba(57, 219, 183, 1)',
                         5: 'rgba(57, 219, 183, 1)',
-                      }[
+                      }[parseInt(data.totalProgress)],
-                        parseInt(data.currentChapterCnt / data.totalChapterCnt)
-                      ],
                     }"
                   >
-                    {{
+                    {{ parseInt(data.totalProgress * 100) }}%
-                      parseInt(
-                          (data.currentChapterCnt / data.totalChapterCnt) * 100
-                      )
-                    }}%
                   </div>
                 </div>
               </div>
@@ -282,9 +269,7 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                        :percentage="
+                      :percentage="parseInt(data.compulsoryProgress * 100)"
-                        parseInt((data.currentReqCnt / data.totalReqCnt) * 100)
-                      "
                       :show-text="false"
                       :stroke-width="8"
                       :color="
@@ -295,7 +280,7 @@
                           3: 'rgba(59, 94, 251, 1)',
                           4: 'rgba(57, 219, 183, 1)',
                           5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentReqCnt / data.totalReqCnt)]
+                        }[parseInt(data.compulsoryProgress)]
                       "
                     />
                   </div>
@@ -314,12 +299,10 @@
                         3: 'rgba(59, 94, 251, 1)',
                         4: 'rgba(57, 219, 183, 1)',
                         5: 'rgba(57, 219, 183, 1)',
-                      }[parseInt(data.currentReqCnt / data.totalReqCnt)],
+                      }[parseInt(data.compulsoryProgress)],
                     }"
                   >
-                    {{
+                    {{ parseInt(data.compulsoryProgress * 100) }}%
-                      parseInt((data.currentReqCnt / data.totalReqCnt) * 100)
-                    }}%
                   </div>
                 </div>
               </div>
@@ -355,13 +338,11 @@ const {
   query: { routerId, routerName },
 } = useRoute();
 const router = useRouter();
-const returnclick = () => {
+
-  router.back();
-};
 const { data } = useRequest(ROUTER_PROCESS, { routerId });
 
 const userInfo = computed(() => store.state.userInfo);
-
+console.log("userInfo", userInfo);
 const activeName = ref("first");
 
 const handleClick = (tab, event) => {
@@ -407,13 +388,18 @@ const types = ref({
     4: "/homeworkpage",
     5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
     6: "/livebroadcast",
-    7: ({courseId}) => request(LINK_DETAILS(courseId), {}).then(({data: {linkAddress}}) => window.open(linkAddress)),//外联
+    7: ({ courseId }) =>
+      request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
+        window.open(linkAddress)
+      ), //外联
     8: "/discusspage",
     9: "/moreactive",
-    10: ({
+    10: ({ evaTyp, targetId }) =>
-           evaTyp,
+      window.open(
-           targetId
+        (evaTyp === 1
-         }) => window.open((evaTyp === 1 ? import.meta.env.VITE_BOE_TEST_DETAIL_URL : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId), //测评
+          ? import.meta.env.VITE_BOE_TEST_DETAIL_URL
+          : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+      ), //测评
     11: "/surveydetail",
     12: "/ballotpage",
     13: "/projectdetails",
@@ -426,20 +412,29 @@ function toFinish(d, sName) {
     return;
   }
 
-  if (typeof types.value.path[d.type] === 'string') {
+  if (typeof types.value.path[d.type] === "string") {
-    types.value.path[d.type] && types.value.path[d.type].startsWith("http") && window.open(types.value.path[d.type] + d.targetId)
+    types.value.path[d.type] &&
-    types.value.path[d.type] && types.value.path[d.type].startsWith("/") && router.push({
+      types.value.path[d.type].startsWith("http") &&
+      window.open(types.value.path[d.type] + d.targetId);
+    types.value.path[d.type] &&
+      types.value.path[d.type].startsWith("/") &&
+      router.push({
         path: types.value.path[d.type],
-      query: {id: d.routerTaskId, type: 1, courseId: d.courseId, pName: data.value.name, sName},
+        query: {
-    })
+          id: d.routerTaskId,
-  } else if (typeof types.value.path[d.type] === 'function') {
+          type: 1,
-    types.value.path[d.type](d)
+          courseId: d.courseId,
+          pName: data.value.name,
+          sName,
+        },
+      });
+  } else if (typeof types.value.path[d.type] === "function") {
+    types.value.path[d.type](d);
   }
 }
 
 function whiteTypes(type) {
-
+  return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
-  return import.meta.env.VITE_TASK_WHITE_TYPE.includes('-'+ type + '-')
 }
 </script>