From becf34d089c916963b623322ecb7a0c5e50ea53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Tue, 23 Apr 2024 15:09:07 +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 --- .../components/coldDoubleYChart.vue | 11 +- .../components/doubleYChart .vue | 11 +- src/views/report/ingredientReport/day.vue | 143 ++++++++++++++++-- .../report/qcReport/cutDayReport/index.vue | 4 +- .../report/qcReport/fullInspection/index.vue | 20 +-- src/views/report/qcReport/lineReport.vue | 4 +- src/views/report/qcReport/optimizeCutData.vue | 6 +- 7 files changed, 158 insertions(+), 41 deletions(-) diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue index bed1a9d1..71d469bc 100644 --- a/src/views/OperationalOverview/components/coldDoubleYChart.vue +++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue @@ -2,7 +2,7 @@ @@ -266,12 +266,9 @@ export default { // }, }, { - min: function() { // 取最小值向下取整为最小刻度 - return 0 - }, - max: function(value) { // 取最大值向上取整为最大刻度 - return Math.ceil(value.max) - }, + min: 0, + max: 100000, + minInterval: 5,//间隔 scale: true, type: 'value', name: '产量/㎡', // y轴上方的单位 diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue index b8febfad..658a6151 100644 --- a/src/views/OperationalOverview/components/doubleYChart .vue +++ b/src/views/OperationalOverview/components/doubleYChart .vue @@ -1,7 +1,7 @@ @@ -265,12 +265,9 @@ export default { // }, }, { - // min: function() { // 取最小值向下取整为最小刻度 - // return 0 - // }, - // max: function(value) { // 取最大值向上取整为最大刻度 - // return Math.ceil(value.max) - // }, + min: 0, + max: 100000, + minInterval: 5,//间隔 scale: true, type: 'value', name: '产量/片', // y轴上方的单位 diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue index 09ce2fef..559d7399 100644 --- a/src/views/report/ingredientReport/day.vue +++ b/src/views/report/ingredientReport/day.vue @@ -1,7 +1,7 @@ @@ -36,6 +36,19 @@ --> + @@ -154,7 +154,7 @@ export default { endPlaceholder: '结束时间', param: 'checkTime', defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], - width: 250 + width: 350 }, { type: 'select', diff --git a/src/views/report/qcReport/fullInspection/index.vue b/src/views/report/qcReport/fullInspection/index.vue index c9cb32ef..b4e7d8c9 100644 --- a/src/views/report/qcReport/fullInspection/index.vue +++ b/src/views/report/qcReport/fullInspection/index.vue @@ -1,7 +1,7 @@ @@ -222,7 +222,7 @@ export default { endPlaceholder: '结束时间', param: 'checkTime', defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], - width: 250 + width: 350 }, { type: 'button', @@ -653,25 +653,24 @@ export default { }, }; - diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue index 8ac78d80..2cc33ecc 100644 --- a/src/views/report/qcReport/lineReport.vue +++ b/src/views/report/qcReport/lineReport.vue @@ -1,7 +1,7 @@ @@ -129,7 +129,7 @@ export default { endPlaceholder: '结束时间', param: 'checkTime', defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], - width: 250 + width: 350 }, { type: 'select', diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue index eca06880..bd903db8 100644 --- a/src/views/report/qcReport/optimizeCutData.vue +++ b/src/views/report/qcReport/optimizeCutData.vue @@ -1,7 +1,7 @@ @@ -99,7 +99,7 @@ export default { listQuery: { startTime: undefined, endTime: undefined, - lineId:null + lineId:undefined }, formConfig: [ // { @@ -128,7 +128,7 @@ export default { endPlaceholder: '结束时间', param: 'checkTime', defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], - width: 250 + width: 350 }, { type: 'select', -- 2.24.3 From d251daa3f55591e9980b112b6d241eefa5718661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Tue, 23 Apr 2024 15:23:43 +0800 Subject: [PATCH 2/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/api/report/qcReport.js | 18 ++++++++++++- src/views/report/ingredientReport/day.vue | 26 ++++++++++++------- .../report/qcReport/cutDayReport/index.vue | 6 ++--- src/views/report/qcReport/lineReport.vue | 6 ++--- src/views/report/qcReport/optimizeCutData.vue | 6 ++--- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/api/report/qcReport.js b/src/api/report/qcReport.js index c4e252ec..5124b97c 100644 --- a/src/api/report/qcReport.js +++ b/src/api/report/qcReport.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2024-04-18 09:27:54 - * @LastEditTime: 2024-04-23 13:37:12 + * @LastEditTime: 2024-04-23 15:16:12 * @LastEditors: zhp * @Description: */ @@ -78,3 +78,19 @@ export function getCuttingReportDataList(data) { data: data }) } + +export function getProcessingLineDataList(data) { + return request({ + url: 'extend/customized-reports/getProcessingLine', + method: 'get', + data: data + }) +} + +export function getOriginalLineDataList(data) { + return request({ + url: 'extend/customized-reports/getOriginalLine', + method: 'get', + data: data + }) +} diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue index 559d7399..bd48be34 100644 --- a/src/views/report/ingredientReport/day.vue +++ b/src/views/report/ingredientReport/day.vue @@ -1,7 +1,7 @@ @@ -203,14 +203,22 @@ export default { colspan: _col } } - // if (columnIndex === 1 ) { - // if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) { - // return { - // rowspan: 2, - // colspan: 1 - // } - // } - // } + if (columnIndex === 1 ) { + if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) { + return { + rowspan: 2, + colspan: 1 + } + } + } + if (columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 6) { + if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) { + return { + rowspan: 1, + colspan: 2 + } + } + } }, handleExport() { // 处理查询参数 diff --git a/src/views/report/qcReport/cutDayReport/index.vue b/src/views/report/qcReport/cutDayReport/index.vue index 0f701ff5..632b327f 100644 --- a/src/views/report/qcReport/cutDayReport/index.vue +++ b/src/views/report/qcReport/cutDayReport/index.vue @@ -1,7 +1,7 @@ @@ -36,7 +36,7 @@ // import basicPage from '../../../core/mixins/basic-page'; // import { parseTime } from '../../../core/mixins/code-filter'; import { - getCWSectionList, + getOriginalLineDataList, getCuttingReportDataList } from '@/api/report/qcReport'; import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; @@ -201,7 +201,7 @@ export default { }, methods: { async getDict() { - const res = await getCWSectionList() + const res = await getOriginalLineDataList() console.log(res) this.formConfig[1].selectOptions = res.data }, diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue index 2cc33ecc..ab2b32c5 100644 --- a/src/views/report/qcReport/lineReport.vue +++ b/src/views/report/qcReport/lineReport.vue @@ -1,7 +1,7 @@ @@ -36,7 +36,7 @@ // import { parseTime } from '../../../core/mixins/code-filter'; import { getOriginalData, - getCWSectionList + getOriginalLineDataList } from '@/api/report/qcReport'; import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; import FileSaver from 'file-saver' @@ -176,7 +176,7 @@ export default { }, methods: { async getDict() { - const res = await getCWSectionList() + const res = await getOriginalLineDataList() console.log(res) this.formConfig[1].selectOptions = res.data }, diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue index bd903db8..77d5411d 100644 --- a/src/views/report/qcReport/optimizeCutData.vue +++ b/src/views/report/qcReport/optimizeCutData.vue @@ -1,7 +1,7 @@ @@ -36,7 +36,7 @@ // import { parseTime } from '../../../core/mixins/code-filter'; import { getCuttingtData, - getCWSectionList + getOriginalLineDataList } from '@/api/report/qcReport'; import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; import FileSaver from 'file-saver' @@ -175,7 +175,7 @@ export default { }, methods: { async getDict() { - const res = await getCWSectionList() + const res = await getOriginalLineDataList() console.log(res) this.formConfig[1].selectOptions = res.data }, -- 2.24.3