From 16b18f5c98346df7419881cc8fee817215ec1f20 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 29 Dec 2022 19:07:05 +0800 Subject: [PATCH 1/5] =?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 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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();