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 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..18cd10a 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -78,11 +78,7 @@
- +
{{ el.slice(el.indexOf('-') + 1) }}
@@ -123,7 +119,7 @@ 此课程无作业
- +
@@ -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) { @@ -367,7 +363,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..dead039 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -13,7 +13,8 @@
-
+
+ {{ loading.close() }}
{{ i.stageName }}
@@ -82,7 +83,7 @@
{{ - value.status === 100 + value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] @@ -102,6 +103,9 @@
+ @@ -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", @@ -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 } } // 在线课 停用 -- 暂时没有在线课停用标记 @@ -444,7 +454,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({