diff --git a/.env b/.env index c9eb2d7b..37fbf395 100644 --- a/.env +++ b/.env @@ -27,10 +27,10 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx #在线 -VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id= +VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= #案例 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= #考试 -VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/pc/exam/test?id= +VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= #h5的基本url VUE_APP_H5=//u-pre.boe.com/student-h5 diff --git a/.env.boe b/.env.boe index 2f955f9d..cce03937 100644 --- a/.env.boe +++ b/.env.boe @@ -11,6 +11,6 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=coursefile/导入学员模版-1677140876274.xls # 外部考试导入成绩模板 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入模板-1677055614438.xlsx #在线 -VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id= +VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= -VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/pc/exam/test?id= \ No newline at end of file +VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= \ No newline at end of file diff --git a/.env.prod b/.env.prod index 7eace03b..e9f4da8e 100644 --- a/.env.prod +++ b/.env.prod @@ -17,6 +17,6 @@ VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx # 外部考试导入成绩模板 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx -VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc/course/studyindex?id= +VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id= VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc/case/detail?id= -VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc/exam/test?id= \ No newline at end of file +VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id= \ No newline at end of file diff --git a/.env.release b/.env.release index d2f6bc4c..1b640881 100644 --- a/.env.release +++ b/.env.release @@ -16,6 +16,6 @@ VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id= VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx # 外部考试导入成绩模板 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx -VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc-release/course/studyindex?id= +VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id= VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id= -VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc-release/exam/test?id= \ No newline at end of file +VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id= \ No newline at end of file diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index ce23da6c..670315b3 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2595,13 +2595,10 @@ export default { if (item.type == 1) { if (item.taskStatus == 1 || item.taskStatus == 2) return message.error("该任务无法学习,请联系管理员进行替换。"); - window.open( + codeUrl = window.location.protocol + - import.meta.env.VUE_APP_BOE_API_URL + - "/mobile/pages/study/courseStudy?id=" + - item.targetId, - "_top" - ); + process.env.VUE_APP_ONLINE_CLASS_URL + + item.targetId; } if (item.type == 2) { let date1 = new Date(item.endTime).getTime(); @@ -2629,7 +2626,7 @@ export default { "/homeworkpage?courseId=" + item.courseId + "&type=2&id=" + - item.routerTaskId; + item.id; } // 考试 停用 if (item.type == 5) { @@ -2642,6 +2639,11 @@ export default { process.env.VUE_APP_H5 + "/externalexam?courseId=" + item.courseId; + } else { + codeUrl = + window.location.protocol + + process.env.VUE_APP_EXAM_DETAIL_URL + + item.targetId; } } // 直播结束时间 @@ -2652,10 +2654,10 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/livebroadcast?courseId=" + + "/liveboradcast?courseId=" + item.courseId + "&type=2&id=" + - item.routerTaskId; + item.id; } // 外链 if (item.type == 7) { @@ -2665,7 +2667,7 @@ export default { "/outerchain?courseId=" + item.courseId + "&type=2&id=" + - item.routerTaskId + + item.id + "&chapterOrStageId=" + item.chapterId + "&infoId=" + @@ -2679,7 +2681,7 @@ export default { "/discusspage?courseId=" + item.courseId + "&type=2&id=" + - item.routerTaskId; + item.id; } //活动 if (item.type == 9) { @@ -2692,7 +2694,7 @@ export default { "/activitiespage?courseId=" + item.courseId + "&type=2&id=" + - item.routerTaskId; + item.id; } //活动 if (item.type == 10) { @@ -2711,13 +2713,14 @@ export default { if (item.type == 11) { if (item.taskStatus == 1 || item.taskStatus == 2) return message.error("该任务无法学习,请联系管理员进行替换。"); + console.log("item", item); codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/investigatage?courseId=" + item.courseId + "&type=2&id=" + - item.routerTaskId + + item.id + "&chapterOrStageId=" + item.chapterId + "&infoId=" + @@ -2731,7 +2734,7 @@ export default { "/ballotpage?courseId=" + item.courseId + "&btype=2&id=" + - item.routerTaskId + + item.id + "&chapterOrStageId=" + item.chapterId + "&infoId=" + diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 00bff3ab..256d1ece 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4498,13 +4498,10 @@ export default { if (item.type == 1) { if (item.taskStatus == 1 || item.taskStatus == 2) return message.error("该任务无法学习,请联系管理员进行替换。"); - window.open( + codeUrl = window.location.protocol + - import.meta.env.VUE_APP_BOE_API_URL + - "/mobile/pages/study/courseStudy?id=" + - item.targetId, - "_top" - ); + process.env.VUE_APP_ONLINE_CLASS_URL + + item.targetId; } if (item.type == 2) { let date1 = new Date(item.endTime).getTime(); @@ -4518,7 +4515,7 @@ export default { "/faceteach?type=2&courseId=" + item.courseId + "&id=" + - item.projectTaskId; + item.id; } if (item.type == 3) return message.error("请在pc端完成"); if (item.type == 4) { @@ -4531,7 +4528,7 @@ export default { "/homeworkpage?courseId=" + item.courseId + "&type=1&id=" + - item.projectTaskId; + item.id; } // 考试 停用 if (item.type == 5) { @@ -4544,6 +4541,11 @@ export default { process.env.VUE_APP_H5 + "/externalexam?courseId=" + item.courseId; + } else { + codeUrl = + window.location.protocol + + process.env.VUE_APP_EXAM_DETAIL_URL + + item.targetId; } } // 直播结束时间 @@ -4554,10 +4556,10 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_H5 + - "/livebroadcast?courseId=" + + "/liveboradcast?courseId=" + item.courseId + "&type=1&id=" + - item.projectTaskId; + item.id; } // 外链 if (item.type == 7) { @@ -4567,7 +4569,7 @@ export default { "/outerchain?courseId=" + item.courseId + "&type=1&id=" + - item.projectTaskId + + item.id + "&chapterOrStageId=" + item.stageId + "&infoId=" + @@ -4581,20 +4583,21 @@ export default { "/discusspage?courseId=" + item.courseId + "&type=1&id=" + - item.projectTaskId; + item.id; } //活动 if (item.type == 9) { let date1 = new Date(item.endTime).getTime(); let date2 = new Date().getTime(); if (date1 < date2) return message.warning("当前活动已结束"); + codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/activitiespage?courseId=" + item.courseId + "&type=1&id=" + - item.projectTaskId; + item.id; } //活动 if (item.type == 10) { @@ -4613,13 +4616,14 @@ export default { if (item.type == 11) { if (item.taskStatus == 1 || item.taskStatus == 2) return message.error("该任务无法学习,请联系管理员进行替换。"); + codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/investigatage?courseId=" + item.courseId + "&type=1&id=" + - item.projectTaskId + + item.id + "&chapterOrStageId=" + item.stageId + "&infoId=" + @@ -4633,7 +4637,7 @@ export default { "/ballotpage?courseId=" + item.courseId + "&btype=2&id=" + - item.projectTaskId + + item.id + "&chapterOrStageId=" + item.chapterId + "&infoId=" +