mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-15 05:46:45 +08:00
feat:修改签到结束时间显示错误问题
This commit is contained in:
@@ -904,7 +904,7 @@ export default {
|
|||||||
let beginTime = new Date(props.datasource.startTime).getTime();
|
let beginTime = new Date(props.datasource.startTime).getTime();
|
||||||
let endTime = !props.datasource.afterStart
|
let endTime = !props.datasource.afterStart
|
||||||
? new Date(props.datasource.endTime).getTime()
|
? 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) {
|
if (props.datasource.beforeStart && props.datasource.afterStart) {
|
||||||
//有开始前有开始后
|
//有开始前有开始后
|
||||||
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
|
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
|
||||||
|
|||||||
@@ -870,24 +870,25 @@ export default {
|
|||||||
|
|
||||||
// 计算签到时间
|
// 计算签到时间
|
||||||
const isSignClick = () => {
|
const isSignClick = () => {
|
||||||
console.log("计算签到时间");
|
console.log("计算签到时间", props.datasource);
|
||||||
let beginTime = new Date(props.datasource.startTime).getTime();
|
let beginTime = new Date(props.datasource.startTime).getTime();
|
||||||
let endTime = !props.datasource.afterStart
|
let endTime = !props.datasource.afterStart
|
||||||
? new Date(props.datasource.endTime).getTime()
|
? 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) {
|
if (props.datasource.beforeStart && props.datasource.afterStart) {
|
||||||
//有开始前有开始后
|
//有开始前有开始后
|
||||||
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
|
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
|
||||||
endTime = endTime + props.datasource.afterStart * 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) {
|
} else if (props.datasource.beforeStart && !props.datasource.afterStart) {
|
||||||
//只有开始前无开始后
|
//只有开始前无开始后
|
||||||
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
|
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
|
||||||
console.log("11112222");
|
console.log("11112222", beginTime);
|
||||||
} else if (!props.datasource.beforeStart && props.datasource.afterStart) {
|
} else if (!props.datasource.beforeStart && props.datasource.afterStart) {
|
||||||
//无开始前有开始后
|
//无开始前有开始后
|
||||||
endTime = endTime + props.datasource.afterStart * 60 * 1000;
|
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");
|
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
|
||||||
|
|||||||
Reference in New Issue
Block a user