diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 3e295b72..b4938982 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -407,24 +407,25 @@ export default { // 计算签到时间 const isSignClick = () => { + debugger console.log("计算签到时间", props.datasource); - let beginTime = new Date(props.datasource.startTime).getTime(); - let endTime = !props.datasource.afterStart - ? new Date(props.datasource.endTime).getTime() - : new Date(props.datasource.startTime).getTime(); + let beginTime = new Date(props.datasource.info.activityStartTime).getTime(); + let endTime = !props.datasource.info.afterSignIn + ? new Date(props.datasource.info.endTime).getTime() + : new Date(props.datasource.info.startTime).getTime(); - if (props.datasource.beforeStart && props.datasource.afterStart) { + if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { //有开始前有开始后 - beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; - endTime = endTime + props.datasource.afterStart * 60 * 1000; + beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; + endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; console.log("1111", beginTime, endTime); - } else if (props.datasource.beforeStart && !props.datasource.afterStart) { + } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) { //只有开始前无开始后 - beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; + beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; console.log("11112222", beginTime); - } else if (!props.datasource.beforeStart && props.datasource.afterStart) { + } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { //无开始前有开始后 - endTime = endTime + props.datasource.afterStart * 60 * 1000; + endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; console.log("1111333", endTime); }