diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index b0237b49..59b3d38b 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -904,7 +904,7 @@ export default { let beginTime = new Date(props.datasource.startTime).getTime(); let endTime = !props.datasource.afterStart ? new Date(props.datasource.endTime).getTime() - : new Date(props.datasource.beginTime).getTime(); + : new Date(props.datasource.startTime).getTime(); if (props.datasource.beforeStart && props.datasource.afterStart) { //有开始前有开始后 beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index bbed809e..3f5e7efd 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -870,24 +870,25 @@ export default { // 计算签到时间 const isSignClick = () => { - console.log("计算签到时间"); + 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.beginTime).getTime(); + : new Date(props.datasource.startTime).getTime(); + if (props.datasource.beforeStart && props.datasource.afterStart) { //有开始前有开始后 beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; endTime = endTime + props.datasource.afterStart * 60 * 1000; - console.log("1111"); + console.log("1111", beginTime, endTime); } else if (props.datasource.beforeStart && !props.datasource.afterStart) { //只有开始前无开始后 beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; - console.log("11112222"); + console.log("11112222", beginTime); } else if (!props.datasource.beforeStart && props.datasource.afterStart) { //无开始前有开始后 endTime = endTime + props.datasource.afterStart * 60 * 1000; - console.log("1111333"); + console.log("1111333", endTime); } state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");