From e2b92a556833039b6f0382e1faf05da50fa5c0a0 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Mon, 26 Dec 2022 23:39:01 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homework/HomeworkPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 6570073..0eb7c51 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -179,7 +179,7 @@ {{data?.submitStartTime}}    至    {{data?.submitEndTime}}
-
改任务已结束
+
该任务已结束
距离结束还有  {{parseInt(dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60)}}   小时   {{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}  分钟
From ff30e59467cdfade32fbfd42d9f837610c9048a1 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 27 Dec 2022 08:52:11 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 34 ++++++++++++---------------- src/views/project/ProjectDetails.vue | 16 ++++++++++--- src/views/project/ProjectManage.vue | 2 +- src/views/roadmap/PathDetails.vue | 16 ++++++++++--- 4 files changed, 42 insertions(+), 26 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 8a81426..18cd10a 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -78,11 +78,7 @@
- +
{{ el.slice(el.indexOf('-') + 1) }}
@@ -123,7 +119,7 @@ 此课程无作业
- +
@@ -229,29 +225,29 @@ let timer = null; //判断能否签到 function isSignClick() { timer = setInterval(() => { - let beginTime = new Date(data.value.planDto.beginTime).getTime(); - let endTime = !data.value.planDto.afterStart - ? new Date(data.value.planDto.endTime).getTime() - : new Date(data.value.planDto.beginTime).getTime(); + let beginTime = new Date(data.value.planDto?.beginTime).getTime(); + let endTime = !data.value.planDto?.afterStart + ? new Date(data.value.planDto?.endTime).getTime() + : new Date(data.value.planDto?.beginTime).getTime(); let nowTime = new Date().getTime(); - if (data.value.planDto.beforeStart && data.value.planDto.afterStart) { + if (data.value.planDto?.beforeStart && data.value.planDto?.afterStart) { //有开始前有开始后 - beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000; - endTime = endTime + data.value.planDto.afterStart * 60 * 1000; + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; console.log("1111"); } else if ( - data.value.planDto.beforeStart && - !data.value.planDto.afterStart + data.value.planDto?.beforeStart && + !data.value.planDto?.afterStart ) { //只有开始前无开始后 - beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000; + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; console.log("11112222"); } else if ( - !data.value.planDto.beforeStart && - data.value.planDto.afterStart + !data.value.planDto?.beforeStart && + data.value.planDto?.afterStart ) { //无开始前有开始后 - endTime = endTime + data.value.planDto.afterStart * 60 * 1000; + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; console.log("1111333"); } if (nowTime < endTime && nowTime > beginTime) { diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 640acbc..dead039 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -377,6 +377,16 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行 function toFinish(d, sName, chapterOrStageId) { console.log("dddddd", d, sName, chapterOrStageId); + if (d.type == 2) { + let date1 = new Date(d.endTime).getTime(); + let date2 = new Date().getTime(); + if (date1 < date2) { + dialogVisibleTip.value = '当前面授课已结束'; + dialogVisible.value = true; + + //return + } + } // 作业过期判断 if (d.type == 4) { let date1 = new Date(d.endTime).getTime(); @@ -385,7 +395,7 @@ function toFinish(d, sName, chapterOrStageId) { dialogVisibleTip.value = '当前作业已结束'; dialogVisible.value = true; - return + //return } } // 直播结束时间 @@ -395,7 +405,7 @@ function toFinish(d, sName, chapterOrStageId) { if (date1 < date2) { dialogVisibleTip.value = '当前直播已结束'; dialogVisible.value = true; - return + //return } } // 考试 停用 @@ -423,7 +433,7 @@ function toFinish(d, sName, chapterOrStageId) { if (date1 < date2) { dialogVisibleTip.value = '当前活动已结束'; dialogVisible.value = true; - return + //return } } // 在线课 停用 -- 暂时没有在线课停用标记 diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue index 2fd095f..586495c 100644 --- a/src/views/project/ProjectManage.vue +++ b/src/views/project/ProjectManage.vue @@ -31,7 +31,7 @@
- +
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 10c341b..2b2a930 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -366,6 +366,16 @@ function toFinish(d) { ElMessage.error("暂时未开放"); return; } + if (d.type == 2) { + let date1 = new Date(d.endTime).getTime(); + let date2 = new Date().getTime(); + if (date1 < date2) { + dialogVisibleTip.value = '当前面授课已结束'; + dialogVisible.value = true; + + //return + } + } if (d.type == 4) { let date1 = new Date(d.endTime).getTime(); let date2 = new Date().getTime(); @@ -373,7 +383,7 @@ function toFinish(d) { dialogVisibleTip.value = '当前作业已结束'; dialogVisible.value = true; - return + //return } } // 直播结束时间 @@ -383,7 +393,7 @@ function toFinish(d) { if (date1 < date2) { dialogVisibleTip.value = '当前直播已结束'; dialogVisible.value = true; - return + //return } } // 考试 停用 @@ -411,7 +421,7 @@ function toFinish(d) { if (date1 < date2) { dialogVisibleTip.value = '当前活动已结束'; dialogVisible.value = true; - return + //return } } // 在线课 停用 -- 暂时没有在线课停用标记 From 6b47bd0545036c30b7b8f40be6fa823c08586d74 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 27 Dec 2022 10:22:29 +0800 Subject: [PATCH 03/12] =?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 098347f..1834c38 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.7------------"); +console.log("版本1.0.8------------"); const store = useStore(); onMounted(() => { getUserInfo(); From b7b423305eaccd0a74bbf0916d970b8f44637ba9 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 27 Dec 2022 10:22:29 +0800 Subject: [PATCH 04/12] =?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 098347f..1834c38 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.7------------"); +console.log("版本1.0.8------------"); const store = useStore(); onMounted(() => { getUserInfo(); From b03c0a924bc1d13eca86a4106ebe51c084acc6c3 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 16:35:30 +0800 Subject: [PATCH 05/12] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=BD=9C=E4=B8=9A=E6=8C=89=E9=92=AE=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homework/HomeworkPage.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 0eb7c51..892c828 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -125,6 +125,12 @@
+
+
+ +
+
+
From 47bdea3c492db30097d05aa38506be7b10d63133 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 17:55:25 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 18cd10a..5700e9c 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -35,9 +35,9 @@
- + {{ data.signFlag ? "已签到" : "签到" }} From acc9609e3be0f4a6da332081d6189383245d5ade Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 18:08:17 +0800 Subject: [PATCH 07/12] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E8=AF=BE=E7=A8=8B=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index dead039..260ec2f 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -116,7 +116,7 @@
- +
{{ data.notice || "暂无公告" }}
From 7a67d9f429a802d8a226193c56a26d4fd8e676d7 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 18:13:58 +0800 Subject: [PATCH 08/12] =?UTF-8?q?style:=E8=B7=AF=E5=BE=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E8=AF=BE=E7=A8=8B=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=B7=AF=E5=BE=84=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/PathDetails.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 2b2a930..40c8507 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -116,9 +116,9 @@
- +
- {{ data.remark || "暂无公告" }} + {{ data.remark || "暂无说明" }}