diff --git a/src/views/report/qcReport/cutDayReport/index.vue b/src/views/report/qcReport/cutDayReport/index.vue index bd90490f..5e997255 100644 --- a/src/views/report/qcReport/cutDayReport/index.vue +++ b/src/views/report/qcReport/cutDayReport/index.vue @@ -1,7 +1,7 @@ @@ -195,7 +195,7 @@ export default { startPlaceholder: '开始时间', endPlaceholder: '结束时间', param: 'checkTime', - defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], + defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000], width: 350 }, { @@ -232,9 +232,10 @@ export default { }, created() { }, mounted() { - // this.formConfig[1].defaultSelect[] - this.listQuery.startTime = this.formConfig[0].defaultSelect[0] - this.listQuery.endTime = this.formConfig[0].defaultSelect[1] + // this.formConfig[1].defaultSelect[0] = + // this.formConfig[1].defaultSelect[0] = + this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() + this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 this.getDataList() this.getDict() @@ -462,8 +463,8 @@ export default { // this.listQuery.materialId = val.materialId ? val.materialId : undefined; // this.listQuery.startTime = '1706144404000'; // this.listQuery.endTime = '1706230804000'; - this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined; - this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined; + this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined; + this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24*60*60*1000 : undefined; this.listQuery.lineId = val.lineId ? val.lineId : undefined this.getDataList(); break; diff --git a/src/views/report/qcReport/fullInspection/index.vue b/src/views/report/qcReport/fullInspection/index.vue index bdc0798a..d61b3f16 100644 --- a/src/views/report/qcReport/fullInspection/index.vue +++ b/src/views/report/qcReport/fullInspection/index.vue @@ -1,7 +1,7 @@ @@ -214,7 +214,7 @@ export default { startPlaceholder: '开始时间', endPlaceholder: '结束时间', param: 'checkTime', - defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], + defaultSelect: [Date.now() - 24 * 60 * 60*1000, Date.now()], width: 350 }, { diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue index 4d57398d..3636977a 100644 --- a/src/views/report/qcReport/lineReport.vue +++ b/src/views/report/qcReport/lineReport.vue @@ -1,7 +1,7 @@ @@ -132,7 +132,7 @@ export default { startPlaceholder: '开始时间', endPlaceholder: '结束时间', param: 'checkTime', - defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], + defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000], width: 350 }, { @@ -170,8 +170,8 @@ export default { created() { }, mounted() { // this.formConfig[1].defaultSelect[] - this.listQuery.startTime = this.formConfig[0].defaultSelect[0] - this.listQuery.endTime = this.formConfig[0].defaultSelect[1] + this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() + this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 this.getDataList() this.getDict() @@ -365,8 +365,8 @@ export default { // this.listQuery.materialId = val.materialId ? val.materialId : undefined; // this.listQuery.startTime = '1706144404000'; // this.listQuery.endTime = '1706230804000'; - this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined; - this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined; + this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined; + this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined; this.listQuery.lineId = val.lineId ? val.lineId : undefined this.getDataList(); break; diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue index b3f011bc..35a210f6 100644 --- a/src/views/report/qcReport/optimizeCutData.vue +++ b/src/views/report/qcReport/optimizeCutData.vue @@ -1,7 +1,7 @@ @@ -129,7 +129,7 @@ export default { startPlaceholder: '开始时间', endPlaceholder: '结束时间', param: 'checkTime', - defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], + defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000], width: 350 }, { @@ -167,8 +167,8 @@ export default { created() { }, mounted() { // this.formConfig[1].defaultSelect[] - this.listQuery.startTime = this.formConfig[0].defaultSelect[0] - this.listQuery.endTime = this.formConfig[0].defaultSelect[1] + this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() + this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 this.getDataList() this.getDict() @@ -357,8 +357,8 @@ export default { // this.listQuery.materialId = val.materialId ? val.materialId : undefined; // this.listQuery.startTime = '1706144404000'; // this.listQuery.endTime = '1706230804000'; - this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined; - this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined; + this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined; + this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined; this.listQuery.lineId = val.lineId ? val.lineId : undefined this.getDataList(); break;