From 71894c41428770b0271310277423d01a685529d9 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 11:42:25 +0800 Subject: [PATCH 01/14] -- bug --- .env.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.release b/.env.release index 3c2c6b2..3d66c06 100644 --- a/.env.release +++ b/.env.release @@ -7,6 +7,6 @@ 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=http://u.boe.com/pc/forward?to=/fe-student-release +VITE_BOE_PATH_DETAIL_URL=http://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 0d1c39460cbcb9330f7cf2e629c3130b3aab50b3 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 12:12:38 +0800 Subject: [PATCH 02/14] =?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 919a6724a08779e7341e440e1da987e2e218e91f Mon Sep 17 00:00:00 2001 From: wuyx Date: Mon, 26 Dec 2022 12:01:36 +0800 Subject: [PATCH 03/14] =?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 8318992..451f3ba 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -25,8 +25,8 @@
{{ 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') +}}
@@ -35,17 +35,17 @@
- - {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} 评估 {{ 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 ? "已评估" : "评估" }}
@@ -79,10 +79,10 @@ :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
+ width: '22px', + height: '26px', + marginLeft: '10px', +}">
{{ el.slice(el.indexOf('-') + 1) }}
@@ -111,10 +111,10 @@
- +
+ class="submit" @click="toWork"> 交作业
@@ -137,8 +137,8 @@
考试
- -
去考试 @@ -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 ef926b6..eae6107 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -47,21 +47,23 @@
观看 + background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`, +}" @click="showClick">观看 - - {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} - + 评估 {{ 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 ? "已评估" : + "评估" +}}
@@ -138,7 +140,7 @@ From 6d398c288d677cee720c92bf1dfa1a3e57d2c1d3 Mon Sep 17 00:00:00 2001 From: wuyx Date: Mon, 26 Dec 2022 13:08:40 +0800 Subject: [PATCH 06/14] =?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 7fe10b987bea99b07064cf0475a8643e611b7e36 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 13:12:37 +0800 Subject: [PATCH 07/14] =?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 8d5e31a0ee7d35996318e27070b04c12a0b047a2 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 15:23:29 +0800 Subject: [PATCH 08/14] -- 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}}    至    {{data?.submitEndTime}}
-
改任务已结束
+
该任务已结束
距离结束还有  {{parseInt(dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60)}}   小时   {{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}  分钟
From 4cd151cb813be5da49d5c692f8dd0b42fba388f2 Mon Sep 17 00:00:00 2001 From: wuyx Date: Mon, 26 Dec 2022 16:20:41 +0800 Subject: [PATCH 09/14] =?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 --> From f25ca07a518ec620d92bf25014d4b8b3cbdde384 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 17:42:02 +0800 Subject: [PATCH 10/14] -- bug --- .env | 2 +- .env.release | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index b9c6a97..eb42ec7 100644 --- a/.env +++ b/.env @@ -9,7 +9,7 @@ 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=http://u-pre.boe.com/pc/forward?to=/fe-student +VITE_BOE_PATH_DETAIL_URL=https://u-pre.boe.com/pc/forward?to=/fe-student VITE_BOE_API_URL=https://u-pre.boe.com diff --git a/.env.release b/.env.release index 3d66c06..6ab43ac 100644 --- a/.env.release +++ b/.env.release @@ -7,6 +7,6 @@ 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=http://u.boe.com/pc-release/forward?to=/fe-student-release +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 11a45956b3eb2f0cfd30669e6e80793494d64f90 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 19:28:44 +0800 Subject: [PATCH 11/14] =?UTF-8?q?--=20=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?= 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 +- src/views/roadmap/PathDetails.vue | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 6d5f017..96cc4a4 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,'_self') + import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL,'_top') } // 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 d470f54..7adc428 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¶ms=${encodeURIComponent( `routerId=${props.detail.routerId}&routerName=${props.detail.routerName}` )}` - ,'_self'); + ,'_top'); } function close() { diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 485882c..8a81426 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -367,7 +367,7 @@ function toExamItem(obj) { } } console.log("obj", obj.examinationTestId); - window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId,'_self'); //测评 + window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId,'_top'); //测评 // 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 9d4d382..b04352c 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -284,7 +284,7 @@ function showClick() { return; } } - window.open(data.value.liveLink,'_self'); + window.open(data.value.liveLink,'_top'); } onUnmounted(() => { if (timer) { diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index dfd321e..901ec08 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -343,7 +343,7 @@ const types = ref({ 6: "/livebroadcast", 7: ({ courseId }) => request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) => - window.open(linkAddress,'_self') + window.open(linkAddress,'_top') ), //外联 8: "/discusspage", 9: "/moreactive", @@ -352,7 +352,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'), //测评 + ,'_top'), //测评 11: "/surveydetail", 12: "/ballotpage", 13: "/projectdetails", @@ -449,7 +449,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,'_self'); + window.open(types.value.path[d.type] + d.targetId,'_top'); 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 8b1dd58..2fd095f 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¶ms=${encodeURIComponent( `projectId=${value.projectId}` - ,'_self')}` + ,'_top')}` ); }; diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 9b7df3a..8f9c8c5 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -343,7 +343,7 @@ const types = ref({ 6: "/livebroadcast", 7: ({ courseId }) => request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) => - window.open(linkAddress, '_self') + window.open(linkAddress, '_top') ), //外联 8: "/discusspage", 9: "/moreactive", @@ -352,7 +352,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'), //测评 + ,'_top'), //测评 11: "/surveydetail", 12: "/ballotpage", 13: "/projectdetails", @@ -444,7 +444,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,'_self'); + window.open(types.value.path[d.type] + d.targetId,'_top'); types.value.path[d.type] && types.value.path[d.type].startsWith("/") && router.push({ From a50c337153ec1b773e0aac482f56db90b99c5afc Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 26 Dec 2022 20:32:24 +0800 Subject: [PATCH 12/14] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 901ec08..71ce571 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -13,7 +13,8 @@
-
+
+ {{ loading.close() }}
{{ i.stageName }}
@@ -102,6 +103,9 @@
+