From e9d250e835af5df51f6eb3589c38d862e1bfb6d5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 14:27:44 +0800 Subject: [PATCH 1/9] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83ur?= =?UTF-8?q?l=E5=8E=BB=E9=99=A4=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 17 ++++++++--------- .env.boe | 14 ++++++++------ src/App.vue | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.env b/.env index eb42ec7..80b02d3 100644 --- a/.env +++ b/.env @@ -1,17 +1,16 @@ VITE_BASE=/fe-student VITE_BASE_API= -VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ +VITE_BASE_LOGIN_URL=/web/ VITE_PROXY_URL=http://111.231.196.214:30001 -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_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid= -VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= -VITE_BOE_PATH_DETAIL_URL=https://u-pre.boe.com/pc/forward?to=/fe-student +VITE_BOE_ONLINE_CLASS_URL=/pc/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=/pc/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= +VITE_BOE_EXAM_DETAIL_URL=/pc/exam/test?id= +VITE_BOE_PATH_DETAIL_URL=/pc/forward?to=/fe-student VITE_BOE_API_URL=https://u-pre.boe.com -VITE_TASK_WHITE_TYPE=-8-,-12-,-13- -# VITE_TASK_WHITE_TYPE=-8-,-12- \ No newline at end of file +VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file diff --git a/.env.boe b/.env.boe index e483b78..9899451 100644 --- a/.env.boe +++ b/.env.boe @@ -1,10 +1,12 @@ VITE_BASE=/fe-student 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_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid= -VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= +VITE_BOE_ONLINE_CLASS_URL=/pc/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=/pc/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= +VITE_BOE_EXAM_DETAIL_URL=/pc/exam/test?id= -VITE_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file +VITE_BOE_API_URL=https://u-pre.boe.com + +VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index c06f270..03580f5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ onMounted(() => { 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') + res.result.avatar = res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' store.commit("SET_USER", res.result); }); } From d820c2779e7f774eaf6ea97df38744ba9ecd4e16 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 14:29:17 +0800 Subject: [PATCH 2/9] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83ur?= =?UTF-8?q?l=E5=8E=BB=E9=99=A4=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/utils.js b/src/api/utils.js index c99a53a..a0938ce 100644 --- a/src/api/utils.js +++ b/src/api/utils.js @@ -21,7 +21,7 @@ export function useUserInfo(id) { watch(id, () => { id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => { userInfo.value = res.result.userInfoList[0] - userInfo.value.avatar = `${import.meta.env.VITE_BOE_API_URL}/upload${userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'}` + userInfo.value.avatar = userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' }) }) return userInfo From 624fda7c8f67abce2d3373e9beea5861a370b1ee Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 14:29:59 +0800 Subject: [PATCH 3/9] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83ur?= =?UTF-8?q?l=E5=8E=BB=E9=99=A4=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 -- .env.boe | 2 -- .env.release | 2 -- 3 files changed, 6 deletions(-) diff --git a/.env b/.env index 80b02d3..a231825 100644 --- a/.env +++ b/.env @@ -11,6 +11,4 @@ VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=/pc/exam/test?id= VITE_BOE_PATH_DETAIL_URL=/pc/forward?to=/fe-student -VITE_BOE_API_URL=https://u-pre.boe.com - VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file diff --git a/.env.boe b/.env.boe index 9899451..8ad1114 100644 --- a/.env.boe +++ b/.env.boe @@ -7,6 +7,4 @@ VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=/pc/exam/test?id= -VITE_BOE_API_URL=https://u-pre.boe.com - VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file diff --git a/.env.release b/.env.release index 6ab43ac..dd3b8c9 100644 --- a/.env.release +++ b/.env.release @@ -8,5 +8,3 @@ 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-release/exam/test?id= VITE_BOE_PATH_DETAIL_URL=https://u.boe.com/pc-release/forward?to=/fe-student-release - -VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file From 64b3a732f6ccd9c162c207ab4c8c956ec158c431 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 14:30:25 +0800 Subject: [PATCH 4/9] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83ur?= =?UTF-8?q?l=E5=8E=BB=E9=99=A4=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.release | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.release b/.env.release index dd3b8c9..ba04b14 100644 --- a/.env.release +++ b/.env.release @@ -1,10 +1,10 @@ VITE_BASE=/fe-student-release VITE_BASE_API=/manageApi-release -VITE_BASE_LOGIN_URL=https://u.boe.com/web/ +VITE_BASE_LOGIN_URL=/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_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid= -VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id= -VITE_BOE_PATH_DETAIL_URL=https://u.boe.com/pc-release/forward?to=/fe-student-release +VITE_BOE_ONLINE_CLASS_URL=/pc-release/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=/pc-release/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= +VITE_BOE_EXAM_DETAIL_URL=/pc-release/exam/test?id= +VITE_BOE_PATH_DETAIL_URL=/pc-release/forward?to=/fe-student-release From c819f0bd0d3a32ea996efb49e9bf6df713b8f79c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 14:30:51 +0800 Subject: [PATCH 5/9] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83ur?= =?UTF-8?q?l=E5=8E=BB=E9=99=A4=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 2 -- 1 file changed, 2 deletions(-) diff --git a/.env.prod b/.env.prod index 78afff3..c67c8a4 100644 --- a/.env.prod +++ b/.env.prod @@ -6,5 +6,3 @@ 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_API_URL=https://u.boe.com \ No newline at end of file From 505e8124b213f69cd2b35dce8fa7e655143961b8 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 28 Dec 2022 14:54:34 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=AF=BE=E7=A8=8B=E8=80=83=E8=AF=95=E5=90=8D=E7=A7=B0?= =?UTF-8?q?-=E8=80=83=E8=AF=95=E5=90=8D=E7=A7=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 4f5a35f..f34609e 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -124,7 +124,7 @@
- {{ data.examinationDto?.examinationTestName }} + {{ data.examinationDto?.examinationName }}
From 2ae772a0c2c737590b5437ed3538d5d5b2f563c1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 15:02:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83ur?= =?UTF-8?q?l=E5=8E=BB=E9=99=A4=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 16 +++++++++------- .env.boe | 12 ++++++------ .env.release | 16 +++++++++------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.env b/.env index a231825..8aaa1a9 100644 --- a/.env +++ b/.env @@ -1,14 +1,16 @@ VITE_BASE=/fe-student VITE_BASE_API= -VITE_BASE_LOGIN_URL=/web/ +VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ VITE_PROXY_URL=http://111.231.196.214:30001 -VITE_BOE_ONLINE_CLASS_URL=/pc/course/studyindex?id= -VITE_BOE_CASS_DETAIL_URL=/pc/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= -VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= -VITE_BOE_EXAM_DETAIL_URL=/pc/exam/test?id= -VITE_BOE_PATH_DETAIL_URL=/pc/forward?to=/fe-student +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_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid= +VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= +VITE_BOE_PATH_DETAIL_URL=https://u-pre.boe.com/pc/forward?to=/fe-student + +VITE_BOE_API_URL=https://u-pre.boe.com VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file diff --git a/.env.boe b/.env.boe index 8ad1114..e483b78 100644 --- a/.env.boe +++ b/.env.boe @@ -1,10 +1,10 @@ VITE_BASE=/fe-student VITE_BASE_API=/manageApi -VITE_BOE_ONLINE_CLASS_URL=/pc/course/studyindex?id= -VITE_BOE_CASS_DETAIL_URL=/pc/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= -VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= -VITE_BOE_EXAM_DETAIL_URL=/pc/exam/test?id= +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_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid= +VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= -VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file +VITE_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/.env.release b/.env.release index ba04b14..6ab43ac 100644 --- a/.env.release +++ b/.env.release @@ -1,10 +1,12 @@ VITE_BASE=/fe-student-release VITE_BASE_API=/manageApi-release -VITE_BASE_LOGIN_URL=/web/ +VITE_BASE_LOGIN_URL=https://u.boe.com/web/ -VITE_BOE_ONLINE_CLASS_URL=/pc-release/course/studyindex?id= -VITE_BOE_CASS_DETAIL_URL=/pc-release/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=/web/quizsummary?detailId= -VITE_BOE_TEST_OUT_DETAIL_URL=/api/b1/tale/do-quiz?quizKid= -VITE_BOE_EXAM_DETAIL_URL=/pc-release/exam/test?id= -VITE_BOE_PATH_DETAIL_URL=/pc-release/forward?to=/fe-student-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_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid= +VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id= +VITE_BOE_PATH_DETAIL_URL=https://u.boe.com/pc-release/forward?to=/fe-student-release + +VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file From b84518b553dbd29358a12add30030cac50543a26 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 28 Dec 2022 17:38:14 +0800 Subject: [PATCH 8/9] =?UTF-8?q?style:=E5=BD=93=E9=9D=A2=E6=8E=88=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E6=97=A0=E8=AF=84=E4=BC=B0=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E8=AF=84=E4=BC=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 8 ++++---- src/views/liveBroadcast/LiveBroadcast.vue | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index f34609e..9f9fe15 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -40,12 +40,12 @@ background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999', }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} - + + {{ data.isSurvery ? "已评估" : "评估" }} +}" class="btn" @click="toSurvery">{{ data.isSurvery ? "已评估" : "评估" }}
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index b04352c..566984c 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -55,9 +55,9 @@ background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} - +
-
- {{ value.currentRatio }}% + {{ parseInt(value.currentRatio) }}%
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 40c8507..6b99c12 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -62,7 +62,7 @@
当前进度
-
- {{ value.currentRatio }}% + {{ parseInt(value.currentRatio) }}%