From c1186676ad318523364efbe1436c0d793f511547 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 11:11:02 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 = () => {