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 1/2] =?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 2/2] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=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 @@
+