From a750e565e2575fac4ee86dd9f115b94fa204b79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Mon, 25 Mar 2024 18:42:00 +0800 Subject: [PATCH 1/3] =?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/OperationalOverview/coldBoard.vue | 8 ++++---- .../OperationalOverview/components/coldDoubleYChart.vue | 6 +++--- src/views/OperationalOverview/components/pileBarChart.vue | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index dba2685b..91d85d2d 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -1,7 +1,7 @@ @@ -793,11 +793,11 @@ export default { // formatDate(item.planStartTime) || '', // `${item.line || ''} // `, - `${item.name || ''}`, + `${ele.name || ''}`, // `${item.code || ''}`, - `${item.run || ''}`, + `${ele.run || ''}`, // `${item.error || ''}`, - ]); + ]) } this.realEqConfig.data = this.realEqList this.$refs['realEqScrollBoard'].updateRows(this.realEqList) diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue index e61dbcbf..38f2f777 100644 --- a/src/views/OperationalOverview/components/coldDoubleYChart.vue +++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue @@ -2,7 +2,7 @@ @@ -286,7 +286,7 @@ export default { } diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue index 90edc21a..69fb993c 100644 --- a/src/views/OperationalOverview/components/pileBarChart.vue +++ b/src/views/OperationalOverview/components/pileBarChart.vue @@ -1,7 +1,7 @@ @@ -174,7 +174,7 @@ export default { legend: { itemWidth: 12, itemHeight: 12, - top:'30', + top:'10', icon: 'rect', textStyle: { color: '#ffffff' From 5d2d510e235f1c592d80ca23a701d5e34690f557 Mon Sep 17 00:00:00 2001 From: zwq Date: Tue, 26 Mar 2024 09:04:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/cost/energyCost/index.vue | 7 ++++++- src/views/cost/energyCostHis/index.vue | 7 ++++++- src/views/cost/mixins/basic-page.js | 4 ++-- src/views/cost/rawMaterialConfig/index.vue | 11 ++++++++--- src/views/cost/rawMaterialCost/index.vue | 7 ++++++- src/views/cost/rawMaterialCostHis/index.vue | 9 +++++++-- 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/views/cost/energyCost/index.vue b/src/views/cost/energyCost/index.vue index 7d7ec099..78dd9871 100644 --- a/src/views/cost/energyCost/index.vue +++ b/src/views/cost/energyCost/index.vue @@ -12,6 +12,7 @@ :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" + :max-height="tableH" :table-data="tableData"> { + this.tableH = this.tableHeight(260) + }) getEnergyTypeListAll().then((response) => { this.formConfig[0].selectOptions = response.data; }); @@ -133,7 +138,7 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; + this.listQuery.pageSize = 20; this.listQuery.energyTypeId = val.energyTypeId; this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null; this.listQuery.startTime = val.searchTime diff --git a/src/views/cost/energyCostHis/index.vue b/src/views/cost/energyCostHis/index.vue index 44287284..8c13a352 100644 --- a/src/views/cost/energyCostHis/index.vue +++ b/src/views/cost/energyCostHis/index.vue @@ -12,6 +12,7 @@ :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" + :max-height="tableH" :table-data="tableData"> { + this.tableH = this.tableHeight(260) + }) const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); @@ -150,7 +155,7 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; + this.listQuery.pageSize = 20; this.listQuery.reportType = val.reportType; this.listQuery.energyTypeId = val.energyTypeId; this.listQuery.reportTime = val.searchTime diff --git a/src/views/cost/mixins/basic-page.js b/src/views/cost/mixins/basic-page.js index 89069ad4..87d3dae9 100644 --- a/src/views/cost/mixins/basic-page.js +++ b/src/views/cost/mixins/basic-page.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-24 11:19:43 * @LastEditors: zwq - * @LastEditTime: 2023-12-07 09:35:33 + * @LastEditTime: 2024-03-25 14:11:46 * @Description: */ export default { @@ -17,7 +17,7 @@ export default { }, tableData: [], listQuery: { - pageSize: 10, + pageSize: 20, pageNo: 1, total: 1, }, diff --git a/src/views/cost/rawMaterialConfig/index.vue b/src/views/cost/rawMaterialConfig/index.vue index abcc797b..fec55cfb 100644 --- a/src/views/cost/rawMaterialConfig/index.vue +++ b/src/views/cost/rawMaterialConfig/index.vue @@ -12,6 +12,7 @@ :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" + :max-height="tableH" :table-data="tableData"> { + this.tableH = this.tableHeight(260) + }) getHotMaterialList().then((response) => { this.formConfig[0].selectOptions = response.data; }); @@ -155,14 +160,14 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; + this.listQuery.pageSize = 20; this.listQuery.materialId = val.name; this.getDataList(); break; case 'reset': this.$refs.searchBarForm.resetForm(); this.listQuery = { - pageSize: 10, + pageSize: 20, pageNo: 1, total: 1, }; diff --git a/src/views/cost/rawMaterialCost/index.vue b/src/views/cost/rawMaterialCost/index.vue index 961c5f67..1de8f050 100644 --- a/src/views/cost/rawMaterialCost/index.vue +++ b/src/views/cost/rawMaterialCost/index.vue @@ -12,6 +12,7 @@ :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" + :max-height="tableH" :table-data="tableData"> { + this.tableH = this.tableHeight(260) + }) getHotMaterialList().then((response) => { this.formConfig[0].selectOptions = response.data; }); @@ -138,7 +143,7 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; + this.listQuery.pageSize = 20; this.listQuery.materialId = val.materialId; this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null; this.listQuery.startTime = val.searchTime diff --git a/src/views/cost/rawMaterialCostHis/index.vue b/src/views/cost/rawMaterialCostHis/index.vue index 05636063..7a69704a 100644 --- a/src/views/cost/rawMaterialCostHis/index.vue +++ b/src/views/cost/rawMaterialCostHis/index.vue @@ -12,6 +12,7 @@ :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" + :max-height="tableH" :table-data="tableData"> { + this.tableH = this.tableHeight(260) + }) const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); @@ -149,7 +154,7 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; + this.listQuery.pageSize = 20; this.listQuery.reportType = val.reportType; this.listQuery.materialId = val.materialId; this.listQuery.times = val.searchTime From 7b0f03b76f66950b7fa2559a8f01ed6878432243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Tue, 26 Mar 2024 09:42:51 +0800 Subject: [PATCH 3/3] =?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/OperationalOverview/coldBoard.vue | 8 +- .../components/BarChart.vue | 127 ------- .../components/LineRadioGroup.vue | 0 .../BarChart.vue | 158 --------- .../BarChartOne.vue | 158 --------- .../baseContainer/index.vue | 144 -------- .../baseTable.vue | 170 ---------- .../colorDiv.vue | 31 -- .../topGroup.vue | 60 ---- .../nowTeam.vue | 83 ----- .../components/SimpleLineChart.vue | 229 ------------- .../components/alarmLevel.vue | 51 --- .../components/baseContainer1/index.vue | 187 ---------- .../components/baseTable.vue | 8 +- .../components/baseVideo.vue | 40 --- .../components/nextDay.vue | 40 --- .../components/threeBarChart.vue | 237 ------------- .../components/topRadioGroup.vue | 86 ----- .../components/utilChart.vue | 67 ---- .../components/videoFooter.vue | 66 ---- .../OperationalOverview/processingBoard.vue | 8 +- src/views/OperationalOverview/styles/btn.scss | 99 ------ .../styles/element-ui.scss | 173 ---------- .../styles/element-variables.scss | 31 -- .../OperationalOverview/styles/index.scss | 319 ------------------ .../OperationalOverview/styles/mixin.scss | 66 ---- .../OperationalOverview/styles/sidebar.scss | 209 ------------ .../styles/transition.scss | 48 --- .../OperationalOverview/styles/variables.scss | 35 -- src/views/report/glass/day.vue | 54 +-- src/views/report/glass/month.vue | 51 +-- src/views/report/glass/weekly.vue | 51 +-- src/views/report/glass/year.vue | 51 +-- .../report/productionDayReport/index.vue | 53 +-- .../report/productionMonthReport/index.vue | 55 +-- .../report/productionWeekReport/index.vue | 51 +-- .../report/productionYearReport/index.vue | 53 +-- 37 files changed, 234 insertions(+), 3123 deletions(-) delete mode 100644 src/views/OperationalOverview/components/BarChart.vue delete mode 100644 src/views/OperationalOverview/components/LineRadioGroup.vue delete mode 100644 src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue delete mode 100644 src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue delete mode 100644 src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue delete mode 100644 src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue delete mode 100644 src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue delete mode 100644 src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue delete mode 100644 src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue delete mode 100644 src/views/OperationalOverview/components/SimpleLineChart.vue delete mode 100644 src/views/OperationalOverview/components/alarmLevel.vue delete mode 100644 src/views/OperationalOverview/components/baseContainer1/index.vue delete mode 100644 src/views/OperationalOverview/components/baseVideo.vue delete mode 100644 src/views/OperationalOverview/components/nextDay.vue delete mode 100644 src/views/OperationalOverview/components/threeBarChart.vue delete mode 100644 src/views/OperationalOverview/components/topRadioGroup.vue delete mode 100644 src/views/OperationalOverview/components/utilChart.vue delete mode 100644 src/views/OperationalOverview/components/videoFooter.vue delete mode 100644 src/views/OperationalOverview/styles/btn.scss delete mode 100644 src/views/OperationalOverview/styles/element-ui.scss delete mode 100644 src/views/OperationalOverview/styles/element-variables.scss delete mode 100644 src/views/OperationalOverview/styles/index.scss delete mode 100644 src/views/OperationalOverview/styles/mixin.scss delete mode 100644 src/views/OperationalOverview/styles/sidebar.scss delete mode 100644 src/views/OperationalOverview/styles/transition.scss delete mode 100644 src/views/OperationalOverview/styles/variables.scss diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index 91d85d2d..054c04e0 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -1,7 +1,7 @@ @@ -137,10 +137,10 @@ import baseTable1 from './components/baseTable' // import baseContainer1 from './components/baseContainer/indexcopy' // import baseTable2 from './components/baseTable' // import baseTable3 from './components/baseTable' -import TopRadioGroup from './components/topRadioGroup' +// import TopRadioGroup from './components/topRadioGroup' import screenfull from 'screenfull' // import BaseVideo from './components/baseVideo.vue' -import alarmLevel from './components/alarmLevel' +// import alarmLevel from './components/alarmLevel' import pileBarChart from './components/pileBarChart' import colorDiv from './components/colorDiv' import moment from "moment"; @@ -251,7 +251,7 @@ export default { baseContainer, baseTable1, pileBarChart, - TopRadioGroup, + // TopRadioGroup, doubleYChart, LinearBarChart, ISRAChart diff --git a/src/views/OperationalOverview/components/BarChart.vue b/src/views/OperationalOverview/components/BarChart.vue deleted file mode 100644 index b719d38c..00000000 --- a/src/views/OperationalOverview/components/BarChart.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - diff --git a/src/views/OperationalOverview/components/LineRadioGroup.vue b/src/views/OperationalOverview/components/LineRadioGroup.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue deleted file mode 100644 index 49ef81f1..00000000 --- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue deleted file mode 100644 index 1d5ef821..00000000 --- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue deleted file mode 100644 index cf643a53..00000000 --- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue deleted file mode 100644 index 84b5976b..00000000 --- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue deleted file mode 100644 index eef54784..00000000 --- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue deleted file mode 100644 index 961ab65f..00000000 --- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - diff --git a/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue b/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue deleted file mode 100644 index dc3cf0b7..00000000 --- a/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - diff --git a/src/views/OperationalOverview/components/SimpleLineChart.vue b/src/views/OperationalOverview/components/SimpleLineChart.vue deleted file mode 100644 index a62b7157..00000000 --- a/src/views/OperationalOverview/components/SimpleLineChart.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - diff --git a/src/views/OperationalOverview/components/alarmLevel.vue b/src/views/OperationalOverview/components/alarmLevel.vue deleted file mode 100644 index ec999515..00000000 --- a/src/views/OperationalOverview/components/alarmLevel.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - diff --git a/src/views/OperationalOverview/components/baseContainer1/index.vue b/src/views/OperationalOverview/components/baseContainer1/index.vue deleted file mode 100644 index 78249620..00000000 --- a/src/views/OperationalOverview/components/baseContainer1/index.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - diff --git a/src/views/OperationalOverview/components/baseTable.vue b/src/views/OperationalOverview/components/baseTable.vue index 877e6d40..7e6ee542 100644 --- a/src/views/OperationalOverview/components/baseTable.vue +++ b/src/views/OperationalOverview/components/baseTable.vue @@ -1,8 +1,8 @@