diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 8af1e4ed..32fcc26b 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -410,22 +410,22 @@ export default { debugger console.log("计算签到时间", props.datasource); let beginTime = new Date(props.datasource.startTime).getTime(); - let endTime = !props.datasource.info.afterSignIn + let endTime = !props.datasource.afterStart ? new Date(props.datasource.endTime).getTime() : new Date(props.datasource.startTime).getTime(); - if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { + if (props.datasource.beforeStart && props.datasource.afterStart) { //有开始前有开始后 - beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; - endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; + beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; + endTime = endTime + props.datasource.afterStart * 60 * 1000; console.log("1111", beginTime, endTime); - } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) { + } else if (props.datasource.beforeStart && !props.datasource.afterStart) { //只有开始前无开始后 - beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; + beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; console.log("11112222", beginTime); - } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { + } else if (!props.datasource.beforeStart && props.datasource.afterStart) { //无开始前有开始后 - endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; + endTime = endTime + props.datasource.afterStart * 60 * 1000; console.log("1111333", endTime); } @@ -585,7 +585,7 @@ export default { courseId: Number(props.datasource.courseId), routerId: Number(props.datasource.routerId), ids: state.selectedStudents, - taskId: Number(props.datasource.routerTaskId), + taskId: Number(props.datasource.id), taskType: Number(props.datasource.type), type: 1, }; @@ -739,6 +739,7 @@ export default {