diff --git a/.env.prod b/.env.prod index c67c8a4..9d81f3f 100644 --- a/.env.prod +++ b/.env.prod @@ -1,8 +1,15 @@ VITE_BASE=/fe-student VITE_BASE_API=/manageApi +VITE_BASE_LOGIN_URL=https://u.boe.com/web/ + VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc/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/exam/test?id= +VITE_BOE_PATH_DETAIL_URL=https://u.boe.com/pc/forward?to=/fe-student + +VITE_BOE_API_URL=https://u.boe.com + +VITE_TASK_WHITE_TYPE=-8-,-12-,-13- diff --git a/src/App.vue b/src/App.vue index 03580f5..55404fe 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ import { useStore } from "vuex"; import { onMounted } from "vue"; import router from "@/router"; -console.log("版本1.0.9------------"); +console.log("版本2.0.2------------"); const store = useStore(); onMounted(() => { getUserInfo(); diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index f39d838..8b39129 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -96,8 +96,8 @@
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 0e2988f..bc3aea6 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -354,17 +354,14 @@ const types = ref({
4: "/homeworkpage",
5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
6: "/livebroadcast",
- 7: ({ courseId }) =>
- request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
- window.open(linkAddress,'_top')
- ), //外联
+ 7: ({ targetId }) => window.open(targetId, '_top'),
8: "/discusspage",
9: "/moreactive",
10: ({ evaType, targetId }) =>
window.open(
- (evaType == 0
- ? import.meta.env.VITE_BOE_TEST_DETAIL_URL
- : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+ evaType == 0
+ ? import.meta.env.VITE_BOE_TEST_DETAIL_URL+ targetId
+ : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL+targetId+`&quizTaskKid=${projectId}&channelCode=project`
,'_top'), //测评
11: "/surveydetail",
12: "/ballotpage",
@@ -404,6 +401,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
function toFinish(d, sName, chapterOrStageId) {
console.log("dddddd", d, sName, chapterOrStageId);
+
if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){
ElMessage.error("当前任务已结束")
return
@@ -491,7 +489,7 @@ function toFinish(d, sName, chapterOrStageId) {
return;
}
if (d.type == 3 || d.type == 7) {
- d.status || request(STUDY_RECORD, {
+ d.status!==1 && request(STUDY_RECORD, {
studentId: data.value.userInfoBo.userId,
targetId: data.value.routerId,
logo: 2,
@@ -499,6 +497,7 @@ function toFinish(d, sName, chapterOrStageId) {
taskId: d.projectTaskId,
});
}
+
if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") &&
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 6b99c12..01efb7e 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -341,17 +341,14 @@ const types = ref({
4: "/homeworkpage",
5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
6: "/livebroadcast",
- 7: ({ courseId }) =>
- request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
- window.open(linkAddress, '_top')
- ), //外联
+ 7: ({ targetId }) => window.open(targetId, '_top'), //外联
8: "/discusspage",
9: "/moreactive",
10: ({ evaType, targetId }) =>
window.open(
- (evaType == 0
- ? import.meta.env.VITE_BOE_TEST_DETAIL_URL
- : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+ evaType == 0
+ ? import.meta.env.VITE_BOE_TEST_DETAIL_URL+targetId
+ : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=learningpath`
,'_top'), //测评
11: "/surveydetail",
12: "/ballotpage",
@@ -443,7 +440,7 @@ function toFinish(d) {
}
}
if (d.type === 3 || d.type === 7) {
- d.status || request(STUDY_RECORD, {
+ d.status!==1 && request(STUDY_RECORD, {
studentId: userInfo.value.id,
targetId: data.value.routerId,
logo: 1,