hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-24 10:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-02-28 20:04:06 +08:00
parent c4f12a5b3a 87028ab690
commit 79fccebaab
6 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@@ -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

4
.env.boe
View File

@@ -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=
VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=

4
.env.prod
View File

@@ -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=
VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=

4
.env.release
View File

@@ -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=
VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=

31
src/views/learningpath/LevelAdd.vue
View File

@@ -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=" +

34
src/views/projectcenter/TaskPage.vue
View File

@@ -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=" +