From 333c87befa6928500cb6a79cfb27338aeb37be02 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 15 Dec 2022 11:49:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=80=83=E8=AF=95=E6=B5=8B=E8=AF=84=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                      |  1 +
 .env.boe                                  |  1 +
 .env.prod                                 |  1 +
 .env.release                              |  1 +
 src/App.vue                               | 38 +++++++++----------
 src/api/api.js                            |  3 +-
 src/views/liveBroadcast/LiveBroadcast.vue | 45 ++++++++++-------------
 src/views/project/ProjectDetails.vue      | 38 ++++++++++++++++---
 src/views/roadmap/PathDetails.vue         | 34 ++++++++++++-----
 vite.config.js                            |  9 +++--
 10 files changed, 107 insertions(+), 64 deletions(-)

diff --git a/.env b/.env
index 5fa1525..902ffb7 100644
--- a/.env
+++ b/.env
@@ -6,5 +6,6 @@ VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/
 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
 
 VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.boe b/.env.boe
index 2065680..b594a9e 100644
--- a/.env.boe
+++ b/.env.boe
@@ -4,5 +4,6 @@ VITE_BASE_API=/manageApi
 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
 
 VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 6671831..a783afa 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,5 +4,6 @@ VITE_BASE_API=/manageApi-release
 VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
 
 VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/.env.release b/.env.release
index dd1bc2d..4d980c9 100644
--- a/.env.release
+++ b/.env.release
@@ -5,5 +5,6 @@ VITE_BASE_LOGIN_URL=https://u.boe.com/web/
 VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
 
 VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 006dc85..c696429 100644
--- 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-14 22:48:46
  * @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;
@@ -61,8 +59,8 @@
   display: flex;
   width: 100%;
   min-height: 100%;
-  background-color: rgba(242, 245, 247, 1);
-  // background-color: #ccc;
+  // background-color: rgba(242, 245, 247, 1);
+  background-color: #ccc;
   #nav {
     width: 220px;
     height: 100%;
diff --git a/src/api/api.js b/src/api/api.js
index 0be5890..32974fa 100644
--- 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'
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index 56cb837..c8480ca 100644
--- 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>
     <!-- 面包屑导航 -->
@@ -26,16 +27,19 @@
             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
@@ -51,6 +55,7 @@
           v-if="!data.signFlag"
           >签到
         </botton>
+
         <botton class="btn" @click="commitClick" v-if="!data.evalFlag"
           >评估
         </botton>
@@ -68,20 +73,13 @@
                 style="width: 20px; height: 20px"
                 src="../../assets/image/course.png"
               />
-              <div class="text">课前预习</div>
+              <div class="text">直播说明</div>
               <div class="box"></div>
             </div>
             <div style="display: flex; align-items: center">
               <!--              todo #直播 没有课前预习字段-->
               <div class="content">
-                通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;<br />
-                ● 培训目标
-                <br />1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;<br />
-                2.通过系统平台的培训提高员工对企业的管理理念认识与提升。<br />
-                3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。
-                <br />
-                ●培训对象<br />
-                集团领导、各相关部门领导、总经理、车间主管、车间操作员等;<br />
+                {{ data?.liveExplain }}
               </div>
             </div>
 
@@ -91,15 +89,12 @@
                 src="../../assets/image/write.png"
               />
               <!--              todo #直播 课后作业-->
-              <div class="text">课后作业</div>
+              <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 />
+                {{ data?.livePlaybackLink ? data?.livePlaybackLink : "-" }}
               </div>
             </div>
           </div>
@@ -115,7 +110,7 @@
             <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">
@@ -157,12 +152,12 @@ import { useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
 
 const {
-  query: { courseId: liveId },
+  query: { courseId },
 } = useRoute();
 const router = useRouter();
 
-const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
-
+const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId: courseId });
+console.log("datadatadatadata", data, courseId);
 const { avatar: userAvatar } = useUserInfo(
   computed(() => data.value.userInfoBo?.userId)
 );
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 18974cc..011ca18 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -306,7 +306,7 @@ 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 { useRequest, request } from "@/api/request";
 import { PROJECT_PROCESS, ROUTER_PROCESS } from "@/api/api";
 import { useRoute, useRouter } from "vue-router";
 
@@ -535,16 +535,16 @@ 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, //测评
     11: "/surveydetail",
     12: "/ballotpage",
     13: "去完成",
@@ -552,6 +552,32 @@ const types = ref({
 });
 
 function toFinish(d) {
+  if (!types.value.path[d.type]) {
+    ElMessage.error("暂时未开放");
+    return;
+  }
+  if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
+    //配置文件
+    const url = types.value.path[d.type] + d.targetId;
+    console.log("url", d, url);
+    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 },
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index ec6997c..9789ca3 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -341,8 +341,8 @@ 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 { 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";
@@ -352,6 +352,8 @@ const {
 } = useRoute();
 const router = useRouter();
 const { data } = useRequest(ROUTER_PROCESS, { routerId });
+console.log("datadata", data);
+
 const { avatar: userAvatar } = useUserInfo(
   computed(() => data.value?.userInfoBo?.userId)
 );
@@ -576,16 +578,16 @@ 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, //测评
     11: "/surveydetail",
     12: "/ballotpage",
     13: "去完成",
@@ -593,19 +595,33 @@ const types = ref({
 });
 
 function toFinish(d) {
+  console.log("ddd", d);
   if (!types.value.path[d.type]) {
     ElMessage.error("暂时未开放");
     return;
   }
   if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) {
     //配置文件
-    const url =
-      types.value.path[d.type] + (d.type === 1 ? d.targetId : d.courseId);
+    const url = types.value.path[d.type] + d.targetId;
+    console.log("url", d, url);
     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.routerTaskId, type: 1, courseId: d.courseId },
diff --git a/vite.config.js b/vite.config.js
index d458419..171ae0d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -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 20:49:00
+ * @LastEditTime: 2022-12-15 10:22:25
  * @FilePath: /fe-stu/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -13,8 +13,8 @@ import { viteMockServe } from 'vite-plugin-mock'
 import topLevelAwait from "vite-plugin-top-level-await";
 
 const path = require('path')
-const url = 'http://localhost:30001'
-// const url = 'http://111.231.196.214:12013/manageApi'
+// const url = 'http://localhost:30001'
+const url = 'http://111.231.196.214:12013/manageApi'
 export default defineConfig(({ command }) =>
 ({
     base: '/fe-student',
@@ -91,6 +91,9 @@ export default defineConfig(({ command }) =>
             }, '/userbasic': {
                 target: 'https://u-pre.boe.com',
                 changeOrigin: true,
+            }, '/link': {
+                target: url,
+                changeOrigin: true,
             },
         }
     }