From c1186676ad318523364efbe1436c0d793f511547 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 11:11:02 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=E8=AF=BE=E7=A8=8B=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 9f9fe15..91f4884 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -24,8 +24,8 @@
- {{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " + - dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM') + {{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:mm') + " 至 " + + dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:mm') }}
From 4c8101d6ad560f40296de088e7070211f04551d1 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 14:49:38 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix:=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moreActive/MoreActive.vue | 47 ++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index d54e89d..1ba9b57 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -45,7 +45,9 @@
{{ data?.activityAddress }}
- {{ data.signFlag ? "已签到" : "签到" }} + {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} @@ -141,7 +143,7 @@ import { request, useRequest } from "@/api/request"; import { useRouter } from "vue-router"; import { useRoute } from "vue-router/dist/vue-router"; import { ElMessage } from "element-plus"; -import { reactive, onUnmounted } from "vue"; +import { reactive, onUnmounted, toRefs} from "vue"; const router = useRouter(); const returnclick = () => { router.back(); @@ -153,11 +155,22 @@ const state = reactive({ isAllowSign: false, }); + +const { isAllowSign } = toRefs(state); + const { data } = useRequest(ACTIVITY, { activityId }); +console.log('data', data) const signClick = (tab, event) => { if (data.value.signFlag) { return; } + + if (!state.isAllowSign) { + // console.log("data.signFlag", data.value.signFlag, isAllowSign); + ElMessage.warning("未在允许签到时间范围内"); + return; + } + data.value.signFlag = true; ElMessage.warning("签到成功"); request(TASK_ACTIVITY_SIGN, { @@ -170,31 +183,35 @@ let timer = null; //判断能否签到 function isSignClick() { timer = setInterval(() => { - let beginTime = new Date(data.activityStartTime).getTime(); - let endTime = !data.afterSignIn - ? new Date(data.activityEndTime).getTime() - : new Date(data.activityStartTime).getTime(); + let beginTime = new Date(data.value.activityStartTime).getTime(); + let endTime = !data.value.afterSignIn + ? new Date(data.value.activityEndTime).getTime() + : new Date(data.value.activityStartTime).getTime(); let nowTime = new Date().getTime(); - if (data.beforeSignIn && data.afterSignIn) { + if (data.value.beforeSignIn && data.value.afterSignIn) { //有开始前有开始后 - beginTime = beginTime - data.beforeSignIn * 60 * 1000; - endTime = endTime + data.afterSignIn * 60 * 1000; + beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; + endTime = endTime + data.value.afterSignIn * 60 * 1000; console.log("1111"); } else if ( - data.beforeSignIn && - !data.afterSignIn + data.value.beforeSignIn && + !data.value.afterSignIn ) { //只有开始前无开始后 - beginTime = beginTime - data.beforeSignIn * 60 * 1000; + beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; console.log("11112222"); } else if ( - !data.beforeSignIn && - data.afterSignIn + !data.value.beforeSignIn && + data.value.afterSignIn ) { //无开始前有开始后 - endTime = endTime + data.afterSignIn * 60 * 1000; + endTime = endTime + data.value.afterSignIn * 60 * 1000; console.log("1111333"); } + + console.log(nowTime, beginTime, endTime, data.value) + console.log(nowTime < endTime , nowTime > beginTime) + console.log(state.isAllowSign) if (nowTime < endTime && nowTime > beginTime) { state.isAllowSign = true; } else { From 6f3347cc1fe255c4cc9552dbc96e4d63368fe464 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 14:52:46 +0800 Subject: [PATCH 03/13] =?UTF-8?q?fix:=E6=97=A0=E9=98=B6=E6=AE=B5=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moreActive/MoreActive.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 1ba9b57..a91b3cc 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -6,7 +6,7 @@
{{ pName }}
/
{{ sName }}
-
/
+
/
活动详情
- {{ data.isSurvery ? "已评估" : "评估" }} - +
+
+ + {{ data.signFlag ? "已签到" : "签到" }} + + + {{ data.isSurvery ? "已评估" : "评估" }} + +
+
+
+
+ + {{ data.signFlag ? "已签到" : "签到" }} + + + {{ data.isSurvery ? "已评估" : "评估" }} + +
@@ -81,16 +99,18 @@
{{ el.slice(el.indexOf('-') + 1) }}
-
- -
- 下载 +
+
+ +
+ 下载 +
-
-
- -
- 下载 +
+ +
+ 下载 +
@@ -109,6 +129,7 @@
交作业 @@ -135,6 +156,7 @@
去考试 @@ -190,11 +212,12 @@ const returnclick = () => { router.back(); }; const { - query: { courseId, type, id: taskId }, + query: { courseId, type, id: taskId, projectStatus, projectEndTime }, } = useRoute(); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }); console.log("datadatadatadatadatadatadata", data); +console.log("项目状态字段传递", projectStatus, projectEndTime); const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId) ); diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 6c6e7b1..2a94f2d 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -48,12 +48,27 @@
-
- - - +
+
+
+ + + +
+
+
+
+
+
+ + + +
+
- - -
-
- +
+
+
+
+ +
+
+ +
+
+ +
+
-
-
- +
+
+
+ +
+
+ +
+
+ +
+
- -
@@ -261,7 +293,7 @@ const returnclick = () => { router.back(); }; const { - query: { courseId: workId, type, id: taskId, pName, sName }, + query: { courseId: workId, type, id: taskId, pName, sName, projectStatus, projectEndTime}, } = useRoute(); const { data } = taskId && taskId !== 'undefined' ? useRequest(TASK_WORK_DETAIL, { workId, taskId }) : useRequest(TASK_WORK_DETAIL, { workId }); diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 566984c..e571820 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -45,26 +45,59 @@
{{ data?.activityAddress }}
-->
-
- 观看 - +
+
+ 观看 + - {{ data.signFlag ? "已签到" : "签到" }} - - + {{ data.signFlag ? "已签到" : "签到" }} + + - {{ data.isSurvery ? "已评估" : - "评估" -}} - + {{ data.isSurvery ? "已评估" : + "评估" + }} + +
+
+ {{ data.isSurvery ? "已评估" : + "评估" + }} + +
+
+
+
+ 观看 + + + {{ data.signFlag ? "已签到" : "签到" }} + + + + {{ data.isSurvery ? "已评估" : + "评估" + }} + +
@@ -151,7 +184,7 @@ import { ElMessage } from "element-plus"; import dayjs from "dayjs"; const { - query: { courseId: liveId, id: taskId, type, pName, sName }, + query: { courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime }, } = useRoute(); const router = useRouter(); const returnclick = () => { diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index a91b3cc..0595cdb 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -45,10 +45,22 @@
{{ data?.activityAddress }}
- {{ data.signFlag ? "已签到" : "签到" }} - - {{ data.signFlag ? "已签到" : "签到" }} - +
+
+ {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} + +
+
+
+
+ {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} + +
+
@@ -149,7 +161,7 @@ const returnclick = () => { router.back(); }; const { - query: { courseId: activityId, id: taskId, type, pName, sName }, + query: { courseId: activityId, id: taskId, type, pName, sName, projectStatus, projectEndTime }, } = useRoute(); const state = reactive({ diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 894208b..0e2988f 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -274,6 +274,7 @@ import { import { useRoute, useRouter } from "vue-router"; import store from "@/store"; import { ElMessage } from "element-plus"; + const { query: { courseId, projectId }, } = useRoute(); @@ -374,9 +375,39 @@ const types = ref({ const dialogVisible = ref(false); const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行替换！'); +// 判断当前任务已结束及时间意义上的结束 提示用户 +function judgeTaskIsEnd(type, endTimes, status) { + // type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 3 已结束) + console.log(type, endTimes, status); + let isEnd = false; + let nowTime = new Date().getTime(); + let endTime = new Date().getTime(endTimes); + switch (type) { + case 1: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 3: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 5: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 7: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 10: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + } + return isEnd; +} function toFinish(d, sName, chapterOrStageId) { console.log("dddddd", d, sName, chapterOrStageId); + if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){ + ElMessage.error("当前任务已结束") + return + } if (d.type == 2) { let date1 = new Date(d.endTime).getTime(); let date2 = new Date().getTime(); @@ -483,7 +514,9 @@ function toFinish(d, sName, chapterOrStageId) { courseId: d.courseId, pName: data.value.name, sName, - chapterOrStageId + chapterOrStageId, + projectStatus: data.value.status?data.value.status:0, // 项目状态 -- 用于判断当前项目是否已经结束 + projectEndTime: data.value.endTime?data.value.endTime:0 // 项目结束 -- 用于判断当前项目是否已经结束 }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index b038ec4..975fea9 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -296,9 +296,15 @@ data.assessmentMultipleChoiceDtoList?.length || data.assessmentSingleChoiceDtoList?.length || data.assessmentScoringQuestionDtoList?.length -"> -
- 提交 +">
+
+ 提交 +
+
+
+
+ 提交 +
@@ -334,7 +340,7 @@ import { ElMessage } from "element-plus"; import { ref } from "vue"; const { - query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId }, + query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId, projectStatus, projectEndTime }, } = useRoute(); const router = useRouter(); const returnclick = () => { From 9ae7fcd6c9e0a913404226d1325e13231ca86e4a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 29 Dec 2022 19:06:53 +0800 Subject: [PATCH 05/13] =?UTF-8?q?--=20=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E5=85=AC=E5=BC=80=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index e7b9b79..914854a 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -39,7 +39,7 @@
{{ data.planDto?.address }}
- {{data.isSignUp?'已报名':'立即报名'}} + {{data.isSignUp?'已报名':'立即报名'}}
From 16b18f5c98346df7419881cc8fee817215ec1f20 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 19:07:05 +0800 Subject: [PATCH 06/13] =?UTF-8?q?fix:=E5=88=A4=E6=96=AD=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 8 ++++---- src/views/homework/HomeworkPage.vue | 4 ++-- src/views/liveBroadcast/LiveBroadcast.vue | 2 +- src/views/moreActive/MoreActive.vue | 2 +- src/views/survey/SurveyDetail.vue | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 6f1aff7..f39d838 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -35,7 +35,7 @@
-
+
{{ el.slice(el.indexOf('-') + 1) }}
-
+
@@ -129,7 +129,7 @@
交作业 @@ -156,7 +156,7 @@
去考试 diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 2a94f2d..7a74bc6 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -49,7 +49,7 @@
-
+
-
+
-->
-
+
观看 diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 0595cdb..6ba6f81 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -46,7 +46,7 @@
-
+
{{ data.signFlag ? "已签到" : "签到" }} {{ data.signFlag ? "已签到" : "签到" }} diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 975fea9..4363f44 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -297,7 +297,7 @@ data.assessmentSingleChoiceDtoList?.length || data.assessmentScoringQuestionDtoList?.length ">
-
+
提交
From 9b5325dd6b7d12010d162f641b7335726fbc1ce1 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 30 Dec 2022 09:53:50 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 4 ++-- src/views/faceteach/FaceTeachSignUp.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 @@
- -
{{ el.slice(el.indexOf('-') + 1) }}
+ +
{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}
diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 914854a..08068c9 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -75,12 +75,12 @@
- -
{{ el.slice(el.indexOf('-') + 1) }}
+
{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}
From 1605258d062c805714b772f9eb6208722cb57359 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 30 Dec 2022 11:07:07 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 03580f5..4454662 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("版本1.11------------"); const store = useStore(); onMounted(() => { getUserInfo(); From 65f19cb014d13b77731003e5f6a6f1e0231ba6ec Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 30 Dec 2022 14:31:40 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8B=E6=A1=88=E4=BE=8B=E5=A4=96=E8=81=94?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 0e2988f..f1443fc 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -404,6 +404,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,14 +492,17 @@ function toFinish(d, sName, chapterOrStageId) { return; } if (d.type == 3 || d.type == 7) { - d.status || request(STUDY_RECORD, { - studentId: data.value.userInfoBo.userId, - targetId: data.value.routerId, - logo: 2, - stageOrChapterId: chapterOrStageId, - taskId: d.projectTaskId, - }); + if(d.status!==1){ + request(STUDY_RECORD, { + studentId: data.value.userInfoBo.userId, + targetId: data.value.routerId, + logo: 2, + stageOrChapterId: chapterOrStageId, + taskId: d.projectTaskId, + }); + } } + if (typeof types.value.path[d.type] === "string") { types.value.path[d.type] && types.value.path[d.type].startsWith("http") && From 4d9b51b3ceb96e3ecf4b7698ec2b44006ea95457 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 30 Dec 2022 15:37:43 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 4454662..b2fcd63 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.11------------"); +console.log("版本1.12------------"); const store = useStore(); onMounted(() => { getUserInfo(); From 76588c05a10d42a88b07fddd7be6964a35daaa42 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 30 Dec 2022 16:17:32 +0800 Subject: [PATCH 11/13] =?UTF-8?q?--=20=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 7 ++----- src/views/roadmap/PathDetails.vue | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 0e2988f..725bac7 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -354,10 +354,7 @@ 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 }) => @@ -491,7 +488,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, diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 6b99c12..48e83a4 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -341,10 +341,7 @@ 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 }) => @@ -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, From 1b008e3ef6d0efeee69b0a211c609c2e7515f76e Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 30 Dec 2022 17:01:10 +0800 Subject: [PATCH 12/13] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 6 +++--- src/views/roadmap/PathDetails.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 8f8e8c2..bc3aea6 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -359,9 +359,9 @@ const types = ref({ 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", diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 48e83a4..57cf6ab 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -346,9 +346,9 @@ const types = ref({ 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=project` ,'_top'), //测评 11: "/surveydetail", 12: "/ballotpage", From 414aa9831f85c01c19701f723dd2843690115114 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 30 Dec 2022 17:02:34 +0800 Subject: [PATCH 13/13] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/PathDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 57cf6ab..01efb7e 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -348,7 +348,7 @@ const types = ref({ window.open( evaType == 0 ? import.meta.env.VITE_BOE_TEST_DETAIL_URL+targetId - : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=project` + : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=learningpath` ,'_top'), //测评 11: "/surveydetail", 12: "/ballotpage",