From b2304941a4c89000020865744f736c772b5a25c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 26 Apr 2024 10:51:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/qcReport/cutDayReport/index.vue | 7 ++++--- src/views/report/qcReport/lineReport.vue | 15 ++++++++------- src/views/report/qcReport/optimizeCutData.vue | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) 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 }, { From b81c95f7963943fd973633e46e259c1d640b4453 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Fri, 26 Apr 2024 16:14:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=A1=AE=E8=AE=A4,=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/glass/inputTable.vue | 34 +++++++++---------- src/views/report/ingredientReport/day.vue | 15 ++++---- .../report/productionWeekReport/index.vue | 14 +++++--- .../report/qcReport/cutDayReport/index.vue | 14 ++++---- .../report/qcReport/fullInspection/index.vue | 13 +++---- src/views/report/qcReport/lineReport.vue | 11 +++--- src/views/report/qcReport/optimizeCutData.vue | 9 +++-- 7 files changed, 57 insertions(+), 53 deletions(-) diff --git a/src/views/report/glass/inputTable.vue b/src/views/report/glass/inputTable.vue index 0ad19b0f..d1cc1486 100644 --- a/src/views/report/glass/inputTable.vue +++ b/src/views/report/glass/inputTable.vue @@ -1,7 +1,7 @@ @@ -38,15 +38,15 @@ import { updateGlass, updateGlassRemark } from '@/api/report/glass'; const cols = [ + { + prop: 'lineName', + label: '生产线', + }, { prop: 'xc', label: '许昌安彩周原片生产汇总', - align: 'center', + // align: '200px', children: [ - { - prop: 'lineName', - label: '生产线', - }, { prop: 'm', label: '拉引量㎡', @@ -181,9 +181,9 @@ const cols = [ deep: true, handler(newv, oldv) { if (newv[0] !== '' && newv[0] !== undefined) { - this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')' + this.cols[1].label = this.date + '(' + newv[0] + '-' + newv[1] + ')' } else { - this.cols[0].label = this.date + this.cols[1].label = this.date } } }, @@ -208,15 +208,15 @@ const cols = [ text2 = '上年' text3 = '原片合计（片/年）' } - this.cols[0].children[1].children[0].label = text1 - this.cols[0].children[1].children[1].label = text2 - this.cols[0].children[2].children[0].label = text1 - this.cols[0].children[2].children[1].label = text2 - this.cols[0].children[3].children[0].label = text1 - this.cols[0].children[3].children[1].label = text2 - this.cols[0].children[4].children[0].label = text1 - this.cols[0].children[4].children[1].label = text2 - this.cols[0].children[2].label = text3 + this.cols[1].children[0].children[0].label = text1 + this.cols[1].children[0].children[1].label = text2 + this.cols[1].children[1].children[0].label = text1 + this.cols[1].children[1].children[1].label = text2 + this.cols[1].children[2].children[0].label = text1 + this.cols[1].children[2].children[1].label = text2 + this.cols[1].children[3].children[0].label = text1 + this.cols[1].children[3].children[1].label = text2 + this.cols[1].children[1].label = text3 } } }, diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue index 64d37df4..e9455e24 100644 --- a/src/views/report/ingredientReport/day.vue +++ b/src/views/report/ingredientReport/day.vue @@ -23,7 +23,7 @@ }" class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%"> - + @@ -32,8 +32,7 @@ --> - + @@ -32,13 +32,19 @@ background: '#F2F4F9', color: '#606266' }"> - - + + + + +