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 @@ - - - - - - - - - - - - - - - - {{ title }} - - - - - - - - - - - - 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 @@ - - - - - - - - - {{ scope.row[item.prop] | commonFilter(item.filter) }} - - - - - - - - - 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 @@ - - - - - - - {{ item.label }} - - - - - - - - - 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 @@ - - - - - - 开始时间 - - 2021.1.26 13:30:21 - - - - - 班组名称 - - 中班执行一组 - - - - 原片投入(片) - - 122 - - - - 投入面积(㎡) - - 12000 - - - - - - 产品规格 - - 110 - - - - 执行工单 - - 110 - - - - 成品率 - - 98.8% - - - - - - - - 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 @@ - - - - - {{ injectData.level }}级 - - - 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 @@ - - - - - - - - - - - - - - - - - - - - {{ title }} - - - - - - - - - - - - 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 @@ @@ -158,7 +158,7 @@ export default { } diff --git a/src/views/OperationalOverview/components/nextDay.vue b/src/views/OperationalOverview/components/nextDay.vue deleted file mode 100644 index ba01a329..00000000 --- a/src/views/OperationalOverview/components/nextDay.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - {{ injectData.nextLong }} - - - - diff --git a/src/views/OperationalOverview/components/threeBarChart.vue b/src/views/OperationalOverview/components/threeBarChart.vue deleted file mode 100644 index 43fce6d1..00000000 --- a/src/views/OperationalOverview/components/threeBarChart.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - diff --git a/src/views/OperationalOverview/components/topRadioGroup.vue b/src/views/OperationalOverview/components/topRadioGroup.vue deleted file mode 100644 index f1339253..00000000 --- a/src/views/OperationalOverview/components/topRadioGroup.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - {{ item.name }} - - - - - - - - diff --git a/src/views/OperationalOverview/components/utilChart.vue b/src/views/OperationalOverview/components/utilChart.vue deleted file mode 100644 index cc1b553a..00000000 --- a/src/views/OperationalOverview/components/utilChart.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - {{ percent }}% - - - - - diff --git a/src/views/OperationalOverview/components/videoFooter.vue b/src/views/OperationalOverview/components/videoFooter.vue deleted file mode 100644 index d9f3fcb7..00000000 --- a/src/views/OperationalOverview/components/videoFooter.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - {{ item }} - - - - - diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue index 3011c0cb..f7909992 100644 --- a/src/views/OperationalOverview/processingBoard.vue +++ b/src/views/OperationalOverview/processingBoard.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-07-19 15:18:30 * @LastEditors: zhp - * @LastEditTime: 2024-03-25 16:54:49 + * @LastEditTime: 2024-03-26 09:23:44 * @Description: --> @@ -135,14 +135,14 @@ import baseContainer from './components/baseContainer' import baseTable1 from './components/baseTable' // import baseTable2 from './components/baseTable' // import baseTable3 from './components/baseTable' -import TopRadioGroup from './components/topRadioGroup' +// import TopRadioGroup from './components/topRadioGroup' // import pieChart1 from './components/PieChart' // import pieChart2 from './components/PieChart' // import pieChart3 from './components/PieChart' // import { mapGetters } from 'vuex' import screenfull from 'screenfull' // import BaseVideo from './components/baseVideo.vue' -import alarmLevel from './components/alarmLevel' +// import alarmLevel from './components/alarmLevel' // import axios from '@/utils/request' import doubleYChart from './components/doubleYChart ' // import elementResizeDetectorMaker from 'element-resize-detector'; @@ -514,7 +514,7 @@ export default { baseTable1, // baseTable2, // baseTable3, - TopRadioGroup, + // TopRadioGroup, doubleYChart, LinearBarChart // pieChart1, diff --git a/src/views/OperationalOverview/styles/btn.scss b/src/views/OperationalOverview/styles/btn.scss deleted file mode 100644 index e6ba1a8e..00000000 --- a/src/views/OperationalOverview/styles/btn.scss +++ /dev/null @@ -1,99 +0,0 @@ -@import './variables.scss'; - -@mixin colorBtn($color) { - background: $color; - - &:hover { - color: $color; - - &:before, - &:after { - background: $color; - } - } -} - -.blue-btn { - @include colorBtn($blue) -} - -.light-blue-btn { - @include colorBtn($light-blue) -} - -.red-btn { - @include colorBtn($red) -} - -.pink-btn { - @include colorBtn($pink) -} - -.green-btn { - @include colorBtn($green) -} - -.tiffany-btn { - @include colorBtn($tiffany) -} - -.yellow-btn { - @include colorBtn($yellow) -} - -.pan-btn { - font-size: 14px; - color: #fff; - padding: 14px 36px; - border-radius: 8px; - border: none; - outline: none; - transition: 600ms ease all; - position: relative; - display: inline-block; - - &:hover { - background: #fff; - - &:before, - &:after { - width: 100%; - transition: 600ms ease all; - } - } - - &:before, - &:after { - content: ''; - position: absolute; - top: 0; - right: 0; - height: 2px; - width: 0; - transition: 400ms ease all; - } - - &::after { - right: inherit; - top: inherit; - left: 0; - bottom: 0; - } -} - -.custom-button { - display: inline-block; - line-height: 1; - white-space: nowrap; - cursor: pointer; - background: #fff; - color: #fff; - -webkit-appearance: none; - text-align: center; - box-sizing: border-box; - outline: 0; - margin: 0; - padding: 10px 15px; - font-size: 14px; - border-radius: 4px; -} diff --git a/src/views/OperationalOverview/styles/element-ui.scss b/src/views/OperationalOverview/styles/element-ui.scss deleted file mode 100644 index b6edbddf..00000000 --- a/src/views/OperationalOverview/styles/element-ui.scss +++ /dev/null @@ -1,173 +0,0 @@ -// cover some element-ui styles - -.el-breadcrumb__inner, -.el-breadcrumb__inner a { - font-weight: 400 !important; -} - -.el-upload { - input[type="file"] { - display: none !important; - } -} - -.el-upload__input { - display: none; -} - -.cell { - .el-tag { - margin-right: 0px; - } -} - -.visual-container { - .el-table { - .cell { - line-height: 1.2em !important; - } - } -} -.app-container { - .el-table th>.cell { - color: rgb(0, 0, 0,0.85); - } - .el-table__body tr.current-row>td { - background-color: #EAF1FC; - } - -} -.el-table--medium th, .el-table--medium td { - padding: 5px 0; -} - -::v-deep .el-table__fixed-right { - right: 0 !important; - height: 100% !important; -} -.el-button--mini { - padding: 4px 0; -} -.small-padding { - .cell { - padding-left: 5px; - padding-right: 5px; - } -} - -.fixed-width { - .el-button--mini { - padding: 7px 10px; - min-width: 60px; - } -} - -.status-col { - .cell { - padding: 0 10px; - text-align: center; - - .el-tag { - margin-right: 0px; - } - } -} - -.el-button--primary { - background-color: #0B58FF !important; - border-color: #0B58FF !important; -} -// to fixed https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; - border-radius: 4px; -} - -.el-dialog__header { - padding: 12px 24px 8px; - border-bottom: 1px solid #E9E9E9; - text-align: left; -} - -.el-dialog__title { - font-size: 16px; - font-weight: 700; - color: rgba(0, 0, 0, 0.85); -} - -.el-form-item__label { - font-size: 14px; - font-weight: 400; - color: rgba(0, 0, 0, 0.65); - padding-right: 8px; -} - -.el-dialog__headerbtn { - top: 16px; - right: 24px; -} - -.el-form-item--medium .el-form-item__label { - line-height: 32px; -} - -.el-button--medium { - padding: 8px 16px; -} - -.el-select { - width: 100%; -} - -.el-switch.is-checked .el-switch__core { - background-color: #0B58FF; - border-color: #0B58FF; -} - -.el-radio__input.is-checked .el-radio__inner { - background-color: #0B58FF; - border-color: #0B58FF; -} - -.el-button--text{ - color:#0B58FF; -} - -.el-tabs__item.is-active { - color: #0b58ff; -} - -.el-tooltip__popper.is-dark { - max-width: 1100px; -} -// refine element ui upload -.upload-container { - .el-upload { - width: 100%; - - .el-upload-dragger { - width: 100%; - height: 200px; - } - } -} - -// dropdown -.el-dropdown-menu { - a { - display: block - } -} - -// fix date-picker ui bug in filter-item -.el-range-editor.el-input__inner { - display: inline-flex !important; -} - -// to fix el-date-picker css style -.el-range-separator { - box-sizing: content-box; -} diff --git a/src/views/OperationalOverview/styles/element-variables.scss b/src/views/OperationalOverview/styles/element-variables.scss deleted file mode 100644 index 5bdc4dad..00000000 --- a/src/views/OperationalOverview/styles/element-variables.scss +++ /dev/null @@ -1,31 +0,0 @@ -/** -* I think element-ui's default theme color is too light for long-term use. -* So I modified the default color and you can modify it to your liking. -**/ - -/* theme color */ -$--color-primary: #1890ff; -$--color-success: #13ce66; -$--color-warning: #ffba00; -$--color-danger: #ff4949; -// $--color-info: #1E1E1E; - -$--button-font-weight: 400; - -// $--color-text-regular: #1f2d3d; - -$--border-color-light: #dfe4ed; -$--border-color-lighter: #e6ebf5; - -$--table-border: 1px solid #dfe6ec; - -/* icon font path, required */ -$--font-path: "~element-ui/lib/theme-chalk/fonts"; - -@import "~element-ui/packages/theme-chalk/src/index"; - -// the :export directive is the magic sauce for webpack -// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass -:export { - theme: $--color-primary; -} diff --git a/src/views/OperationalOverview/styles/index.scss b/src/views/OperationalOverview/styles/index.scss deleted file mode 100644 index 577e7e66..00000000 --- a/src/views/OperationalOverview/styles/index.scss +++ /dev/null @@ -1,319 +0,0 @@ -@import './variables.scss'; -@import './mixin.scss'; -@import './transition.scss'; -@import './element-ui.scss'; -@import './sidebar.scss'; -@import './btn.scss'; - -body { - height: 100%; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; -} - -label { - font-weight: 700; -} - -html { - height: 100%; - box-sizing: border-box; -} - -#app { - height: 100%; -} - -*, -*:before, -*:after { - box-sizing: inherit; -} - -.no-padding { - padding: 0px !important; -} - -.padding-content { - padding: 4px 0; -} - -a:focus, -a:active { - outline: none; -} - -a, -a:focus, -a:hover { - cursor: pointer; - color: inherit; - text-decoration: none; -} - -div:focus { - outline: none; -} - -.fr { - float: right; -} - -.fl { - float: left; -} - -.pr-5 { - padding-right: 5px; -} - -.pl-5 { - padding-left: 5px; -} - -.block { - display: block; -} - -.pointer { - cursor: pointer; -} - -.inlineBlock { - display: block; -} - -.clearfix { - &:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; - } -} - -aside { - background: #eef1f6; - padding: 8px 24px; - margin-bottom: 20px; - border-radius: 2px; - display: block; - line-height: 32px; - font-size: 16px; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - color: #2c3e50; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - a { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } - } -} - -//main-container全局样式 -.app-container { - margin:0 16px 0; - background-color: #fff; - border-radius: 4px; - padding: 16px 16px 0; - height: calc(100vh - 134px); - overflow: auto; -} - -.components-container { - margin: 30px 50px; - position: relative; -} - -// 覆盖原有的分页样式-start - -.el-pagination { - position: relative; -} - -.el-pagination.is-background .btn-prev,.el-pagination.is-background .btn-next,.el-pagination.is-background .el-pager li { - background-color: #fff; -} - -.el-pagination__jump { - margin-left: 125px; -} - -.el-pagination__sizes { - position: absolute; - right: 100px; -} - -.el-pagination.is-background .el-pager li:not(.disabled).active { - background-color: #0B58FF; -} -.el-pagination .el-select .el-input .el-input__inner { - height: 22px; -} -.el-badge__content { - border: none; -} -// 覆盖原有的分页样式-end - -.text-center { - text-align: center -} - -.sub-navbar { - height: 50px; - line-height: 50px; - position: relative; - width: 100%; - text-align: right; - padding-right: 20px; - transition: 600ms ease position; - background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); - - .subtitle { - font-size: 20px; - color: #fff; - } - - &.draft { - background: #d0d0d0; - } - - &.deleted { - background: #d0d0d0; - } -} - -.link-type, -.link-type:focus { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } -} - -.filter-container { - padding-bottom: 10px; - - .filter-item { - display: inline-block; - vertical-align: middle; - margin-bottom: 10px; - } -} - -//refine vue-multiselect plugin -.multiselect { - line-height: 16px; -} - -.multiselect--active { - z-index: 1000 !important; -} - -// 业务代码中 -.content-row { - padding: 10px 0; -} - -.el-dialog { - width: 1000px; -} -.el-dialog__body { - padding: 30px 40px; -} - -.el-dialog__wrapper { - backdrop-filter: blur(5px); -} - -::-webkit-scrollbar { - width: 8px; - height: 8px; - background-color: transparent; -} - -::-webkit-scrollbar-track-piece { - background-color:rgba(144,147,153,0); -} - -::-webkit-scrollbar-corner { - background-color:rgba(144,147,153,0); -} - -::-webkit-scrollbar-track { - width: 6px; - background: rgba(144,147,153,0); - -webkit-border-radius: 2em; - -moz-border-radius: 2em; - border-radius: 2em; -} - -::-webkit-scrollbar-thumb { - background-color: rgba(144,147,153,.5); - background-clip: padding-box; - min-height: 28px; - -webkit-border-radius: 2em; - -moz-border-radius: 2em; - border-radius: 2em; - transition: background-color .3s; - cursor: pointer; -} - -::-webkit-scrollbar-thumb:hover { - background-color: rgba(144,147,153,.3); -} - -// 数据分析单选框样式覆盖 - -.app-container{ - .data-analysis-radio{ - .el-radio-button__inner { - border: 0; - padding: 7px 0; - margin: 0 15px; - } - .el-radio-button__orig-radio:checked+.el-radio-button__inner{ - background-color: transparent; - color: #606266; - box-shadow: 0 0 0 0 transparent; - border-bottom: 2px solid #0B58FF; - } - .el-radio-button:first-child .el-radio-button__inner, - .el-radio-button:last-child .el-radio-button__inner { - border-radius: 0; - } - } -} - -.el-table--group, .el-table--border { - border: none; -} - -// 全局loading样式覆盖 -.el-loading-mask{ - z-index: 99999; -} - - -input::-webkit-input-placeholder { - /* WebKit browsers */ - font-size:12px; -} -input::-moz-placeholder { - /* Mozilla Firefox 19+ */ - font-size:12px; -} -input:-ms-input-placeholder { - font-size:12px; -} \ No newline at end of file diff --git a/src/views/OperationalOverview/styles/mixin.scss b/src/views/OperationalOverview/styles/mixin.scss deleted file mode 100644 index 06fa0612..00000000 --- a/src/views/OperationalOverview/styles/mixin.scss +++ /dev/null @@ -1,66 +0,0 @@ -@mixin clearfix { - &:after { - content: ""; - display: table; - clear: both; - } -} - -@mixin scrollBar { - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } -} - -@mixin relative { - position: relative; - width: 100%; - height: 100%; -} - -@mixin pct($pct) { - width: #{$pct}; - position: relative; - margin: 0 auto; -} - -@mixin triangle($width, $height, $color, $direction) { - $width: $width/2; - $color-border-style: $height solid $color; - $transparent-border-style: $width solid transparent; - height: 0; - width: 0; - - @if $direction==up { - border-bottom: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - - @else if $direction==right { - border-left: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } - - @else if $direction==down { - border-top: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - - @else if $direction==left { - border-right: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } -} diff --git a/src/views/OperationalOverview/styles/sidebar.scss b/src/views/OperationalOverview/styles/sidebar.scss deleted file mode 100644 index 4c2691e4..00000000 --- a/src/views/OperationalOverview/styles/sidebar.scss +++ /dev/null @@ -1,209 +0,0 @@ -#app { - - .main-container { - min-height: 100%; - transition: margin-left .28s; - // margin-left: $sideBarWidth; - position: relative; - } - - .sidebar-container { - transition: width 0.28s; - // width: $sideBarWidth !important; - // background-color: $menuBg; - height: 100%; - position: fixed; - font-size: 0px; - top: 0; - bottom: 0; - left: 0; - z-index: 1001; - overflow: hidden; - - // reset element-ui css - .horizontal-collapse-transition { - transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; - } - - .scrollbar-wrapper { - overflow-x: hidden !important; - } - - .el-scrollbar__bar.is-vertical { - right: 0px; - } - - .el-scrollbar { - height: 100%; - } - - &.has-logo { - .el-scrollbar { - height: calc(100% - 50px); - } - } - - .is-horizontal { - display: none; - } - - a { - display: inline-block; - width: 100%; - overflow: hidden; - } - - .svg-icon { - margin-right: 16px; - } - - .el-menu { - border: none; - height: 100%; - width: 100% !important; - } - - // menu hover - .submenu-title-noDropdown, - .el-submenu__title { - &:hover { - // background-color: $menuHover !important; - } - } - - .is-active>.el-submenu__title { - // color: $subMenuActiveText !important; - } - - & .nest-menu .el-submenu>.el-submenu__title, - & .el-submenu .el-menu-item { - // min-width: $sideBarWidth !important; - // background-color: $subMenuBg !important; - - &:hover { - // background-color: $subMenuHover !important; - } - } - } - - .hideSidebar { - .sidebar-container { - width: 54px !important; - } - - .main-container { - margin-left: 54px; - } - - .submenu-title-noDropdown { - padding: 0 !important; - position: relative; - - .el-tooltip { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - } - } - - .el-submenu { - overflow: hidden; - - &>.el-submenu__title { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - - .el-submenu__icon-arrow { - display: none; - } - } - } - - .el-menu--collapse { - .el-submenu { - &>.el-submenu__title { - &>span { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - } - } - } - } - } - - .el-menu--collapse .el-menu .el-submenu { - // min-width: $sideBarWidth !important; - } - - // mobile responsive - .mobile { - .main-container { - margin-left: 0px; - } - - .sidebar-container { - transition: transform .28s; - // width: $sideBarWidth !important; - } - - &.hideSidebar { - .sidebar-container { - pointer-events: none; - transition-duration: 0.3s; - // transform: translate3d(-$sideBarWidth, 0, 0); - } - } - } - - .withoutAnimation { - - .main-container, - .sidebar-container { - transition: none; - } - } -} - -// when menu collapsed -.el-menu--vertical { - &>.el-menu { - .svg-icon { - margin-right: 16px; - } - } - - .nest-menu .el-submenu>.el-submenu__title, - .el-menu-item { - &:hover { - // you can use $subMenuHover - // background-color: $menuHover !important; - } - } - - // the scroll bar appears when the subMenu is too long - >.el-menu--popup { - max-height: 100vh; - overflow-y: auto; - - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } - } -} diff --git a/src/views/OperationalOverview/styles/transition.scss b/src/views/OperationalOverview/styles/transition.scss deleted file mode 100644 index 4cb27cc8..00000000 --- a/src/views/OperationalOverview/styles/transition.scss +++ /dev/null @@ -1,48 +0,0 @@ -// global transition css - -/* fade */ -.fade-enter-active, -.fade-leave-active { - transition: opacity 0.28s; -} - -.fade-enter, -.fade-leave-active { - opacity: 0; -} - -/* fade-transform */ -.fade-transform-leave-active, -.fade-transform-enter-active { - transition: all .5s; -} - -.fade-transform-enter { - opacity: 0; - transform: translateX(-30px); -} - -.fade-transform-leave-to { - opacity: 0; - transform: translateX(30px); -} - -/* breadcrumb transition */ -.breadcrumb-enter-active, -.breadcrumb-leave-active { - transition: all .5s; -} - -.breadcrumb-enter, -.breadcrumb-leave-active { - opacity: 0; - transform: translateX(20px); -} - -.breadcrumb-move { - transition: all .5s; -} - -.breadcrumb-leave-active { - position: absolute; -} diff --git a/src/views/OperationalOverview/styles/variables.scss b/src/views/OperationalOverview/styles/variables.scss deleted file mode 100644 index e96d9af7..00000000 --- a/src/views/OperationalOverview/styles/variables.scss +++ /dev/null @@ -1,35 +0,0 @@ -// base color -$blue:#324157; -$light-blue:#3A71A8; -$red:#C03639; -$pink: #E65D6E; -$green: #30B08F; -$tiffany: #4AB7BD; -$yellow:#FEC171; -$panGreen: #30B08F; - -// sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 - -$menuBg:#304156; -$menuHover:#263445; - -$subMenuBg:#0B253F; -$subMenuHover:#001528; - -$sideBarWidth: 248px; - -// the :export directive is the magic sauce for webpack -// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass -:export { - menuText: $menuText; - menuActiveText: $menuActiveText; - subMenuActiveText: $subMenuActiveText; - // menuBg: $menuBg; - menuHover: $menuHover; - subMenuBg: $subMenuBg; - subMenuHover: $subMenuHover; - sideBarWidth: $sideBarWidth; -} diff --git a/src/views/report/glass/day.vue b/src/views/report/glass/day.vue index 36581b9b..76eaa955 100644 --- a/src/views/report/glass/day.vue +++ b/src/views/report/glass/day.vue @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ import inputTable from './inputTable.vue'; import { getCorePLList } from '@/api/base/coreProductionLine'; import moment from 'moment' import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' export default { components: { inputTable }, data() { @@ -223,30 +223,34 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩日原片生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩日原片生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) + }, }, }; diff --git a/src/views/report/glass/month.vue b/src/views/report/glass/month.vue index 4678920f..ddbb382d 100644 --- a/src/views/report/glass/month.vue +++ b/src/views/report/glass/month.vue @@ -30,7 +30,7 @@ import { getGlassPage, exportGlasscExcel } from '@/api/report/glass'; import inputTable from './inputTable.vue'; import { getCorePLList } from '@/api/base/coreProductionLine'; import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' export default { components: { inputTable }, data() { @@ -225,30 +225,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩月原片生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩月原片生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) } }, }; diff --git a/src/views/report/glass/weekly.vue b/src/views/report/glass/weekly.vue index 5bfcec71..2b167a9a 100644 --- a/src/views/report/glass/weekly.vue +++ b/src/views/report/glass/weekly.vue @@ -32,7 +32,7 @@ import { getGlassPage, exportGlasscExcel } from '@/api/report/glass'; import inputTable from './inputTable.vue'; import { getCorePLList } from '@/api/base/coreProductionLine'; import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' export default { components: { inputTable }, data() { @@ -288,30 +288,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩周原片生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩周原片生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) } }, }; diff --git a/src/views/report/glass/year.vue b/src/views/report/glass/year.vue index 3fd9aeaf..1d76ed21 100644 --- a/src/views/report/glass/year.vue +++ b/src/views/report/glass/year.vue @@ -27,7 +27,7 @@ import { getGlassPage, exportGlasscExcel } from '@/api/report/glass'; import inputTable from './inputTable.vue'; import { getCorePLList } from '@/api/base/coreProductionLine'; import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' export default { components: { inputTable }, data() { @@ -197,30 +197,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩年原片生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩年原片生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) } }, }; diff --git a/src/views/report/productionDayReport/index.vue b/src/views/report/productionDayReport/index.vue index 437cea52..23563c5c 100644 --- a/src/views/report/productionDayReport/index.vue +++ b/src/views/report/productionDayReport/index.vue @@ -1,7 +1,7 @@ @@ -177,7 +177,7 @@ import { // import Editor from '@/components/Editor'; import moment from 'moment'; import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' // import DialogForm from './dialogForm.vue'; import { getCorePLList } from '@/api/base/coreProductionLine'; // import basicPageMixin from '@/mixins/lb/basicPageMixin'; @@ -492,30 +492,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩日成品生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩日成品生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) }, // timeSelect() { // // switch (this.queryParams.timeDim) { diff --git a/src/views/report/productionMonthReport/index.vue b/src/views/report/productionMonthReport/index.vue index 2aeb6138..ccbf66e3 100644 --- a/src/views/report/productionMonthReport/index.vue +++ b/src/views/report/productionMonthReport/index.vue @@ -1,7 +1,7 @@ @@ -128,7 +128,7 @@ - + @@ -180,7 +180,7 @@ import moment from 'moment'; import { parseTime } from '../../core/mixins/code-filter'; import { getCorePLList } from '@/api/base/coreProductionLine' import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' // import basicPageMixin from '@/mixins/lb/basicPageMixin'; const tableProps = [ { @@ -470,30 +470,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩月成品生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩月成品生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) }, getCurrentMonthFirst() { const date = new Date(); diff --git a/src/views/report/productionWeekReport/index.vue b/src/views/report/productionWeekReport/index.vue index f907c3bf..55d75c3d 100644 --- a/src/views/report/productionWeekReport/index.vue +++ b/src/views/report/productionWeekReport/index.vue @@ -1,7 +1,7 @@ @@ -488,30 +488,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩周成品生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩周成品生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) }, startWeek() { // console.log(this.weekValue1); diff --git a/src/views/report/productionYearReport/index.vue b/src/views/report/productionYearReport/index.vue index 10a5842a..c0c81cec 100644 --- a/src/views/report/productionYearReport/index.vue +++ b/src/views/report/productionYearReport/index.vue @@ -1,7 +1,7 @@ @@ -185,7 +185,7 @@ import moment from 'moment'; import { parseTime } from '../../core/mixins/code-filter'; import { getCorePLList } from '@/api/base/coreProductionLine' import FileSaver from 'file-saver' -import * as XLSX from 'xlsx' +// import * as XLSX from 'xlsx' const tableProps = [ { // width: 128, @@ -422,30 +422,33 @@ export default { // 处理查询参数 var xlsxParam = { raw: true }; /* 从表生成工作簿对象 */ - var wb = XLSX.utils.table_to_book( - document.querySelector("#exportTable"), - xlsxParam - ); - /* 获取二进制字符串作为输出 */ - var wbout = XLSX.write(wb, { - bookType: "xlsx", - bookSST: true, - type: "array", - }); - try { - FileSaver.saveAs( - //Blob 对象表示一个不可变、原始数据的类文件对象。 - //Blob 表示的不一定是JavaScript原生格式的数据。 - //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 - //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 - new Blob([wbout], { type: "application/octet-stream" }), - //设置导出文件名称 - "许昌安彩年成品生产汇总.xlsx" + import('xlsx').then(excel => { + var wb = excel.utils.table_to_book( + document.querySelector("#exportTable"), + xlsxParam ); - } catch (e) { - if (typeof console !== "undefined") console.log(e, wbout); - } - return wbout; + /* 获取二进制字符串作为输出 */ + var wbout = excel.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array", + }); + try { + FileSaver.saveAs( + //Blob 对象表示一个不可变、原始数据的类文件对象。 + //Blob 表示的不一定是JavaScript原生格式的数据。 + //File 接口基于Blob,继承了 blob 的功能并将其扩展使其支持用户系统上的文件。 + //返回一个新创建的 Blob 对象,其内容由参数中给定的数组串联组成。 + new Blob([wbout], { type: "application/octet-stream" }), + //设置导出文件名称 + "许昌安彩年成品生产汇总.xlsx" + ); + } catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + //do something...... + }) }, // startYear() { // if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
- 开始时间 -
2021.1.26 13:30:21
- 班组名称 -
中班执行一组
- 原片投入(片) -
122
- 投入面积(㎡) -
12000
- 产品规格 -
110
- 执行工单 -
- 成品率 -
98.8%