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

2025-12-13 04:46:48 +08:00 · 2022-12-15 13:22:52 +08:00
parent 6a909c9452 8828f668f8
commit 2add4b2a6d
10 changed files with 271 additions and 174 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-21 17:28:10
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 22:10:22
+ * @LastEditTime: 2022-12-15 11:54:03
 * @FilePath: /fe-stu/src/App.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -22,35 +22,33 @@
      </router-link>
    </div> -->
    <main>
-      <router-view/>
+      <router-view />
    </main>
  </div>
 </template>
 <script setup>
+import { boeRequest } from "@/api/request";
+import { GET_USER_INFO } from "@/api/ThirdApi";
+import { useStore } from "vuex";
+import { onMounted } from "vue";

-  import {boeRequest} from "@/api/request";
-  import {GET_USER_INFO} from "@/api/ThirdApi";
-  import { useStore } from "vuex";
-  import {onMounted} from "vue";
-
-  const store = useStore();
-
-  onMounted(()=>{
-    getUserInfo()
-  })
-  function getUserInfo(){
-    boeRequest(GET_USER_INFO).then(res=>{
-      store.commit("SET_USER", res.result);
-    })
-  }
+const store = useStore();

+onMounted(() => {
+  getUserInfo();
+});
+function getUserInfo() {
+  boeRequest(GET_USER_INFO).then((res) => {
+    store.commit("SET_USER", res.result);
+  });
+}
 </script>
 <style lang="scss">
 #app {
  // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
  // sans-serif;
  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Arial, sans-serif;
+    Microsoft YaHei, Arial, sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  color: #2c3e50;
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-12-11 16:57:58
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-12 17:05:42
+ * @LastEditTime: 2022-12-15 10:56:54
 * @FilePath: /fe-stu/src/api/api.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
@@ -13,6 +13,7 @@ export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
 export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
 export const ROUTER_LIST = '/stu/router/list post'
 export const ROUTER_PROCESS = '/stu/router/process'
+export const LINK_DETAILS = linkId => `/link/getOne?linkId=${linkId} post`
 export const PROJECT_PROCESS = '/stu/project/process'
 export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post'
 export const TAS_ACTIVITY_DETAIL = '/activity'
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -9,10 +9,11 @@
      <div style="font-weight: 700; font-size: 16px">直播详情</div>

      <div class="preNext">
-        <button class="btn btn01"></button>
+        <!-- 2022-12-15注释 李晓鸽  后面打开 -->
+        <!-- <button class="btn btn01"></button>
        <span class="content" style="margin-left: 6px">上一个</span>
        <span class="content" style="margin-left: 31px">下一个</span>
-        <button class="btn btn02" style="margin-left: 6px"></button>
+        <button class="btn btn02" style="margin-left: 6px"></button> -->
      </div>
    </div>
    <!-- 面包屑导航 -->
@@ -23,35 +24,45 @@
        <div class="title">【直播】{{ data?.liveName }}</div>
        <div class="time" style="margin-top: 26px">
          <img
-              style="width: 15px; height: 17px"
-              src="../../assets/image/time.png"
+            style="width: 15px; height: 17px"
+            src="../../assets/image/time.png"
          />
-          <div style="margin-left: 8px">{{ data?.liveStartTime }}</div>
+          <div style="margin-left: 8px">
+            {{ data?.liveStartTime + "-" + data?.liveEndTime }}
+          </div>
        </div>
-        <div class="time" style="margin-top: 23px">
+        <!--          todo #直播详情 没有位置字段-->
+        <!-- <div class="time" style="margin-top: 23px">
          <img
              style="width: 16px; height: 18px"
              src="../../assets/image/position.png"
          />
-          <!--          todo #直播详情 没有位置字段-->
-          <div style="margin-left: 8px">大族广场</div>
-        </div>
+         
+          <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
+        </div> -->
      </div>
      <div class="threeBtn">
        <botton
-            class="btn"
-            style="background: rgb(59, 191, 252)"
-            @click="showClick"
-        >观看
+          class="btn"
+          style="background: rgb(59, 191, 252)"
+          @click="showClick"
+          >观看
        </botton>
        <botton
-            class="btn"
-            :style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}"
-            @click="signClick"
-        >{{ data.signFlag ? '已签到' : '签到' }}
+          class="btn"
+          :style="{
+            background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
+          @click="signClick"
+          >{{ data.signFlag ? "已签到" : "签到" }}
        </botton>
-        <botton :style="{background:`${data.isSurvery?'#999':'rgb(57, 146, 249)'}`}" class="btn" @click="commitClick"
-        >{{ data.isSurvery ? '已评估' : '评估' }}
+        <botton
+          :style="{
+            background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
+          class="btn"
+          @click="commitClick"
+          >{{ data.isSurvery ? "已评估" : "评估" }}
        </botton>
      </div>
    </div>
@@ -64,8 +75,8 @@
          <div class="" style="margin-left: 48px; margin-right: 48px">
            <div class="title">
              <img
-                  style="width: 20px; height: 20px"
-                  src="../../assets/image/course.png"
+                style="width: 20px; height: 20px"
+                src="../../assets/image/course.png"
              />
              <div class="text">直播说明</div>
              <div class="box"></div>
@@ -73,27 +84,27 @@
            <div style="display: flex; align-items: center">
              <!--              todo #直播 没有课前预习字段-->
              <div class="content">
-                {{data.liveExplain}}
+                {{ data.liveExplain }}
              </div>
            </div>

-<!--            <div class="title">-->
-<!--              <img-->
-<!--                  style="width: 20px; height: 20px"-->
-<!--                  src="../../assets/image/write.png"-->
-<!--              />-->
-<!--              &lt;!&ndash;              todo #直播 课后作业&ndash;&gt;-->
-<!--              <div class="text">课后作业</div>-->
-<!--              <div class="box"></div>-->
-<!--            </div>-->
-<!--            <div style="display: flex; align-items: center">-->
-<!--              <div class="content">-->
-<!--                <span style="font-weight: 600"-->
-<!--                >网易有道词典现有功能结构拆解+问题分析</span-->
-<!--                ><br/>-->
-<!--                查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。<br/>-->
-<!--              </div>-->
-<!--            </div>-->
+            <!--            <div class="title">-->
+            <!--              <img-->
+            <!--                  style="width: 20px; height: 20px"-->
+            <!--                  src="../../assets/image/write.png"-->
+            <!--              />-->
+            <!--              &lt;!&ndash;              todo #直播 课后作业&ndash;&gt;-->
+            <!--              <div class="text">课后作业</div>-->
+            <!--              <div class="box"></div>-->
+            <!--            </div>-->
+            <!--            <div style="display: flex; align-items: center">-->
+            <!--              <div class="content">-->
+            <!--                <span style="font-weight: 600"-->
+            <!--                >网易有道词典现有功能结构拆解+问题分析</span-->
+            <!--                ><br/>-->
+            <!--                查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。<br/>-->
+            <!--              </div>-->
+            <!--            </div>-->
          </div>
        </div>
      </div>
@@ -101,29 +112,29 @@
        <div class="tell">
          <div class="title">
            <img
-                style="width: 21px; height: 23px"
-                src="../../assets/image/tv.png"
+              style="width: 21px; height: 23px"
+              src="../../assets/image/tv.png"
            />
            <div class="text">直播公告</div>
            <div class="box"></div>
          </div>
-          <div class="content" v-html="data?.liveExplain"></div>
+          <div class="content" v-html="data?.liveNotice"></div>
        </div>
        <div class="teacher">
          <div class="title">
            <img
-                style="width: 21px; height: 23px"
-                src="../../assets/image/livelecturer.png"
+              style="width: 21px; height: 23px"
+              src="../../assets/image/livelecturer.png"
            />
            <!--            todo #直播详情 没有直播讲师-->
            <div class="text">直播讲师</div>
            <div class="box"></div>
          </div>
          <div
-              class="teacheritem"
-              :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
+            class="teacheritem"
+            :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
          >
-            <img class="peopleimg" :src="userAvatar"/>
+            <img class="peopleimg" :src="userAvatar" />
            <div style="margin-left: 17px; width: 190px">
              <div class="teacherName" style="margin-right: 5px">
                {{ data.userInfoBo?.userName }}
@@ -140,24 +151,24 @@
 </template>

 <script setup>
-import {computed, reactive, toRefs} from "vue";
+import { computed, reactive, toRefs } from "vue";
 import img from "@/assets/image/uploadimg.png";
-import {request, useRequest} from "@/api/request";
-import {TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
-import {useRoute} from "vue-router/dist/vue-router";
-import {useRouter} from "vue-router";
-import {useUserInfo} from "@/api/utils";
-import {ElMessage} from "element-plus";
+import { request, useRequest } from "@/api/request";
+import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
+import { useRoute } from "vue-router/dist/vue-router";
+import { useRouter } from "vue-router";
+import { useUserInfo } from "@/api/utils";
+import { ElMessage } from "element-plus";

 const {
-  query: {courseId: liveId, id: taskId, type},
+  query: { courseId: liveId, id: taskId, type },
 } = useRoute();
 const router = useRouter();

-const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId});
+const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });

-const {avatar: userAvatar} = useUserInfo(
-    computed(() => data.value.userInfoBo?.userId)
+const { avatar: userAvatar } = useUserInfo(
+  computed(() => data.value.userInfoBo?.userId)
 );

 const state = reactive({
@@ -167,27 +178,27 @@ const state = reactive({
      id: 1,
      name: "王星天（显示事业）",
      introduce:
-          "教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。",
+        "教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。",
      peopleimg: img,
    },
  ],
 });
-const {activeName, teacher} = toRefs(state);
+const { activeName, teacher } = toRefs(state);
 const signClick = () => {
  if (data.value.signFlag) {
-    return
+    return;
  }
  data.value.signFlag = 1;
  ElMessage.info("签到成功");
-  request(TASK_BROADCAST_SIGN, {courseId: liveId, taskId, type});
+  request(TASK_BROADCAST_SIGN, { courseId: liveId, taskId, type });
 };
 const commitClick = () => {
  if (data.value.isSurvery) {
-    return
+    return;
  }
  router.push({
    path: "/surveydetail",
-    query: {courseId: data.value.assessmentId},
+    query: { courseId: data.value.assessmentId },
  });
 };

@@ -480,9 +491,9 @@ function showClick() {
      background-color: rgba(255, 255, 255, 1);
      border-radius: 8px;
      background: linear-gradient(
-              180deg,
-              rgba(36, 120, 255, 0.15) 0%,
-              rgba(255, 255, 255) 50%
+        180deg,
+        rgba(36, 120, 255, 0.15) 0%,
+        rgba(255, 255, 255) 50%
      );

      .title {
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -306,15 +306,16 @@ import medal1 from "@/assets/image/medal/medal1.png";
 import medal2 from "@/assets/image/medal/medal2.png";
 import medal3 from "@/assets/image/medal/medal3.png";
 import img from "@/assets/image/uploadimg.png";
-import { useRequest } from "@/api/request";
-import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api";
+import { useRequest, request } from "@/api/request";
+import { PROJECT_PROCESS, ROUTER_PROCESS, LINK_DETAILS } from "@/api/api";
 import { useRoute, useRouter } from "vue-router";

 const {
-  query: { projectId },
+  query: { courseId },
 } = useRoute();
 const router = useRouter();
-const { data } = useRequest(PROJECT_PROCESS, { projectId });
+const { data } = useRequest(PROJECT_PROCESS, { projectId: courseId });
+console.log("data", data);
 const state = reactive({
  course: [
    {
@@ -535,16 +536,19 @@ const types = ref({
    13: "去完成",
  },
  path: {
-    1: "去上课",
+    1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线
    2: "/faceteach",
-    3: "案例",
+    3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例
    4: "/homeworkpage",
-    5: "去完成",
+    5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
    6: "/livebroadcast",
-    7: "外链",
+    7: " ",
    8: "/discusspage",
    9: "/moreactive",
-    10: "/starttest",
+    10: [
+      import.meta.env.VITE_BOE_TEST_DETAIL_URL,
+      import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL,
+    ], //测评
    11: "/surveydetail",
    12: "/ballotpage",
    13: "去完成",
@@ -552,6 +556,43 @@ const types = ref({
 });

 function toFinish(d) {
+  if (!types.value.path[d.type]) {
+    ElMessage.error("暂时未开放");
+    return;
+  }
+  if (d.type == 10) {
+    let url = "";
+    if (d.evaTyp == 1) {
+      url = types.value.path[d.type][1] + d.targetId;
+    } else {
+      url = types.value.path[d.type][0] + d.targetId;
+    }
+    import.meta.env.DEV
+      ? (window.location.href = url)
+      : (window.parent.location.href = url);
+    return;
+  }
+  if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
+    //配置文件
+    const url = types.value.path[d.type] + d.targetId;
+    import.meta.env.DEV
+      ? (window.location.href = url)
+      : (window.parent.location.href = url);
+    return;
+  }
+  if (d.type === 7) {
+    // console.log("url", d, url);
+    request(LINK_DETAILS(d.courseId), {}).then((res) => {
+      console.log("resssss", res);
+      if (res.code === 200) {
+        const url = res.data.linkAddress;
+        import.meta.env.DEV
+          ? (window.location.href = url)
+          : (window.parent.location.href = url);
+      }
+    });
+    return;
+  }
  router.push({
    path: types.value.path[d.type],
    query: { id: d.projectTaskId, type: 2, courseId: d.courseId },
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -15,38 +15,38 @@
          <div class="title">
            <div class="titleL">{{ i.chapterName }}</div>
            <div class="titleR" :style="{ display: 'flex' }">
-              <img src="../../assets/image/pathdetails/circle.png"/>
+              <img src="../../assets/image/pathdetails/circle.png" />
              <div class="titleRT">进行中</div>
            </div>
            <div
-                class="titleR"
-                :style="{ display: i.status === 2 ? 'flex' : 'none' }"
+              class="titleR"
+              :style="{ display: i.status === 2 ? 'flex' : 'none' }"
            >
-              <img src="../../assets/image/pathdetails/circle2.png"/>
+              <img src="../../assets/image/pathdetails/circle2.png" />
              <div class="titleRT" style="color: rgba(102, 102, 102, 1)">
                未开始
              </div>
            </div>
          </div>
          <div
-              class="course"
-              v-for="(value, index) in i.taskProcessList"
-              :key="index"
+            class="course"
+            v-for="(value, index) in i.taskProcessList"
+            :key="index"
          >
            <div>
              <div class="coursename">{{ value.name }}</div>
              <div class="coursetag">
                <div
-                    class="tag1"
-                    style="margin-right: 11px; margin-top: 16px"
-                    v-if="value.flag"
+                  class="tag1"
+                  style="margin-right: 11px; margin-top: 16px"
+                  v-if="value.flag"
                >
                  必修
                </div>
                <div
-                    class="tag2"
-                    style="margin-right: 11px; margin-top: 16px"
-                    v-if="!value.flag"
+                  class="tag2"
+                  style="margin-right: 11px; margin-top: 16px"
+                  v-if="!value.flag"
                >
                  选修
                </div>
@@ -64,17 +64,17 @@
                <!--                                </div>-->
              </div>
              <div
-                  class="progressBox"
-                  :style="{ display: value.status === 1 ? 'block' : 'none' }"
+                class="progressBox"
+                :style="{ display: value.status === 1 ? 'block' : 'none' }"
              >
                <div>当前进度</div>
                <div class="progress">
                  <div style="width: 291px">
                    <el-progress
-                        :percentage="value.currentRatio"
-                        :show-text="false"
-                        :stroke-width="8"
-                        :color="
+                      :percentage="value.currentRatio"
+                      :show-text="false"
+                      :stroke-width="8"
+                      :color="
                        {
                          0: 'rgba(238, 112, 108, 1)',
                          1: 'rgba(255, 151, 38, 1)',
@@ -87,13 +87,13 @@
                    />
                  </div>
                  <div
-                      style="
+                    style="
                      font-size: 14px;
                      font-weight: 500;
                      color: #277aff;
                      margin-left: 10px;
                    "
-                      :style="{
+                    :style="{
                      color: {
                        0: 'rgba(238, 112, 108, 1)',
                        1: 'rgba(255, 151, 38, 1)',
@@ -110,13 +110,19 @@
              </div>
            </div>
            <div
-                class="goclass"
-                :style="{
+              class="goclass"
+              :style="{
                background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
              }"
-                @click="toFinish(value)"
+              @click="toFinish(value)"
            >
-              {{ value.status === 1 ? '已完成' : types.path[value.type] ? types.toName[value.type] : "未开放" }}
+              {{
+                value.status === 1
+                  ? "已完成"
+                  : types.path[value.type]
+                  ? types.toName[value.type]
+                  : "未开放"
+              }}
            </div>
            <!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
            <!--              <div-->
@@ -145,29 +151,29 @@
              <div class="notice">
                请各位选课的同学提前阅读本课程的
                “教学大纲与计划”“课程考核要求”与“学习要求”
-                ，并按给定的中学化学教学主题分好小组 <br/>
-                每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；<br/>
+                ，并按给定的中学化学教学主题分好小组 <br />
+                每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；<br />
                请大家务必在规定的时间内提交作业，否则会被系统自动记录为“迟交”或“未交”则会影响线上参与的平时成
-                绩；<br/>
+                绩；<br />
              </div>
            </el-tab-pane>
            <el-tab-pane label="共享文档" name="second">
              <div style="padding: 19px 30px 17px 28px">
                <div
-                    v-for="(value, index) in sharedoc"
-                    :key="index"
-                    style="
+                  v-for="(value, index) in sharedoc"
+                  :key="index"
+                  style="
                    display: flex;
                    align-items: center;
                    margin-bottom: 15px;
                  "
                >
-                  <img :src="value.img" style="width: 22px; height: 26px"/>
+                  <img :src="value.img" style="width: 22px; height: 26px" />
                  <div class="sharedocname">{{ value.name }}</div>
                  <div class="download">
                    <img
-                        src="../../assets/image/download.png"
-                        style="width: 16px; height: 15px"
+                      src="../../assets/image/download.png"
+                      style="width: 16px; height: 15px"
                    />
                    <div style="margin-left: 7px">下载</div>
                  </div>
@@ -182,25 +188,25 @@
          <div class="info">
            <div class="title">
              <img
-                  style="width: 21px; height: 20px"
-                  src="../../assets/image/pathdetails/info.png"
+                style="width: 21px; height: 20px"
+                src="../../assets/image/pathdetails/info.png"
              />
              <div class="text" style="margin-left: 7px">个人信息</div>
              <div class="box"></div>
            </div>
            <!--            todo #路径详情 个人信息缺少img和介绍-->
            <div
-                class="teacheritem"
-                :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
+              class="teacheritem"
+              :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
            >
-              <img class="peopleimg" :src="userAvatar"/>
+              <img class="peopleimg" :src="userAvatar" />
              <div style="margin-left: 17px">
                <div class="teacherName">
                  <div style="margin-right: 5px">
                    {{ data.userInfoBo?.userName }}
                  </div>
                  <div v-for="(item, key) in data.userInfoBo?.medal" :key="key">
-                    <img class="teacherMedal" :src="item"/>
+                    <img class="teacherMedal" :src="item" />
                  </div>
                </div>
                <div class="introduce">{{ data.userInfoBo?.introduce }}</div>
@@ -210,8 +216,8 @@
          <div class="info" style="padding-top: 20px">
            <div class="title">
              <img
-                  style="width: 18px; height: 17px"
-                  src="../../assets/image/pathdetails/study.png"
+                style="width: 18px; height: 17px"
+                src="../../assets/image/pathdetails/study.png"
              />
              <div class="text" style="margin-left: 9px">学习进度</div>
              <div class="box"></div>
@@ -226,14 +232,14 @@
                <div class="progress">
                  <div style="width: 291px">
                    <el-progress
-                        :percentage="
+                      :percentage="
                        parseInt(
                          (data.currentChapterCnt / data.totalChapterCnt) * 100
                        )
                      "
-                        :show-text="false"
-                        :stroke-width="8"
-                        :color="
+                      :show-text="false"
+                      :stroke-width="8"
+                      :color="
                        {
                          0: 'rgba(238, 112, 108, 1)',
                          1: 'rgba(255, 151, 38, 1)',
@@ -250,8 +256,8 @@
                    />
                  </div>
                  <div
-                      style="font-size: 14px; font-weight: 500; margin-left: 10px"
-                      :style="{
+                    style="font-size: 14px; font-weight: 500; margin-left: 10px"
+                    :style="{
                      color: {
                        0: 'rgba(238, 112, 108, 1)',
                        1: 'rgba(255, 151, 38, 1)',
@@ -266,7 +272,7 @@
                  >
                    {{
                      parseInt(
-                          (data.currentChapterCnt / data.totalChapterCnt) * 100
+                        (data.currentChapterCnt / data.totalChapterCnt) * 100
                      )
                    }}%
                  </div>
@@ -279,12 +285,12 @@
                <div class="progress">
                  <div style="width: 291px">
                    <el-progress
-                        :percentage="
+                      :percentage="
                        parseInt((data.currentReqCnt / data.totalReqCnt) * 100)
                      "
-                        :show-text="false"
-                        :stroke-width="8"
-                        :color="
+                      :show-text="false"
+                      :stroke-width="8"
+                      :color="
                        {
                          0: 'rgba(238, 112, 108, 1)',
                          1: 'rgba(255, 151, 38, 1)',
@@ -297,13 +303,13 @@
                    />
                  </div>
                  <div
-                      style="
+                    style="
                      font-size: 14px;
                      font-weight: 500;
                      color: #277aff;
                      margin-left: 10px;
                    "
-                      :style="{
+                    :style="{
                      color: {
                        0: 'rgba(238, 112, 108, 1)',
                        1: 'rgba(255, 151, 38, 1)',
@@ -331,7 +337,7 @@
 </template>

 <script setup>
-import {computed, reactive, ref, watch} from "vue";
+import { computed, reactive, ref, watch } from "vue";
 import word from "@/assets/image/file/word.png";
 import ppt from "@/assets/image/file/ppt.png";
 import pdf from "@/assets/image/file/pdf.png";
@@ -341,19 +347,19 @@ import medal1 from "@/assets/image/medal/medal1.png";
 import medal2 from "@/assets/image/medal/medal2.png";
 import medal3 from "@/assets/image/medal/medal3.png";
 import img from "@/assets/image/uploadimg.png";
-import {boeRequest, useRequest} from "@/api/request";
-import {ROUTER_PROCESS} from "@/api/api";
-import {useRoute, useRouter} from "vue-router";
-import {ElMessage} from "element-plus";
-import {useUserInfo} from "@/api/utils";
+import { boeRequest, useRequest, request } from "@/api/request";
+import { ROUTER_PROCESS, LINK_DETAILS } from "@/api/api";
+import { useRoute, useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
+import { useUserInfo } from "@/api/utils";

 const {
-  query: {routerId},
+  query: { routerId },
 } = useRoute();
 const router = useRouter();
-const {data} = useRequest(ROUTER_PROCESS, {routerId});
-const {avatar: userAvatar} = useUserInfo(
-    computed(() => data.value?.userInfoBo?.userId)
+const { data } = useRequest(ROUTER_PROCESS, { routerId });
+const { avatar: userAvatar } = useUserInfo(
+  computed(() => data.value?.userInfoBo?.userId)
 );

 const state = reactive({
@@ -542,7 +548,7 @@ const compulsoryprogress = ref(10);
 const handleClick = (tab, event) => {
  console.log(tab, event);
 };
-const path = {1: "path"};
+const path = { 1: "path" };

 const types = ref({
  typeName: {
@@ -576,38 +582,67 @@ const types = ref({
    13: "去完成",
  },
  path: {
-    1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL,
+    1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线
    2: "/faceteach",
-    3: import.meta.env.VITE_BOE_CASS_DETAIL_URL,
+    3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例
    4: "/homeworkpage",
-    5: import.meta.env.VITE_BOE_TEST_DETAIL_URL,
+    5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
    6: "/livebroadcast",
-    7: "",
+    7: " ",
    8: "/discusspage",
    9: "/moreactive",
-    10: "/surveydetail",
+    10: [
+      import.meta.env.VITE_BOE_TEST_DETAIL_URL,
+      import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL,
+    ], //测评
    11: "/surveydetail",
    12: "/ballotpage",
-    13: "去完成",
+    13: "/projectdetails",
  },
 });

 function toFinish(d) {
+  console.log("ddd", d);
  if (!types.value.path[d.type]) {
    ElMessage.error("暂时未开放");
    return;
  }
+  if (d.type == 10) {
+    let url = "";
+    if (d.evaTyp == 1) {
+      url = types.value.path[d.type][1] + d.targetId;
+    } else {
+      url = types.value.path[d.type][0] + d.targetId;
+    }
+    import.meta.env.DEV
+      ? (window.location.href = url)
+      : (window.parent.location.href = url);
+    return;
+  }
  if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
    //配置文件
-    const url = types.value.path[d.type] + d.courseId;
+    const url = types.value.path[d.type] + d.targetId;
    import.meta.env.DEV
-        ? (window.location.href = url)
-        : (window.parent.location.href = url);
+      ? (window.location.href = url)
+      : (window.parent.location.href = url);
+    return;
+  }
+  if (d.type === 7) {
+    // console.log("url", d, url);
+    request(LINK_DETAILS(d.courseId), {}).then((res) => {
+      console.log("resssss", res);
+      if (res.code === 200) {
+        const url = res.data.linkAddress;
+        import.meta.env.DEV
+          ? (window.location.href = url)
+          : (window.parent.location.href = url);
+      }
+    });
    return;
  }
  router.push({
    path: types.value.path[d.type],
-    query: {id: d.routerTaskId, type: 1, courseId: d.courseId},
+    query: { id: d.routerTaskId, type: 1, courseId: d.courseId },
  });
 }
 </script>