From c43243886f60d172414262568a0ca40c4233d74b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 19 Jan 2023 09:05:05 +0800 Subject: [PATCH 1/4] -- fix --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 4003506..25e067f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,7 +37,7 @@ import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; -console.log("版本2.1.5------------"); +console.log("版本2.1.6------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => { From acb223fda1261c699f64edba1cb37a35e83ac9c8 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 11:13:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E7=9B=B4=E6=92=AD=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/liveBroadcast/LiveBroadcast.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index ce780b6..2a005f3 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -85,7 +85,7 @@ {{ data.signFlag ? "已签到" : "签到" }} @@ -213,7 +213,8 @@ const state = reactive({ isAllowSign: false, }); -const { activeName, teacher } = toRefs(state); +const { activeName, teacher, isAllowSign } = toRefs(state); + const signClick = () => { if (!state.isAllowSign) { // console.log("data.signFlag", data.value.signFlag, isAllowSign); @@ -232,25 +233,26 @@ let timer = null; function isSignClick() { timer = setInterval(() => { let beginTime = new Date(data.value.liveStartTime).getTime(); - let endTime = !data.value.afterSignIn + let endTime = !data.value.afterSignIn || data.value.afterSignIn == '0' ? new Date(data.value.liveEndTime).getTime() : new Date(data.value.liveStartTime).getTime(); let nowTime = new Date().getTime(); - if (data.value.beforeSignIn && data.value.afterSignIn) { + console.log('12121212', beginTime, endTime) + if(data.value.beforeSignIn && data.value.afterSignIn && data.value.beforeSignIn !=='0' && data.value.afterSignIn!=='0') { //有开始前有开始后 beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; endTime = endTime + data.value.afterSignIn * 60 * 1000; - console.log("1111"); + console.log("1111", beginTime, endTime); } else if ( data.value.beforeSignIn && - !data.value.afterSignIn + !data.value.afterSignIn && data.value.beforeSignIn !== '0' && data.value.afterSignIn == '0' ) { //只有开始前无开始后 beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; console.log("11112222"); } else if ( !data.value.beforeSignIn && - data.value.afterSignIn + data.value.afterSignIn && data.value.beforeSignIn == '0' && data.value.afterSignIn !== '0' ) { //无开始前有开始后 endTime = endTime + data.value.afterSignIn * 60 * 1000; From 2cb595f2518d574899deddfd49507bd16d618eb7 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 11:24:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E7=9B=B4=E6=92=AD=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E7=8A=B6=E6=80=81=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/moreActive/MoreActive.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 88890f2..cfcb356 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -229,25 +229,25 @@ let timer = null; function isSignClick() { timer = setInterval(() => { let beginTime = new Date(data.value.planDto?.beginTime).getTime(); - let endTime = !data.value.planDto?.afterStart + let endTime = !data.value.planDto?.afterStart || data.value.afterStart == '0' ? 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 && data.value.beforeStart !=='0' && data.value.afterStart!=='0') { //有开始前有开始后 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?.afterStart && data.value.beforeStart !== '0' && data.value.afterStart == '0' ) { //只有开始前无开始后 beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; console.log("11112222"); } else if ( !data.value.planDto?.beforeStart && - data.value.planDto?.afterStart + data.value.planDto?.afterStart && data.value.beforeStart == '0' && data.value.afterStart !== '0' ) { //无开始前有开始后 endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 6ba6f81..91fde0d 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -196,25 +196,25 @@ let timer = null; function isSignClick() { timer = setInterval(() => { let beginTime = new Date(data.value.activityStartTime).getTime(); - let endTime = !data.value.afterSignIn + let endTime = !data.value.afterSignIn || data.value.afterSignIn == '0' ? new Date(data.value.activityEndTime).getTime() : new Date(data.value.activityStartTime).getTime(); let nowTime = new Date().getTime(); - if (data.value.beforeSignIn && data.value.afterSignIn) { + if (data.value.beforeSignIn && data.value.afterSignIn && data.value.beforeSignIn !=='0' && data.value.afterSignIn!=='0') { //有开始前有开始后 beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; endTime = endTime + data.value.afterSignIn * 60 * 1000; console.log("1111"); } else if ( data.value.beforeSignIn && - !data.value.afterSignIn + !data.value.afterSignIn && data.value.beforeSignIn !== '0' && data.value.afterSignIn == '0' ) { //只有开始前无开始后 beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; console.log("11112222"); } else if ( !data.value.beforeSignIn && - data.value.afterSignIn + data.value.afterSignIn && data.value.beforeSignIn == '0' && data.value.afterSignIn !== '0' ) { //无开始前有开始后 endTime = endTime + data.value.afterSignIn * 60 * 1000; From ea48f12cce7cab544add61455dc7eaff011f2e58 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 20 Jan 2023 01:16:09 +0800 Subject: [PATCH 4/4] -- fix --- src/views/faceteach/FaceTeach.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 88890f2..5e43c2e 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -323,7 +323,7 @@ function toSurvery() { infoId: data.value.planDto.offcoursePlanId, chapterOrStageId: 0, sName: data.value.planDto.name, - type + type:3 }, }); }