diff --git a/src/views/report/qcReport/cutDayReport/index.vue b/src/views/report/qcReport/cutDayReport/index.vue index 3ccab238..b577ca55 100644 --- a/src/views/report/qcReport/cutDayReport/index.vue +++ b/src/views/report/qcReport/cutDayReport/index.vue @@ -1,7 +1,7 @@ @@ -167,7 +167,7 @@ export default { listQuery: { startTime: undefined, endTime: undefined, - lineId: null, + lineId: undefined, }, formConfig: [ // { @@ -189,7 +189,7 @@ export default { type: 'datePicker', label: '时间段', dateType: 'daterange', - format: 'yyyy-MM-dd HH:mm:ss', + format: 'yyyy-MM-dd', valueFormat: "timestamp", rangeSeparator: '-', startPlaceholder: '开始时间', @@ -205,6 +205,7 @@ export default { labelField: 'name', valueField: 'id', param: 'lineId', + multiple:true, filterable: true }, { diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue index ba81c2f3..03edfe6c 100644 --- a/src/views/report/qcReport/lineReport.vue +++ b/src/views/report/qcReport/lineReport.vue @@ -1,7 +1,7 @@ @@ -104,7 +104,7 @@ export default { listQuery: { startTime: undefined, endTime: undefined, - lineId:null, + lineId:undefined, }, formConfig: [ // { @@ -132,7 +132,7 @@ export default { startPlaceholder: '开始时间', endPlaceholder: '结束时间', param: 'checkTime', - 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], + defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()], width: 350 }, { @@ -142,6 +142,7 @@ export default { labelField: 'name', valueField: 'id', param: 'lineId', + multiple:true, filterable: true }, { @@ -170,8 +171,8 @@ export default { created() { }, mounted() { // this.formConfig[1].defaultSelect[] - 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.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 + this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 this.getDataList() this.getDict() @@ -365,8 +366,8 @@ export default { // this.listQuery.materialId = val.materialId ? val.materialId : undefined; // this.listQuery.startTime = '1706144404000'; // this.listQuery.endTime = '1706230804000'; - 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.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined; + this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : 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 83bfcc42..fcf1e86c 100644 --- a/src/views/report/qcReport/optimizeCutData.vue +++ b/src/views/report/qcReport/optimizeCutData.vue @@ -1,7 +1,7 @@ @@ -146,6 +146,7 @@ export default { labelField: 'name', valueField: 'id', param: 'lineId', + multiple:true, filterable: true }, {