diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue index a7740705..47473fe2 100644 --- a/src/views/report/ingredientReport/day.vue +++ b/src/views/report/ingredientReport/day.vue @@ -169,8 +169,8 @@ export default { }, mounted() { // this.formConfig[1].defaultSelect[] - this.listQuery.startTime = Date.now() - 24 * 60 * 60 * 1000 - this.time = moment(new Date((Date.now() - 24 * 60 * 60 * 1000)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now()).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + this.listQuery.startTime = Date.now() + this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now())).format('YYYY-MM-DD HH:mm:ss') this.listQuery.endTime = Date.now() // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 this.getDataList() @@ -536,8 +536,8 @@ export default { switch (val.btnName) { case 'search': this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined; - this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') - this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).getTime() : undefined; + this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).format('YYYY-MM-DD HH:mm:ss') + this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).getTime() : undefined; this.getDataList(); break; case 'export':