hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-10 19:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
# Conflicts:
#	src/App.vue
This commit is contained in:
yuping
2023-01-20 04:49:00 +08:00
parent f9e4881450 b3b5dbcd98
commit 97c539361d
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -37,7 +37,7 @@ import { onMounted } from "vue";
import {useRoute} from "vue-router/dist/vue-router"; import {useRoute} from "vue-router/dist/vue-router";
import {USER_INFO} from "@/api/api"; import {USER_INFO} from "@/api/api";
console.log("版本1.2.0------------"); console.log("版本2.1.6------------");
const store = useStore(); const store = useStore();
const {path} = useRoute(); const {path} = useRoute();
onMounted(() => { onMounted(() => {

10
src/views/faceteach/FaceTeach.vue
View File

@@ -229,25 +229,25 @@ let timer = null;
function isSignClick() { function isSignClick() {
timer = setInterval(() => { timer = setInterval(() => {
let beginTime = new Date(data.value.planDto?.beginTime).getTime(); 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?.endTime).getTime()
: new Date(data.value.planDto?.beginTime).getTime(); : new Date(data.value.planDto?.beginTime).getTime();
let nowTime = new Date().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; beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
console.log("1111"); console.log("1111");
} else if ( } else if (
data.value.planDto?.beforeStart && 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; beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000;
console.log("11112222"); console.log("11112222");
} else if ( } else if (
!data.value.planDto?.beforeStart && !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; endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
@@ -323,7 +323,7 @@ function toSurvery() {
infoId: data.value.planDto.offcoursePlanId, infoId: data.value.planDto.offcoursePlanId,
chapterOrStageId: 0, chapterOrStageId: 0,
sName: data.value.planDto.name, sName: data.value.planDto.name,
type type:3
}, },
}); });
} }

16
src/views/liveBroadcast/LiveBroadcast.vue
View File

@@ -85,7 +85,7 @@
<botton <botton
class="btn" class="btn"
:style="{background: `${isAllowSign ? 'rgb(57, 146, 249)' : '#999' }`,}" :style="{background: `${isAllowSign ? 'rgb(59, 191, 252)' : '#999' }`,}"
@click="signClick"> @click="signClick">
{{ data.signFlag ? "已签到" : "签到" }} {{ data.signFlag ? "已签到" : "签到" }}
</botton> </botton>
@@ -213,7 +213,8 @@ const state = reactive({
isAllowSign: false, isAllowSign: false,
}); });
const { activeName, teacher } = toRefs(state); const { activeName, teacher, isAllowSign } = toRefs(state);
const signClick = () => { const signClick = () => {
if (!state.isAllowSign) { if (!state.isAllowSign) {
// console.log("data.signFlag", data.value.signFlag, isAllowSign); // console.log("data.signFlag", data.value.signFlag, isAllowSign);
@@ -232,25 +233,26 @@ let timer = null;
function isSignClick() { function isSignClick() {
timer = setInterval(() => { timer = setInterval(() => {
let beginTime = new Date(data.value.liveStartTime).getTime(); 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.liveEndTime).getTime()
: new Date(data.value.liveStartTime).getTime(); : new Date(data.value.liveStartTime).getTime();
let nowTime = new Date().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; beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
endTime = endTime + data.value.afterSignIn * 60 * 1000; endTime = endTime + data.value.afterSignIn * 60 * 1000;
console.log("1111"); console.log("1111", beginTime, endTime);
} else if ( } else if (
data.value.beforeSignIn && data.value.beforeSignIn &&
!data.value.afterSignIn !data.value.afterSignIn && data.value.beforeSignIn !== '0' && data.value.afterSignIn == '0'
) { ) {
//只有开始前无开始后 //只有开始前无开始后
beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
console.log("11112222"); console.log("11112222");
} else if ( } else if (
!data.value.beforeSignIn && !data.value.beforeSignIn &&
data.value.afterSignIn data.value.afterSignIn && data.value.beforeSignIn == '0' && data.value.afterSignIn !== '0'
) { ) {
//无开始前有开始后 //无开始前有开始后
endTime = endTime + data.value.afterSignIn * 60 * 1000; endTime = endTime + data.value.afterSignIn * 60 * 1000;

8
src/views/moreActive/MoreActive.vue
View File

@@ -196,25 +196,25 @@ let timer = null;
function isSignClick() { function isSignClick() {
timer = setInterval(() => { timer = setInterval(() => {
let beginTime = new Date(data.value.activityStartTime).getTime(); 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.activityEndTime).getTime()
: new Date(data.value.activityStartTime).getTime(); : new Date(data.value.activityStartTime).getTime();
let nowTime = new Date().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; beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
endTime = endTime + data.value.afterSignIn * 60 * 1000; endTime = endTime + data.value.afterSignIn * 60 * 1000;
console.log("1111"); console.log("1111");
} else if ( } else if (
data.value.beforeSignIn && data.value.beforeSignIn &&
!data.value.afterSignIn !data.value.afterSignIn && data.value.beforeSignIn !== '0' && data.value.afterSignIn == '0'
) { ) {
//只有开始前无开始后 //只有开始前无开始后
beginTime = beginTime - data.value.beforeSignIn * 60 * 1000; beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
console.log("11112222"); console.log("11112222");
} else if ( } else if (
!data.value.beforeSignIn && !data.value.beforeSignIn &&
data.value.afterSignIn data.value.afterSignIn && data.value.beforeSignIn == '0' && data.value.afterSignIn !== '0'
) { ) {
//无开始前有开始后 //无开始前有开始后
endTime = endTime + data.value.afterSignIn * 60 * 1000; endTime = endTime + data.value.afterSignIn * 60 * 1000;