From 1b1834b3db537bee141fd988b90d28c68a905bac Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:17:52 +0800
Subject: [PATCH 01/32] init

---
 src/api/request.js  | 2 +-
 src/router/index.js | 2 +-
 vite.config.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 8a71ade..757baf5 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -87,7 +87,7 @@ export async function request(_url, params) {
             'X-Token': localStorage.getItem('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '',
+        baseURL: '/manageApi-release',
         ...method !== 'get' ? {data: JSON.stringify(body)} : {}
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {
diff --git a/src/router/index.js b/src/router/index.js
index 3176265..16056b8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,7 +20,7 @@ const routes = [
 ]
 
 const router = createRouter({
-	history: createWebHistory("/fe-student"),
+	history: createWebHistory("/fe-student-release"),
 	routes
 })
 
diff --git a/vite.config.js b/vite.config.js
index 226f713..3b82de6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -16,7 +16,7 @@ const path = require('path')
 const url = 'http://111.231.196.214:30001'
 export default defineConfig(({ command }) =>
 ({
-    base: '/fe-student',
+    base: '/fe-student-release',
     plugins: [
         vue(),
         // legacy({

From 2f56b80c2e7451c56d773badb04f78e3b13b93a4 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:28:06 +0800
Subject: [PATCH 02/32] init

---
 src/api/request.js | 2 +-
 vite.config.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 757baf5..eaf4c7a 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -87,7 +87,7 @@ export async function request(_url, params) {
             'X-Token': localStorage.getItem('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '/manageApi-release',
+        baseURL: '/manageApi-release/',
         ...method !== 'get' ? {data: JSON.stringify(body)} : {}
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {
diff --git a/vite.config.js b/vite.config.js
index 3b82de6..52b857c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -16,7 +16,7 @@ const path = require('path')
 const url = 'http://111.231.196.214:30001'
 export default defineConfig(({ command }) =>
 ({
-    base: '/fe-student-release',
+    base: '/fe-student-release/',
     plugins: [
         vue(),
         // legacy({

From 879c25196cf4fec4deaae41170073c5bd54e78c6 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:28:19 +0800
Subject: [PATCH 03/32] init

---
 src/api/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/request.js b/src/api/request.js
index eaf4c7a..757baf5 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -87,7 +87,7 @@ export async function request(_url, params) {
             'X-Token': localStorage.getItem('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '/manageApi-release/',
+        baseURL: '/manageApi-release',
         ...method !== 'get' ? {data: JSON.stringify(body)} : {}
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {

From 982a77c6a33652342ce2aeb11e145da3e4677712 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:42:01 +0800
Subject: [PATCH 04/32] init

---
 src/api/request.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/api/request.js b/src/api/request.js
index 757baf5..9116273 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -109,4 +109,39 @@ export async function request(_url, params) {
         console.log(e)
         // router.push({path: '/login'})
     })
+}
+
+export async function boeRequest(_url, params) {
+    const s = _url.split(' ')
+    let url = s[0]
+    const method = s[1]?.toLowerCase() || 'get'
+    if (method === 'get') {
+        let paramsArray = [];
+        //拼接参数
+        if (params) {
+            Object.keys(params).forEach(key => paramsArray.push(key + '=' + params[key]))
+            if (url.search(/\?/) === -1) {
+                url += '?' + paramsArray.join('&')
+            } else {
+                url += '&' + paramsArray.join('&')
+            }
+        }
+    }
+    const body = method !== 'get' ? params || {} : {}
+    return axios({
+        url,
+        method,
+        headers: {
+            token: getCookie('token'),
+            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+        },
+        baseURL: '',
+        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+    }).then(resp => resp.data).then(response => {
+        return response
+    }).catch(e => {
+        console.log(2222)
+        console.log(e)
+        // router.push({path: '/login'})
+    })
 }
\ No newline at end of file

From e73f22a9f4412dbec9e8254dc4962f84a6f6e73c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 18:33:08 +0800
Subject: [PATCH 05/32] init

---
 src/api/request.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/request.js b/src/api/request.js
index 9116273..83b9c54 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -111,6 +111,7 @@ export async function request(_url, params) {
     })
 }
 
+// 这个方法要有
 export async function boeRequest(_url, params) {
     const s = _url.split(' ')
     let url = s[0]

From 6a7982c21144182fd7137b18c2b402e96e1adebe Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 18:33:40 +0800
Subject: [PATCH 06/32] =?UTF-8?q?=20=E8=BF=99=E4=B8=AA=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E8=A6=81=E6=9C=89=20=E5=92=8Crequest=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/request.js b/src/api/request.js
index 83b9c54..0a6ca6d 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -111,7 +111,7 @@ export async function request(_url, params) {
     })
 }
 
-// 这个方法要有
+// 这个方法要有 和request不一样
 export async function boeRequest(_url, params) {
     const s = _url.split(' ')
     let url = s[0]

From 71b43545d189188fe9ffc8a578657af35bd67f46 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 18:49:43 +0800
Subject: [PATCH 07/32] -- bug

---
 src/api/request.js |  62 ++++++++--------
 vite.config.js     | 171 ++++++++++++++++++++++-----------------------
 2 files changed, 115 insertions(+), 118 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 0a6ca6d..d469ad6 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,7 +1,9 @@
 import router from "@/router";
-import {reactive, ref, toRefs, watch} from "vue";
+import { reactive, ref, toRefs, watch } from "vue";
 import axios from 'axios';
-
+import { getCookie } from "@/api/utils";
+import JSONBigInt from 'json-bigint';
+const JSONBigIntStr = JSONBigInt({ storeAsString: true });
 export function usePage(_url, param) {
 
     const state = reactive({
@@ -10,18 +12,18 @@ export function usePage(_url, param) {
         total: 0,
         size: 10,
         current: 1,
-        params: {pageNo: 1, pageSize: 10, ...param}
+        params: { pageNo: 1, pageSize: 10, ...param }
     })
 
     watch(param, () => {
-        state.params = {...state.params, ...param}
+        state.params = { ...state.params, ...param }
         fetchData()
     })
 
     function fetchData() {
         state.loading = true
         request(_url, state.params).then(r => {
-            state.params.pageNo === 1 ? (state.data = (r.data.records||r.data.rows)) : (state.data = [...state.data, ...(r.data.records||r.data.rows)])
+            state.params.pageNo === 1 ? (state.data = (r.data.records || r.data.rows)) : (state.data = [...state.data, ...(r.data.records || r.data.rows)])
             state.size = r.data.size
             state.total = r.data.total
             state.current = r.data.current
@@ -84,34 +86,34 @@ export async function request(_url, params) {
         url,
         method,
         headers: {
-            'X-Token': localStorage.getItem('token'),
-            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+            'token': getCookie('token'),
+            ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
         },
-        baseURL: '/manageApi-release',
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+        baseURL: import.meta.env.VITE_BASE_API,
+        ...method !== 'get' ? { data: JSON.stringify(body) } : {}
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {
-            console.log(1111111111)
-            console.log(response.code)
-            if (import.meta.env.DEV && response.code === 1000) {
-                router.push({path: '/login'})
-            } else {
-                // response.showMsg && notification.open({
-                //     message: response.showMsg,
-                //     duration: 2,
-                // });
+            if (response.code === 1000) {
+                import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
             }
+            // if (import.meta.env.DEV && response.code === 1000) {
+            //     router.push({path: '/login'})
+            // } else {
+            //     window.open()
+            // response.showMsg && notification.open({
+            //     message: response.showMsg,
+            //     duration: 2,
+            // });
+            // }
             throw new Error('接口异常')
         }
         return response
     }).catch(e => {
-        console.log(2222)
-        console.log(e)
+        console.log('eeeee', e)
         // router.push({path: '/login'})
     })
 }
 
-// 这个方法要有 和request不一样
 export async function boeRequest(_url, params) {
     const s = _url.split(' ')
     let url = s[0]
@@ -129,20 +131,16 @@ export async function boeRequest(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    return axios({
-        url,
+    return fetch(url,{
         method,
-        headers: {
+        headers:{
             token: getCookie('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
-        baseURL: '',
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
-    }).then(resp => resp.data).then(response => {
-        return response
-    }).catch(e => {
-        console.log(2222)
-        console.log(e)
-        // router.push({path: '/login'})
+        ...method !== 'get' ? {body: JSON.stringify(body)} : {}
+    }).then(res=>{
+        return res.text()
+    }).then(res=>{
+        return JSONBigIntStr.parse(res)
     })
 }
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index 0fa833d..e85696a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,97 +2,96 @@
  * @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 11:51:59
  * @FilePath: /fe-stu/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import legacy from '@vitejs/plugin-legacy'
-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'
-export default defineConfig(({ command }) =>
-({
-    base: '/fe-student-release/',
-    plugins: [
-        vue(),
-        // legacy({
-        //     targets: ['chrome 64', 'defaults', 'not IE 11']
-        // }),
-        topLevelAwait({
-            promiseExportName: '__tla',
-            promiseImportName: i => `__tla_${i}`
-        }),
-        // viteMockServe({
-        //     mockPath: './src/mock/mocks',
-        // })
-    ],
-    resolve: {
-        alias: [
-            { find: '@', replacement: path.resolve(__dirname, 'src') }
-        ]
-    },
-    server: {
-        proxy: {
-            '/file/upload': {
-                target: 'http://111.231.196.214:30001',
-                changeOrigin: true,
-            },
-            '/stu': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/queryVoteSubmitDetailById': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/work': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/discuss': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/discussSubmit': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/comment': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/vote': {
-                target: url,
-                changeOrigin: true,
-            },
-            '/admin': {
-                target: url,
-                changeOrigin: true,
-            }, '/activity': {
-                target: url,
-                changeOrigin: true,
-            }, '/liveBroadcast': {
-                target: url,
-                changeOrigin: true,
-            }, '/examination': {
-                target: url,
-                changeOrigin: true,
-            }, '/assessment': {
-                target: url,
-                changeOrigin: true,
-            }, '/workSubmit': {
-                target: url,
-                changeOrigin: true,
-            }, '/userbasic': {
-                target: 'https://u-pre.boe.com',
-                changeOrigin: true,
-            },
+
+export default defineConfig(({ command, mode }) =>
+    ({
+        base: loadEnv(mode, process.cwd()).VITE_BASE,
+        plugins: [
+            vue(),
+            // legacy({
+            //     targets: ['chrome 64', 'defaults', 'not IE 11']
+            // }),
+            topLevelAwait({
+                promiseExportName: '__tla',
+                promiseImportName: i => `__tla_${i}`
+            }),
+            // viteMockServe({
+            //     mockPath: './src/mock/mocks',
+            // })
+        ],
+        resolve: {
+            alias: [
+                { find: '@', replacement: path.resolve(__dirname, 'src') }
+            ]
+        },
+        server: {
+            proxy: {
+                '/file/upload': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/stu': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/queryVoteSubmitDetailById': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/work': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/discuss': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/discussSubmit': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/comment': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/vote': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+                '/admin': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                }, '/activity': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                }, '/liveBroadcast': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                }, '/examination': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                }, '/assessment': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                }, '/workSubmit': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                }, '/userbasic': {
+                    target: 'https://u-pre.boe.com',
+                    changeOrigin: true,
+                }, '/link': {
+                    target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                    changeOrigin: true,
+                },
+            }
         }
-    }
-})
+    })
 )

From 1960c00ddd09db665be36f3f7f05ef859efcef43 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 22 Dec 2022 19:12:41 +0800
Subject: [PATCH 08/32] -- bug

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index fec7f41..d34c7f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,7 +43,7 @@ import {useStore} from "vuex";
 import {onMounted} from "vue";
 import router from "@/router";
 
-console.log("版本0.9.3------------");
+console.log("版本1.0.1------------");
 const store = useStore();
 onMounted(() => {
   getUserInfo();

From ba9db8515b789c22428735153f842668e86b1fd6 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 23 Dec 2022 09:16:31 +0800
Subject: [PATCH 09/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 129 ++++++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 65 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1be1cbb..ca8721d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,18 +7,16 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <div
-    style="
+	<div style="
       background: #0078fc;
       height: 150px;
       width: 100%;
       position: absolute;
       top: 0;
       z-index: 1;
-    "
-  ></div>
-  <div id="container">
-    <!-- <div id="nav">
+    "></div>
+	<div id="container">
+		<!-- <div id="nav">
       <router-link
         v-for="item in routes"
         :key="item.path"
@@ -31,84 +29,85 @@
         {{ item.name }}
       </router-link>
     </div> -->
-    <main style="z-index: 2">
-      <router-view/>
-    </main>
-  </div>
+		<main style="z-index: 2">
+			<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";
 import router from "@/router";
 
-console.log("版本1.0.1------------");
+console.log("版本1.0.2------------");
 const store = useStore();
 onMounted(() => {
-  getUserInfo();
+	getUserInfo();
 });
 
 function getUserInfo() {
-  boeRequest(GET_USER_INFO).then((res) => {
-    res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png')
-    store.commit("SET_USER", res.result);
-  });
+	boeRequest(GET_USER_INFO).then((res) => {
+		res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png')
+		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;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
-  height: 100%;
+	// 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;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	color: #2c3e50;
+	height: 100%;
 }
 
 #container {
-  display: flex;
-  width: 100%;
-  min-height: 100%;
-  background-color: rgba(242, 245, 247, 1);
-  // background-color: #ccc;
-  #nav {
-    width: 220px;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    gap: 20px;
-    padding: 30px 0;
-    box-sizing: border-box;
-    background: #f1f1f1;
-    box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795);
+	display: flex;
+	width: 100%;
+	min-height: 100%;
+	background-color: rgba(242, 245, 247, 1);
 
-    .link {
-      text-decoration: none;
-      color: rgb(0, 0, 0);
-      padding: 10px;
-      transition: all 0.4s;
-      text-align: center;
+	// background-color: #ccc;
+	#nav {
+		width: 220px;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		gap: 20px;
+		padding: 30px 0;
+		box-sizing: border-box;
+		background: #f1f1f1;
+		box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795);
 
-      &:hover {
-        background: rgba(4, 37, 223, 0.274);
-        color: #f1f1f1;
-      }
+		.link {
+			text-decoration: none;
+			color: rgb(0, 0, 0);
+			padding: 10px;
+			transition: all 0.4s;
+			text-align: center;
 
-      &.active {
-        color: #f1f1f1;
-        background: rgba(17, 120, 255, 0.74);
-      }
-    }
-  }
+			&:hover {
+				background: rgba(4, 37, 223, 0.274);
+				color: #f1f1f1;
+			}
 
-  main {
-    flex: 1;
-    width: 100%;
-    // padding: 30px;
-    box-sizing: border-box;
-  }
+			&.active {
+				color: #f1f1f1;
+				background: rgba(17, 120, 255, 0.74);
+			}
+		}
+	}
+
+	main {
+		flex: 1;
+		width: 100%;
+		// padding: 30px;
+		box-sizing: border-box;
+	}
 }
 </style>

From eca5ace64be963997a90c44dda40ac3ca0e38716 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 12:12:38 +0800
Subject: [PATCH 10/32] =?UTF-8?q?--=20=E8=AF=A6=E6=83=85=E4=B8=8D=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/roadmap/PathDetails.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index ca57787..a4f0102 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -356,7 +356,7 @@ const types = ref({
 		6: "/livebroadcast",
 		7: ({ courseId }) =>
 			request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
-				window.open(linkAddress)
+				window.open(linkAddress, '_self')
 			), //外联
 		8: "/discusspage",
 		9: "/moreactive",
@@ -365,7 +365,7 @@ const types = ref({
 				(evaType == 0
 					? import.meta.env.VITE_BOE_TEST_DETAIL_URL
 					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
-			), //测评
+			,'_self'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",
 		13: "/projectdetails",
@@ -457,7 +457,7 @@ function toFinish(d) {
 	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);
+			window.open(types.value.path[d.type] + d.targetId,'_self');
 		types.value.path[d.type] &&
 			types.value.path[d.type].startsWith("/") &&
 			router.push({

From e64eee5b1855f7b6fe7a7c96d8ac5b40636308b9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 12:59:17 +0800
Subject: [PATCH 11/32] =?UTF-8?q?--=20=E8=AF=A6=E6=83=85=E4=B8=8D=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.js                        | 2 +-
 src/components/PathDetailImage.vue        | 2 +-
 src/views/faceteach/FaceTeach.vue         | 2 +-
 src/views/liveBroadcast/LiveBroadcast.vue | 2 +-
 src/views/project/ProjectDetails.vue      | 6 +++---
 src/views/project/ProjectManage.vue       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index d469ad6..6d5f017 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -94,7 +94,7 @@ export async function request(_url, params) {
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {
             if (response.code === 1000) {
-                import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
+                import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL,'_self')
             }
             // if (import.meta.env.DEV && response.code === 1000) {
             //     router.push({path: '/login'})
diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue
index 1cca01b..d470f54 100644
--- a/src/components/PathDetailImage.vue
+++ b/src/components/PathDetailImage.vue
@@ -64,7 +64,7 @@ function toDetail(i) {
           `${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/pathdetails&params=${encodeURIComponent(
               `routerId=${props.detail.routerId}&routerName=${props.detail.routerName}`
           )}`
-      );
+      ,'_self');
 }
 
 function close() {
diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 8318992..a95e725 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -369,7 +369,7 @@ function toExamItem(obj) {
 		}
 	}
 	console.log("obj", obj.examinationTestId);
-	window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId); //测评
+	window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId,'_self'); //测评
 	// router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId });
 }
 
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index ef926b6..1ec2030 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -283,7 +283,7 @@ function showClick() {
 			return;
 		}
 	}
-	window.open(data.value.liveLink);
+	window.open(data.value.liveLink,'_self');
 }
 onUnmounted(() => {
 	if (timer) {
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 0ae3fb8..4739fd4 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -342,7 +342,7 @@ const types = ref({
 		6: "/livebroadcast",
 		7: ({ courseId }) =>
 			request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
-				window.open(linkAddress)
+				window.open(linkAddress,'_self')
 			), //外联
 		8: "/discusspage",
 		9: "/moreactive",
@@ -351,7 +351,7 @@ const types = ref({
 				(evaType == 0
 					? import.meta.env.VITE_BOE_TEST_DETAIL_URL
 					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
-			), //测评
+          ,'_self'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",
 		13: "/projectdetails",
@@ -448,7 +448,7 @@ function toFinish(d, sName, chapterOrStageId) {
 	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);
+			window.open(types.value.path[d.type] + d.targetId,'_self');
 		types.value.path[d.type] &&
 			types.value.path[d.type].startsWith("/") &&
 			router.push({
diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue
index 1497412..8b1dd58 100644
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -187,7 +187,7 @@ const goProjectDetails = (value) => {
 		: window.open(
 			`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
 				`projectId=${value.projectId}`
-			)}`
+          ,'_self')}`
 		);
 };
 </script>

From a78ea775f2328a98c6828ac3d33dc55768fe4945 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Mon, 26 Dec 2022 12:01:36 +0800
Subject: [PATCH 12/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue         |  37 ++--
 src/views/liveBroadcast/LiveBroadcast.vue |  25 +--
 src/views/project/ProjectDetails.vue      |  95 ++++-----
 src/views/roadmap/PathDetails.vue         | 226 ++++++++++------------
 src/views/survey/SurveyDetail.vue         |  58 +++---
 5 files changed, 214 insertions(+), 227 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index a95e725..52f883b 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -25,8 +25,8 @@
 					<img style="width: 15px; height: 17px" src="../../assets/image/time.png" />
 					<div style="margin-left: 8px">
 						{{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " +
-								dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
-						}}
+		dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
+}}
 					</div>
 				</div>
 				<div v-if="data.planDto?.address" class="time" style="margin-top: 23px">
@@ -35,17 +35,17 @@
 				</div>
 			</div>
 			<div style="display: flex">
-				
-				<botton  class="btn" style="margin-right: 20px" :style="{
-					background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
-				}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
+
+				<botton class="btn" style="margin-right: 20px" :style="{
+	background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
+}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
 				</botton>
 				<botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
 					评估
 				</botton>
 				<botton :style="{
-					background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
-				}" class="btn" @click="toSurvery" v-else>{{ data.isSurvery ? "已评估" : "评估" }}
+	background: `${new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+}" class="btn" @click="toSurvery" v-else>{{ data.isSurvery ? "已评估" : "评估" }}
 				</botton>
 			</div>
 		</div>
@@ -79,10 +79,10 @@
 									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
 									<div class="enclosureL">
 										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
-											width: '22px',
-											height: '26px',
-											marginLeft: '10px',
-										}"></FileTypeImg>
+	width: '22px',
+	height: '26px',
+	marginLeft: '10px',
+}"></FileTypeImg>
 										<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
 									</div>
 									<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
@@ -111,10 +111,10 @@
 									</div>
 								</div>
 
-								
+
 								<div
 									:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
-									class="submit" @click="toWork" >
+									class="submit" @click="toWork">
 									交作业
 								</div>
 							</div>
@@ -137,8 +137,8 @@
 										<div class="tag3" style="margin-left: 11px">考试</div>
 									</div>
 								</div>
-								
-								<div 
+
+								<div
 									:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
 									class="submit" @click="toExamItem(data.examinationDto)">
 									去考试
@@ -349,8 +349,7 @@ function toWork() {
 		query: {
 			courseId: data.value.workDto.workId,
 			id: taskId,
-			taskId: taskId,
-			taskIds: taskId,
+			infoId: taskId,
 			chapterOrStageId: 0,
 			type,
 			pName: "面授课",
@@ -365,7 +364,7 @@ function toExamItem(obj) {
 		let date2 = new Date().getTime()
 		if (date1 > date2) {
 			ElMessage.warning("未到开始时间，请耐心等待！");
-			
+
 		}
 	}
 	console.log("obj", obj.examinationTestId);
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index 1ec2030..9d4d382 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -47,21 +47,23 @@
 			</div>
 			<div class="threeBtn">
 				<botton class="btn" :style="{
-					background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
-				}" @click="showClick">观看
+	background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
+}" @click="showClick">观看
 				</botton>
-				
-				<botton  class="btn" :style="{
-					background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
-				}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
+
+				<botton class="btn" :style="{
+	background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
+}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
 				</botton>
-				<botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0 ">
+				<botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0">
 					评估
 				</botton>
 
 				<botton :style="{
-					background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
-				}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ data.isSurvery ? "已评估": "评估"}}
+	background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{ data.isSurvery ? "已评估" :
+		"评估"
+}}
 				</botton>
 			</div>
 		</div>
@@ -138,7 +140,7 @@
 </template>
 
 <script setup>
-import { computed, reactive, toRefs,onUnmounted } from "vue";
+import { computed, reactive, toRefs, onUnmounted } 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";
@@ -264,8 +266,7 @@ const commitClick = () => {
 		path: "/surveydetail",
 		query: {
 			courseId: data.value.assessmentId,
-			taskId: data.value.liveId,
-			taskIds: data.value.liveId,
+			infoId: data.value.liveId,
 			chapterOrStageId: 0,
 			pName: "直播",
 			sName: data.value.liveName,
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 4739fd4..dfd321e 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -1,12 +1,13 @@
 <template>
 	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
 	<div class="pathdetails" style="padding: 30px">
-	
+
 		<div class="pdname">
 			{{ data.name }}
-			<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
-    <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
-  </el-popover>
+			<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
+				:content="data.remark">
+				<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
+			</el-popover>
 		</div>
 
 		<!-- 详细信息 -->
@@ -29,13 +30,13 @@
 					</div>
 					<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
 					<div v-else class="course" v-for="(value, index) in i.taskProcessList.filter(
-						(e) => !whiteTypes(e.type)
-					)" :key="index">
+	(e) => !whiteTypes(e.type)
+)" :key="index">
 						<div style="width: 70%">
 							<div v-if="value.name.length > 50" class="coursename" :title="value.name">
-							<el-popover ref="popover"  placement="right" trigger="hover" :width="300" :content="value.name">
-								<template #reference></template>
-							</el-popover>
+								<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
+									<template #reference></template>
+								</el-popover>
 							</div>
 
 							<div v-else class="coursename" :title="value.name">{{ value.name }}</div>
@@ -63,15 +64,15 @@
 								<div class="progress">
 									<div style="width: 291px">
 										<el-progress :percentage="value.currentRatio" :show-text="false" :stroke-width="8" :color="
-											{
-												0: 'rgba(238, 112, 108, 1)',
-												1: 'rgba(255, 151, 38, 1)',
-												2: 'rgba(39, 122, 255, 1)',
-												3: 'rgba(59, 94, 251, 1)',
-												4: 'rgba(57, 219, 183, 1)',
-												5: 'rgba(57, 219, 183, 1)',
-											}[parseInt(value.currentRatio / 20)]
-										" />
+	{
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt(value.currentRatio / 20)]
+" />
 									</div>
 									<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;color:#677d86;">
 										{{ value.currentRatio }}%
@@ -81,12 +82,12 @@
 						</div>
 						<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)">
 							{{
-									value.status === 100
-										? "已完成"
-										: types.path[value.type]
-											? types.toName[value.type]
-											: "未开放"
-							}}
+		value.status === 100
+			? "已完成"
+			: types.path[value.type]
+				? types.toName[value.type]
+				: "未开放"
+}}
 						</div>
 						<!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
 						<!--              <div-->
@@ -185,15 +186,15 @@
 									<div style="width: 291px">
 										<el-progress :percentage="parseInt(data.totalProgress * 100)" :show-text="false" :stroke-width="8"
 											:color="
-												{
-													0: 'rgba(238, 112, 108, 1)',
-													1: 'rgba(255, 151, 38, 1)',
-													2: 'rgba(39, 122, 255, 1)',
-													3: 'rgba(59, 94, 251, 1)',
-													4: 'rgba(57, 219, 183, 1)',
-													5: 'rgba(57, 219, 183, 1)',
-												}[parseInt((data.totalProgress * 100) / 20)]
-											" />
+	{
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt((data.totalProgress * 100) / 20)]
+" />
 									</div>
 									<div style="font-size: 14px; font-weight: 500; margin-left: 10px;color:#677d86;">
 										{{ parseInt(data.totalProgress * 100) }}%
@@ -208,15 +209,15 @@
 									<div style="width: 291px">
 										<el-progress :percentage="parseInt(data.compulsoryProgress * 100)" :show-text="false"
 											:stroke-width="8" :color="
-												{
-													0: 'rgba(238, 112, 108, 1)',
-													1: 'rgba(255, 151, 38, 1)',
-													2: 'rgba(39, 122, 255, 1)',
-													3: 'rgba(59, 94, 251, 1)',
-													4: 'rgba(57, 219, 183, 1)',
-													5: 'rgba(57, 219, 183, 1)',
-												}[parseInt((data.compulsoryProgress * 100) / 20)]
-											" />
+	{
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt((data.compulsoryProgress * 100) / 20)]
+" />
 									</div>
 									<div style="
                       font-size: 14px;
@@ -371,7 +372,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
-		
+
 			return
 		}
 	}
@@ -437,7 +438,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		return;
 	}
 	if (d.type == 3 || d.type == 7) {
-    d.status || 	request(STUDY_RECORD, {
+		d.status || request(STUDY_RECORD, {
 			studentId: data.value.userInfoBo.userId,
 			targetId: data.value.routerId,
 			logo: 2,
@@ -456,8 +457,7 @@ function toFinish(d, sName, chapterOrStageId) {
 				query: {
 					id: d.projectTaskId,
 					type: 2,
-					taskId: data.value.projectId,
-					taskIds: data.value.projectId,
+					infoId: data.value.projectId,
 					courseId: d.courseId,
 					pName: data.value.name,
 					sName,
@@ -475,8 +475,9 @@ function whiteTypes(type) {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">
 .example-showcase .el-loading-mask {
-  z-index: 9;
+	z-index: 9;
 }
+
 .pathdetails {
 	.el-dialog__header {
 		display: none;
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index a4f0102..6e6cb76 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -1,65 +1,53 @@
 <template>
 	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
 	<div class="pathdetails" style="padding: 30px">
-		
+
 		<!-- 面包屑导航 -->
 
-    <div class="pdname">
-      {{ data.name }}    
-      <el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
-    <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
-  </el-popover>
-    </div>
-  
-    <!-- 详细信息 -->
-    <div class="detailinfo">
-      <div class="detailL">
-        <div>
-          <div class="title">
-            <div class="titleL">{{ data.currentStageName }}</div>
-            <div class="titleR" :style="{ display: 'flex' }">
-              <img
-                  :src="data.currentChapterCnt?circle:circle2"/>
-              <div class="titleRT" :style="{color:data.currentChapterCnt?'':'rgba(102, 102, 102, 1)'}">
-                {{ data.currentChapterCnt ? '进行中' : '未开始' }}
-              </div>
-            </div>
-          </div>
-          <div
-              class="course"
-              v-for="(value, index) in data.taskBoList?.filter(
-              (e) => !whiteTypes(e.type)
-            )"
-              :key="index"
-          >
-            <div style="width: 70%">
-				<div  v-if="value.name.length >50" class="coursename" :title="value.name">
-				<el-popover ref="popover"  placement="right" trigger="hover" :width="300" :content="value.name">
-					<template #reference>{{ value.name }}</template>
-				</el-popover>
-				</div>
+		<div class="pdname">
+			{{ data.name }}
+			<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
+				:content="data.remark">
+				<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
+			</el-popover>
+		</div>
 
-				<div  v-else class="coursename" :title="value.name">
-				{{ value.name }}
-				</div>
-              <div class="coursetag">
-                <div
-                    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"
-                >
-                  选修
-                </div>
-                <div class="tag3" style="margin-right: 11px; margin-top: 16px">
-                  {{ types.typeName[value.type] || "" }}
-                </div>
+		<!-- 详细信息 -->
+		<div class="detailinfo">
+			<div class="detailL">
+				<div>
+					<div class="title">
+						<div class="titleL">{{ data.currentStageName }}</div>
+						<div class="titleR" :style="{ display: 'flex' }">
+							<img :src="data.currentChapterCnt ? circle : circle2" />
+							<div class="titleRT" :style="{ color: data.currentChapterCnt ? '' : 'rgba(102, 102, 102, 1)' }">
+								{{ data.currentChapterCnt ? '进行中' : '未开始' }}
+							</div>
+						</div>
+					</div>
+					<div class="course" v-for="(value, index) in data.taskBoList?.filter(
+	(e) => !whiteTypes(e.type)
+)" :key="index">
+						<div style="width: 70%">
+							<div v-if="value.name.length > 50" class="coursename" :title="value.name">
+								<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
+									<template #reference>{{ value.name }}</template>
+								</el-popover>
+							</div>
+
+							<div v-else class="coursename" :title="value.name">
+								{{ value.name }}
+							</div>
+							<div class="coursetag">
+								<div 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">
+									选修
+								</div>
+								<div class="tag3" style="margin-right: 11px; margin-top: 16px">
+									{{ types.typeName[value.type] || "" }}
+								</div>
 
 								<!--                                <div-->
 								<!--                                    v-for="(item, key) in value.flag"-->
@@ -75,35 +63,34 @@
 								<div class="progress">
 									<div style="width: 291px">
 										<el-progress :percentage="value.currentRatio" :show-text="false" :stroke-width="8" :color="
-											{
-												0: 'rgba(238, 112, 108, 1)',
-												1: 'rgba(255, 151, 38, 1)',
-												2: 'rgba(39, 122, 255, 1)',
-												3: 'rgba(59, 94, 251, 1)',
-												4: 'rgba(57, 219, 183, 1)',
-												5: 'rgba(57, 219, 183, 1)',
-											}[parseInt(value.currentRatio / 20)]
-										" />
+	{
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt(value.currentRatio / 20)]
+" />
 									</div>
-									<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" 
-					:style="{
-                    	color: {
-                    		0: 'rgba(238, 112, 108, 1)',
-                    		1: 'rgba(255, 151, 38, 1)',
-                    		2: 'rgba(39, 122, 255, 1)',
-                    		3: 'rgba(59, 94, 251, 1)',
-                    		4: 'rgba(57, 219, 183, 1)',
-                    		5: 'rgba(57, 219, 183, 1)',
-                    	}[parseInt(value.currentRatio / 20)],
-                    }">
+									<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" :style="{
+	color: {
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt(value.currentRatio / 20)],
+}">
 										{{ value.currentRatio }}%
 									</div>
 								</div>
 							</div>
 						</div>
 						<div class="goclass" :style="{
-							background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
-						}" @click="toFinish(value)">
+	background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
+}" @click="toFinish(value)">
 							{{ value.currentRatio === 100 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
 						</div>
 						<!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
@@ -203,26 +190,26 @@
 									<div style="width: 291px">
 										<el-progress :percentage="parseInt(data.currentChapterCnt / data.totalChapterCnt * 100)"
 											:show-text="false" :stroke-width="8" :color="
-												{
-													0: 'rgba(238, 112, 108, 1)',
-													1: 'rgba(255, 151, 38, 1)',
-													2: 'rgba(39, 122, 255, 1)',
-													3: 'rgba(59, 94, 251, 1)',
-													4: 'rgba(57, 219, 183, 1)',
-													5: 'rgba(57, 219, 183, 1)',
-												}[(parseInt(data.currentChapterCnt / data.totalChapterCnt) * 100) / 20]
-											" />
+	{
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[(parseInt(data.currentChapterCnt / data.totalChapterCnt) * 100) / 20]
+" />
 									</div>
 									<div style="font-size: 14px; font-weight: 500; margin-left: 10px" :style="{
-										color: {
-											0: 'rgba(238, 112, 108, 1)',
-											1: 'rgba(255, 151, 38, 1)',
-											2: 'rgba(39, 122, 255, 1)',
-											3: 'rgba(59, 94, 251, 1)',
-											4: 'rgba(57, 219, 183, 1)',
-											5: 'rgba(57, 219, 183, 1)',
-										}[parseInt((data.currentChapterCnt / data.totalChapterCnt * 100) / 20)],
-									}">
+	color: {
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt((data.currentChapterCnt / data.totalChapterCnt * 100) / 20)],
+}">
 										{{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
 									</div>
 								</div>
@@ -235,15 +222,15 @@
 									<div style="width: 291px">
 										<el-progress :percentage="parseInt(data.currentReqCnt / data.totalReqCnt * 100)" :show-text="false"
 											:stroke-width="8" :color="
-												{
-													0: 'rgba(238, 112, 108, 1)',
-													1: 'rgba(255, 151, 38, 1)',
-													2: 'rgba(39, 122, 255, 1)',
-													3: 'rgba(59, 94, 251, 1)',
-													4: 'rgba(57, 219, 183, 1)',
-													5: 'rgba(57, 219, 183, 1)',
-												}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)]
-											" />
+	{
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)]
+" />
 									</div>
 									<div style="
                       font-size: 14px;
@@ -251,15 +238,15 @@
                       color: #277aff;
                       margin-left: 10px;
                     " :style="{
-                    	color: {
-                    		0: 'rgba(238, 112, 108, 1)',
-                    		1: 'rgba(255, 151, 38, 1)',
-                    		2: 'rgba(39, 122, 255, 1)',
-                    		3: 'rgba(59, 94, 251, 1)',
-                    		4: 'rgba(57, 219, 183, 1)',
-                    		5: 'rgba(57, 219, 183, 1)',
-                    	}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)],
-                    }">
+	color: {
+		0: 'rgba(238, 112, 108, 1)',
+		1: 'rgba(255, 151, 38, 1)',
+		2: 'rgba(39, 122, 255, 1)',
+		3: 'rgba(59, 94, 251, 1)',
+		4: 'rgba(57, 219, 183, 1)',
+		5: 'rgba(57, 219, 183, 1)',
+	}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)],
+}">
 										{{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
 									</div>
 								</div>
@@ -385,7 +372,7 @@ function toFinish(d) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
-		
+
 			return
 		}
 	}
@@ -446,7 +433,7 @@ function toFinish(d) {
 		}
 	}
 	if (d.type === 3 || d.type === 7) {
-    d.status || request(STUDY_RECORD, {
+		d.status || request(STUDY_RECORD, {
 			studentId: userInfo.value.id,
 			targetId: data.value.routerId,
 			logo: 1,
@@ -463,11 +450,9 @@ function toFinish(d) {
 			router.push({
 				path: types.value.path[d.type],
 				query: {
-					id: d.routerTaskId,
-					// id: routerId,
+					id: routerId,
 					type: 1,
-					taskId: routerId,
-					taskIds: routerId,
+					infoId: routerId,
 					courseId: d.courseId,
 					pName: data.value.name,
 					sName: data.value.currentStageName,
@@ -508,6 +493,7 @@ function whiteTypes(type) {
 		margin-top: 24px;
 		display: flex;
 		z-index: 2;
+
 		.detailL {
 			flex: 1;
 			margin-right: 20px;
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 0c17b58..b038ec4 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -46,8 +46,8 @@
 
 				<div class="question" v-for="
           (value, index) in  formateArr([data.assessmentEssayQuestionDtoList, data.assessmentMultipleChoiceDtoList, data.assessmentScoringQuestionDtoList, data.assessmentSingleChoiceDtoList]).sort((a, b) => {
-          	return a[0].orderNumber - b[0].orderNumber
-          }) " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
+	return a[0].orderNumber - b[0].orderNumber
+}) " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
 					<div v-if="value[0].questionType == '4'">
 						<div class="question" v-for="(value, index) in data.assessmentScoringQuestionDtoList" :key="index"
 							:style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
@@ -56,9 +56,9 @@
 								<div class="answerL">完全没用</div>
 								<div class="answerC">
 									<div class="answerCitem" v-for="(item, key) in Array.from(
-										{ length: value.assessmentMaxScore },
-										(k, i) => i
-									)" :key="key" :style="{
+	{ length: value.assessmentMaxScore },
+	(k, i) => i
+)" :key="key" :style="{
 	'margin-left': key === 0 ? '15px' : '10px',
 	background:
 		value.selectAnswer === item
@@ -86,17 +86,17 @@
 
 					<div v-else-if="value[0].questionType == '1'">
 						<div class="question" style="margin-top: 41px" v-if="
-							data.assessmentSingleChoiceDtoList &&
-							data.assessmentSingleChoiceDtoList.length
-						">
+	data.assessmentSingleChoiceDtoList &&
+	data.assessmentSingleChoiceDtoList.length
+">
 							<div class="text">
 								{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
 							</div>
 							<div v-for="(value, index) in data.assessmentSingleChoiceDtoList" :key="index"
 								style="display: flex; align-items: center" :style="{
-									'margin-top': index === 0 ? '29px' : '22px',
-									cursor: 'pointer',
-								}" @click="
+	'margin-top': index === 0 ? '29px' : '22px',
+	cursor: 'pointer',
+}" @click="
 	() => {
 		if (data.isSubmit) {
 			return;
@@ -115,17 +115,17 @@
 
 					<div v-else-if="value[0].questionType == '2'">
 						<div class="question" style="margin-top: 41px" v-if="
-							data.assessmentMultipleChoiceDtoList &&
-							data.assessmentMultipleChoiceDtoList.length
-						">
+	data.assessmentMultipleChoiceDtoList &&
+	data.assessmentMultipleChoiceDtoList.length
+">
 							<div class="text">
 								{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
 							</div>
 							<div v-for="(value, index) in data.assessmentMultipleChoiceDtoList" :key="index"
 								style="display: flex; align-items: center" :style="{
-									'margin-top': index === 0 ? '29px' : '22px',
-									cursor: 'pointer',
-								}" @click="
+	'margin-top': index === 0 ? '29px' : '22px',
+	cursor: 'pointer',
+}" @click="
 	() => {
 		if (data.isSubmit) {
 			return;
@@ -292,11 +292,11 @@
         </div> -->
 
 				<div style="display: flex; justify-content: center" v-if="
-					data.assessmentEssayQuestionDtoList?.length ||
-					data.assessmentMultipleChoiceDtoList?.length ||
-					data.assessmentSingleChoiceDtoList?.length ||
-					data.assessmentScoringQuestionDtoList?.length
-				">
+	data.assessmentEssayQuestionDtoList?.length ||
+	data.assessmentMultipleChoiceDtoList?.length ||
+	data.assessmentSingleChoiceDtoList?.length ||
+	data.assessmentScoringQuestionDtoList?.length
+">
 					<div class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
 						提交
 					</div>
@@ -334,7 +334,7 @@ import { ElMessage } from "element-plus";
 import { ref } from "vue";
 
 const {
-	query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId },
+	query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId },
 } = useRoute();
 const router = useRouter();
 const returnclick = () => {
@@ -353,8 +353,8 @@ function formateArr(arr1) {
 	return newarr
 }
 
-const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 });
-console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 })
+const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
+console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 })
 console.log('我是需要排序得题目', data)
 
 function goHome() {
@@ -369,10 +369,10 @@ function submit() {
 	if (1 > 0) {
 		console.log(data)
 		console.log('我是提交的数据', {
-			targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+			targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
 			chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
 			assessmentId: courseId,
-			taskId: taskId ? taskId : taskIds ? taskIds : 0,
+			taskId: taskId ? taskId : 0,
 			type,
 			result: JSON.stringify(data.value),
 		})
@@ -424,10 +424,10 @@ function submit() {
 
 	data.value.isSubmit = !data.value.isSubmit;
 	request(ASSESSMENT_SUBMIT, {
-		targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+		targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
 		chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
 		assessmentId: courseId,
-		taskId: taskIds ? taskIds : 0,
+		taskId: taskId ? taskId : 0,
 		type,
 		result: JSON.stringify(data.value),
 	}).then(() => {

From 4d1a5d78b310007527cf072ea57431e6f0d79a80 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Mon, 26 Dec 2022 12:29:29 +0800
Subject: [PATCH 13/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 52f883b..db01862 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -322,10 +322,10 @@ function toSurvery() {
 	router.push({
 		path: "/surveydetail",
 		query: {
+			id: taskId,
 			courseId: data.value.planDto.evaluateId,
 			pName: "面授课",
-			taskId: data.value.planDto.offcoursePlanId,
-			taskIds: data.value.planDto.offcoursePlanId,
+			infoId: data.value.offcourseDto.offcourseId,
 			chapterOrStageId: 0,
 			sName: data.value.planDto.name,
 			type: 3
@@ -349,7 +349,7 @@ function toWork() {
 		query: {
 			courseId: data.value.workDto.workId,
 			id: taskId,
-			infoId: taskId,
+			infoId: data.value.offcourseDto.offcourseId,
 			chapterOrStageId: 0,
 			type,
 			pName: "面授课",

From fdd3f084da8628c344920fd9c6e94dd171e0e383 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Mon, 26 Dec 2022 13:08:40 +0800
Subject: [PATCH 14/32] =?UTF-8?q?fix:=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index db01862..485882c 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -322,7 +322,6 @@ function toSurvery() {
 	router.push({
 		path: "/surveydetail",
 		query: {
-			id: taskId,
 			courseId: data.value.planDto.evaluateId,
 			pName: "面授课",
 			infoId: data.value.offcourseDto.offcourseId,

From 35d74c31275c4c14f30c987d346d1485d4c1251d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 13:12:37 +0800
Subject: [PATCH 15/32] =?UTF-8?q?--=20=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/roadmap/PathDetails.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 6e6cb76..9b7df3a 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -450,7 +450,7 @@ function toFinish(d) {
 			router.push({
 				path: types.value.path[d.type],
 				query: {
-					id: routerId,
+					id: d.routerTaskId,
 					type: 1,
 					infoId: routerId,
 					courseId: d.courseId,

From 20839f3cb2dc4978afbd47bf8c837937af30533a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 26 Dec 2022 15:23:29 +0800
Subject: [PATCH 16/32] -- bug

---
 src/views/homework/HomeworkPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 6570073..0eb7c51 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -179,7 +179,7 @@
 						{{data?.submitStartTime}}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{data?.submitEndTime}}
 					</div>
 					<div class="endtime clearfix">
-						<div v-if="dayjs(data?.submitEndTime).isBefore(dayjs())" class="endtimetext">改任务已结束</div>
+						<div v-if="dayjs(data?.submitEndTime).isBefore(dayjs())" class="endtimetext">该任务已结束</div>
 						<div v-else class="endtimetext">距离结束还有&nbsp;&nbsp;<span class="te">{{parseInt(dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60)}}</span>&nbsp;&nbsp; 小时&nbsp;&nbsp;
 						<span class="te">{{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}</span>&nbsp;&nbsp;分钟</div>
 					</div>

From 9bf3e863ec1f766577ac38f2f9a96b430a947056 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Mon, 26 Dec 2022 16:20:41 +0800
Subject: [PATCH 17/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 127 ++++++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 63 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b147a29..098347f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,11 +7,11 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-   <!--
+	<!--
  -->
-  <div id="container">
- 
-    <!-- <div id="nav">
+	<div id="container">
+
+		<!-- <div id="nav">
       <router-link
         v-for="item in routes"
         :key="item.path"
@@ -24,84 +24,85 @@
         {{ item.name }}
       </router-link>
     </div> -->
-    <main style="z-index: 2">
-      <router-view/>
-    </main>
-  </div>
+		<main style="z-index: 2">
+			<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";
 import router from "@/router";
 
-console.log("版本1.0.6------------");
+console.log("版本1.0.7------------");
 const store = useStore();
 onMounted(() => {
-  getUserInfo();
+	getUserInfo();
 });
 
 function getUserInfo() {
-  boeRequest(GET_USER_INFO).then((res) => {
-    res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png')
-    store.commit("SET_USER", res.result);
-  });
+	boeRequest(GET_USER_INFO).then((res) => {
+		res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png')
+		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;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
-  height: 100%;
+	// 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;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	color: #2c3e50;
+	height: 100%;
 }
 
 #container {
-  display: flex;
-  width: 100%;
-  min-height: 100%;
-  background-color: rgba(242, 245, 247, 1);
-  // background-color: #ccc;
-  #nav {
-    width: 220px;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    gap: 20px;
-    padding: 30px 0;
-    box-sizing: border-box;
-    background: #f1f1f1;
-    box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795);
+	display: flex;
+	width: 100%;
+	min-height: 100%;
+	background-color: rgba(242, 245, 247, 1);
 
-    .link {
-      text-decoration: none;
-      color: rgb(0, 0, 0);
-      padding: 10px;
-      transition: all 0.4s;
-      text-align: center;
+	// background-color: #ccc;
+	#nav {
+		width: 220px;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		gap: 20px;
+		padding: 30px 0;
+		box-sizing: border-box;
+		background: #f1f1f1;
+		box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795);
 
-      &:hover {
-        background: rgba(4, 37, 223, 0.274);
-        color: #f1f1f1;
-      }
+		.link {
+			text-decoration: none;
+			color: rgb(0, 0, 0);
+			padding: 10px;
+			transition: all 0.4s;
+			text-align: center;
 
-      &.active {
-        color: #f1f1f1;
-        background: rgba(17, 120, 255, 0.74);
-      }
-    }
-  }
+			&:hover {
+				background: rgba(4, 37, 223, 0.274);
+				color: #f1f1f1;
+			}
 
-  main {
-    flex: 1;
-    width: 100%;
-    // padding: 30px;
-    box-sizing: border-box;
-  }
+			&.active {
+				color: #f1f1f1;
+				background: rgba(17, 120, 255, 0.74);
+			}
+		}
+	}
+
+	main {
+		flex: 1;
+		width: 100%;
+		// padding: 30px;
+		box-sizing: border-box;
+	}
 }
 </style>

From 93832b53029227168962b5858d1f83ad8db33b7a Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 27 Dec 2022 08:52:11 +0800
Subject: [PATCH 18/32] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue    | 34 ++++++++++++----------------
 src/views/project/ProjectDetails.vue | 16 ++++++++++---
 src/views/project/ProjectManage.vue  |  2 +-
 src/views/roadmap/PathDetails.vue    | 16 ++++++++++---
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 8a81426..18cd10a 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -78,11 +78,7 @@
 								<div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure"
 									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
 									<div class="enclosureL">
-										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
-	width: '22px',
-	height: '26px',
-	marginLeft: '10px',
-}"></FileTypeImg>
+										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
 										<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
 									</div>
 									<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
@@ -123,7 +119,7 @@
 								此课程无作业
 							</div>
 						</el-tab-pane>
-						<el-tab-pane label="课程考试" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+						<el-tab-pane label="课程考试" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto?.beginTime))>
 
 							<div class="work" v-if="data.examinationDto?.examinationTestName">
 								<div>
@@ -229,29 +225,29 @@ let timer = null;
 //判断能否签到
 function isSignClick() {
 	timer = setInterval(() => {
-		let beginTime = new Date(data.value.planDto.beginTime).getTime();
-		let endTime = !data.value.planDto.afterStart
-			? new Date(data.value.planDto.endTime).getTime()
-			: new Date(data.value.planDto.beginTime).getTime();
+		let beginTime = new Date(data.value.planDto?.beginTime).getTime();
+		let endTime = !data.value.planDto?.afterStart
+			? new Date(data.value.planDto?.endTime).getTime()
+			: new Date(data.value.planDto?.beginTime).getTime();
 		let nowTime = new Date().getTime();
-		if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
+		if (data.value.planDto?.beforeStart && data.value.planDto?.afterStart) {
 			//有开始前有开始后
-			beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
-			endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
+			beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
+			endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
 			console.log("1111");
 		} else if (
-			data.value.planDto.beforeStart &&
-			!data.value.planDto.afterStart
+			data.value.planDto?.beforeStart &&
+			!data.value.planDto?.afterStart
 		) {
 			//只有开始前无开始后
-			beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
+			beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
 			console.log("11112222");
 		} else if (
-			!data.value.planDto.beforeStart &&
-			data.value.planDto.afterStart
+			!data.value.planDto?.beforeStart &&
+			data.value.planDto?.afterStart
 		) {
 			//无开始前有开始后
-			endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
+			endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
 			console.log("1111333");
 		}
 		if (nowTime < endTime && nowTime > beginTime) {
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 640acbc..dead039 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -377,6 +377,16 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行
 
 function toFinish(d, sName, chapterOrStageId) {
 	console.log("dddddd", d, sName, chapterOrStageId);
+	if (d.type == 2) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前面授课已结束';
+			dialogVisible.value = true;
+
+			//return
+		}
+	}
 	// 作业过期判断
 	if (d.type == 4) {
 		let date1 = new Date(d.endTime).getTime();
@@ -385,7 +395,7 @@ function toFinish(d, sName, chapterOrStageId) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
 
-			return
+			//return
 		}
 	}
 	// 直播结束时间
@@ -395,7 +405,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前直播已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 考试 停用
@@ -423,7 +433,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前活动已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 在线课 停用 -- 暂时没有在线课停用标记
diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue
index 2fd095f..586495c 100644
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -31,7 +31,7 @@
 					<el-input v-model="projectname" placeholder="请输入项目名称" />
 				</div>
 				<div style="width: 420px">
-					<el-date-picker v-model="searchTime" type="daterange" range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" @change="selectTime"/>
+					<el-date-picker v-model="searchTime" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" @change="selectTime"/>
 					
 				</div>
 
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 10c341b..2b2a930 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -366,6 +366,16 @@ function toFinish(d) {
 		ElMessage.error("暂时未开放");
 		return;
 	}
+	if (d.type == 2) {
+		let date1 = new Date(d.endTime).getTime();
+		let date2 = new Date().getTime();
+		if (date1 < date2) {
+			dialogVisibleTip.value = '当前面授课已结束';
+			dialogVisible.value = true;
+
+			//return
+		}
+	}
 	if (d.type == 4) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
@@ -373,7 +383,7 @@ function toFinish(d) {
 			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
 
-			return
+			//return
 		}
 	}
 	// 直播结束时间
@@ -383,7 +393,7 @@ function toFinish(d) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前直播已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 考试 停用
@@ -411,7 +421,7 @@ function toFinish(d) {
 		if (date1 < date2) {
 			dialogVisibleTip.value = '当前活动已结束';
 			dialogVisible.value = true;
-			return
+			//return
 		}
 	}
 	// 在线课 停用 -- 暂时没有在线课停用标记

From b7b423305eaccd0a74bbf0916d970b8f44637ba9 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Tue, 27 Dec 2022 10:22:29 +0800
Subject: [PATCH 19/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 098347f..1834c38 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.0.7------------");
+console.log("版本1.0.8------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From fdd5cb64cdf6994cfe5f7484f69c3565a1d73be2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 10:10:59 +0800
Subject: [PATCH 20/32] =?UTF-8?q?--=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index c06f270..56ab90c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.0.9------------");
+console.log("版本1.2.8------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From 82216c755edfc35e5a8f477f030fe10125ca2cec Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 19:05:42 +0800
Subject: [PATCH 21/32] =?UTF-8?q?--=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 1ca2192..2c25fc9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.2.8------------");
+console.log("版本1.2.9------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From e0551f1f3bfb972556a8b49210e53e07ebfcde6c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 20:02:59 +0800
Subject: [PATCH 22/32] =?UTF-8?q?--=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 2c25fc9..f16a90a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.2.9------------");
+console.log("版本2.0.1------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From d68110cd9b6d051c6b1c39f627b8010bad7da94c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 22:36:12 +0800
Subject: [PATCH 23/32] =?UTF-8?q?--=20=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.env.prod b/.env.prod
index c67c8a4..9d81f3f 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,8 +1,15 @@
 VITE_BASE=/fe-student
 VITE_BASE_API=/manageApi
+VITE_BASE_LOGIN_URL=https://u.boe.com/web/
+
 
 VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc/exam/test?id=
+VITE_BOE_PATH_DETAIL_URL=https://u.boe.com/pc/forward?to=/fe-student
+
+VITE_BOE_API_URL=https://u.boe.com
+
+VITE_TASK_WHITE_TYPE=-8-,-12-,-13-

From 4f5efab57ca2c185f039d35d6b6578d2c1141c7f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 23:15:14 +0800
Subject: [PATCH 24/32] =?UTF-8?q?--=20=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 16056b8..2a0c732 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,7 +20,7 @@ const routes = [
 ]
 
 const router = createRouter({
-	history: createWebHistory("/fe-student-release"),
+	history: createWebHistory(import.meta.env.VITE_BASE),
 	routes
 })
 

From 07b4ae218fff1f7e615e857ddb2fba79b44d5796 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 29 Dec 2022 00:11:55 +0800
Subject: [PATCH 25/32] =?UTF-8?q?--=20=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index f16a90a..55404fe 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本2.0.1------------");
+console.log("版本2.0.2------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From 9b5325dd6b7d12010d162f641b7335726fbc1ce1 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 30 Dec 2022 09:53:50 +0800
Subject: [PATCH 26/32] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue       | 4 ++--
 src/views/faceteach/FaceTeachSignUp.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index f39d838..8b39129 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -96,8 +96,8 @@
 								<div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure"
 									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
 									<div class="enclosureL">
-										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
-										<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
+										<FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
+										<div style="margin-left: 20px">{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}</div>
 									</div>
 									<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
 										<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index 914854a..08068c9 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -75,12 +75,12 @@
                 <div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
                      :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
                   <div class="enclosureL">
-                    <FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
+                    <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{
 											width: '22px',
 											height: '26px',
 											marginLeft: '10px',
 										}"></FileTypeImg>
-                    <div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
+                    <div style="margin-left: 20px">{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-'))  + el.slice(el.lastIndexOf('.')) }}</div>
                   </div>
                   <div class="download">
                     <img style="width: 16px; height: 15px" src="../../assets/image/download.png"/>

From 1605258d062c805714b772f9eb6208722cb57359 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 30 Dec 2022 11:07:07 +0800
Subject: [PATCH 27/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 03580f5..4454662 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.0.9------------");
+console.log("版本1.11------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From 65f19cb014d13b77731003e5f6a6f1e0231ba6ec Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 30 Dec 2022 14:31:40 +0800
Subject: [PATCH 28/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8B=E6=A1=88=E4=BE=8B=E5=A4=96=E8=81=94?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectDetails.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 0e2988f..f1443fc 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -404,6 +404,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
 
 function toFinish(d, sName, chapterOrStageId) {
 	console.log("dddddd", d, sName, chapterOrStageId);
+	
 	if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){
 		ElMessage.error("当前任务已结束")
 		return
@@ -491,14 +492,17 @@ function toFinish(d, sName, chapterOrStageId) {
 		return;
 	}
 	if (d.type == 3 || d.type == 7) {
-		d.status || request(STUDY_RECORD, {
-			studentId: data.value.userInfoBo.userId,
-			targetId: data.value.routerId,
-			logo: 2,
-			stageOrChapterId: chapterOrStageId,
-			taskId: d.projectTaskId,
-		});
+		if(d.status!==1){
+			request(STUDY_RECORD, {
+				studentId: data.value.userInfoBo.userId,
+				targetId: data.value.routerId,
+				logo: 2,
+				stageOrChapterId: chapterOrStageId,
+				taskId: d.projectTaskId,
+			});
+		}
 	}
+
 	if (typeof types.value.path[d.type] === "string") {
 		types.value.path[d.type] &&
 			types.value.path[d.type].startsWith("http") &&

From 4d9b51b3ceb96e3ecf4b7698ec2b44006ea95457 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 30 Dec 2022 15:37:43 +0800
Subject: [PATCH 29/32] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 4454662..b2fcd63 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.11------------");
+console.log("版本1.12------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

From 76588c05a10d42a88b07fddd7be6964a35daaa42 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 30 Dec 2022 16:17:32 +0800
Subject: [PATCH 30/32] =?UTF-8?q?--=20=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectDetails.vue | 7 ++-----
 src/views/roadmap/PathDetails.vue    | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 0e2988f..725bac7 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -354,10 +354,7 @@ 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,'_top')
-			), //外联
+    7: ({ targetId }) => window.open(targetId, '_top'),
 		8: "/discusspage",
 		9: "/moreactive",
 		10: ({ evaType, targetId }) =>
@@ -491,7 +488,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		return;
 	}
 	if (d.type == 3 || d.type == 7) {
-		d.status || request(STUDY_RECORD, {
+		d.status!==1 && request(STUDY_RECORD, {
 			studentId: data.value.userInfoBo.userId,
 			targetId: data.value.routerId,
 			logo: 2,
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 6b99c12..48e83a4 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -341,10 +341,7 @@ 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, '_top')
-			), //外联
+		7: ({ targetId }) => window.open(targetId, '_top'), //外联
 		8: "/discusspage",
 		9: "/moreactive",
 		10: ({ evaType, targetId }) =>
@@ -443,7 +440,7 @@ function toFinish(d) {
 		}
 	}
 	if (d.type === 3 || d.type === 7) {
-		d.status || request(STUDY_RECORD, {
+		d.status!==1 && request(STUDY_RECORD, {
 			studentId: userInfo.value.id,
 			targetId: data.value.routerId,
 			logo: 1,

From 1b008e3ef6d0efeee69b0a211c609c2e7515f76e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 30 Dec 2022 17:01:10 +0800
Subject: [PATCH 31/32] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectDetails.vue | 6 +++---
 src/views/roadmap/PathDetails.vue    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 8f8e8c2..bc3aea6 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -359,9 +359,9 @@ const types = ref({
 		9: "/moreactive",
 		10: ({ evaType, targetId }) =>
 			window.open(
-				(evaType == 0
-					? import.meta.env.VITE_BOE_TEST_DETAIL_URL
-					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+				evaType == 0
+					? import.meta.env.VITE_BOE_TEST_DETAIL_URL+ targetId
+					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL+targetId+`&quizTaskKid=${projectId}&channelCode=project`
           ,'_top'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 48e83a4..57cf6ab 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -346,9 +346,9 @@ const types = ref({
 		9: "/moreactive",
 		10: ({ evaType, targetId }) =>
 			window.open(
-				(evaType == 0
-					? import.meta.env.VITE_BOE_TEST_DETAIL_URL
-					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+				evaType == 0
+					? import.meta.env.VITE_BOE_TEST_DETAIL_URL+targetId
+					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=project`
 			,'_top'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",

From 414aa9831f85c01c19701f723dd2843690115114 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 30 Dec 2022 17:02:34 +0800
Subject: [PATCH 32/32] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/roadmap/PathDetails.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 57cf6ab..01efb7e 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -348,7 +348,7 @@ const types = ref({
 			window.open(
 				evaType == 0
 					? import.meta.env.VITE_BOE_TEST_DETAIL_URL+targetId
-					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=project`
+					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=learningpath`
 			,'_top'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",