diff --git a/src/assets/logo/xcac.png b/src/assets/logo/xcac.png new file mode 100644 index 00000000..907e32bd Binary files /dev/null and b/src/assets/logo/xcac.png differ diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index 4df69394..78d18bba 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -148,8 +148,8 @@ $base1px: 0.15vh; // 1px / 1080px; letter-spacing: calc(2 * 0.12vh); .cnbm_logo { - height: calc(40 * 0.12vh); - width: calc(40 * 0.12vh); + height: calc(144 * 0.12vh); + width: calc(160 * 0.12vh); position: relative; top: calc(8 * 0.12vh); right: calc(8 * 0.12vh); diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 0c4fcff1..3248ce17 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -86,8 +86,8 @@ - + @@ -117,6 +117,7 @@ v-for="file in form[col.prop]" :file="file" :key="file.fileUrl" + :disabled="disabled" @delete="!disabled && handleDeleteFile(file, col.prop)" /> @@ -142,6 +143,9 @@ function findMaxLabelWidth(rows) { if (!opt.label) return 0; if (opt.label.length > max) { max = opt.label.length; + if (opt.label.includes('(')) { + max = max - 3; + } } }); }); @@ -150,7 +154,7 @@ function findMaxLabelWidth(rows) { const uploadedFile = { name: 'UploadedFile', - props: ['file'], + props: ['file', 'disabled'], data() { return {}; }, @@ -195,13 +199,15 @@ const uploadedFile = { display: 'inline-block', }}> {this.file.fileName} - + {!this.disabled && ( + + )} ); }, diff --git a/src/views/cost/energyCostHis/index.vue b/src/views/cost/energyCostHis/index.vue index 952eb8f1..685896ac 100644 --- a/src/views/cost/energyCostHis/index.vue +++ b/src/views/cost/energyCostHis/index.vue @@ -30,6 +30,7 @@ import { } from '@/api/cost/costEneryAutoReport'; import { getEnergyTypeListAll } from '@/api/base/energyType'; import { publicFormatter } from '@/utils/dict'; +import moment from 'moment'; const tableProps = [ { @@ -79,9 +80,6 @@ export default { tableData: [], tableProps, drawerVisible: false, - listQuery: { - reportType: 2, - }, formConfig: [ { type: 'select', @@ -94,7 +92,6 @@ export default { ], param: 'reportType', filterable: true, - defaultSelect: 2, // 默认值 clearable: false, }, { @@ -109,7 +106,7 @@ export default { label: '时间范围', dateType: 'daterange', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd', rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', @@ -147,15 +144,25 @@ export default { this.listQuery.pageSize = 10; this.listQuery.reportType = val.reportType; this.listQuery.energyTypeId = val.energyTypeId; - this.listQuery.reportTime = val.searchTime ? val.searchTime : null; + this.listQuery.reportTime = val.searchTime + ? [ + moment(val.searchTime[0]).startOf('day').format('x'), + moment(val.searchTime[1]).endOf('day').format('x'), + ] + : null; this.getDataList(); break; case 'export': - const data = { - reportType: val.reportType, - energyTypeId: val.energyTypeId, - reportTime: val.searchTime ? val.searchTime : null - } + const data = { + reportType: val.reportType, + energyTypeId: val.energyTypeId, + reportTime: val.searchTime + ? [ + moment(val.searchTime[0]).startOf('day').format('x'), + moment(val.searchTime[1]).endOf('day').format('x'), + ] + : null, + }; this.handleExport(data); break; default: diff --git a/src/views/cost/rawMaterialConfig/index.vue b/src/views/cost/rawMaterialConfig/index.vue index 462fa142..2b1b33ae 100644 --- a/src/views/cost/rawMaterialConfig/index.vue +++ b/src/views/cost/rawMaterialConfig/index.vue @@ -70,7 +70,7 @@ const tableProps = [ }, { prop: 'dailyUse', - label: '单日消耗量(天)吨', + label: '单日消耗量(吨)', width: 130, }, { diff --git a/src/views/cost/rawMaterialCost/index.vue b/src/views/cost/rawMaterialCost/index.vue index fdeeb275..12759f01 100644 --- a/src/views/cost/rawMaterialCost/index.vue +++ b/src/views/cost/rawMaterialCost/index.vue @@ -30,6 +30,7 @@ import { } from '@/api/cost/costMaterialAutoReport'; import { getHotMaterialList } from '@/api/base/coreHotMaterial'; import { publicFormatter } from '@/utils/dict'; +import moment from 'moment'; const tableProps = [ { @@ -87,7 +88,7 @@ export default { label: '时间范围', dateType: 'daterange', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd', rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', @@ -140,8 +141,12 @@ export default { this.listQuery.pageSize = 10; this.listQuery.materialId = val.materialId; this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null; - this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null; - this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null; + this.listQuery.startTime = val.searchTime + ? moment(val.searchTime[0]).startOf('day').format('x') + : null; + this.listQuery.endTime = val.searchTime + ? moment(val.searchTime[1]).endOf('day').format('x') + : null; this.getDataList(); break; case 'export': diff --git a/src/views/cost/rawMaterialCostHis/index.vue b/src/views/cost/rawMaterialCostHis/index.vue index f865cf4b..2e22c970 100644 --- a/src/views/cost/rawMaterialCostHis/index.vue +++ b/src/views/cost/rawMaterialCostHis/index.vue @@ -30,6 +30,7 @@ import { } from '@/api/cost/costMaterialAutoReport'; import { getHotMaterialList } from '@/api/base/coreHotMaterial'; import { publicFormatter } from '@/utils/dict'; +import moment from 'moment'; const tableProps = [ { @@ -73,14 +74,11 @@ export default { return { urlOptions: { getDataListURL: getCostMaterialAutoReportPage, - exportURL: exportCostMaterialAutoReportExcel + exportURL: exportCostMaterialAutoReportExcel, }, tableData: [], tableProps, drawerVisible: false, - listQuery: { - reportType: 2, - }, formConfig: [ { type: 'select', @@ -93,7 +91,6 @@ export default { ], param: 'reportType', filterable: true, - defaultSelect: 2, // 默认值 clearable: false, }, { @@ -108,7 +105,7 @@ export default { label: '时间范围', dateType: 'daterange', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd', rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', @@ -146,13 +143,23 @@ export default { this.listQuery.pageSize = 10; this.listQuery.reportType = val.reportType; this.listQuery.materialId = val.materialId; - this.listQuery.times = val.searchTime ? val.searchTime : null; + this.listQuery.times = val.searchTime + ? [ + moment(val.searchTime[0]).startOf('day').format('x'), + moment(val.searchTime[1]).endOf('day').format('x'), + ] + : null; this.getDataList(); break; case 'export': this.listQuery.reportType = val.reportType; this.listQuery.materialId = val.materialId; - this.listQuery.times = val.searchTime ? val.searchTime : null; + this.listQuery.times = val.searchTime + ? [ + moment(val.searchTime[0]).startOf('day').format('x'), + moment(val.searchTime[1]).endOf('day').format('x'), + ] + : null; this.handleExport(); break; default: diff --git a/src/views/databoard/assets/bg.png b/src/views/databoard/assets/bg.png new file mode 100644 index 00000000..ad2afe91 Binary files /dev/null and b/src/views/databoard/assets/bg.png differ diff --git a/src/views/databoard/assets/flow.png b/src/views/databoard/assets/flow.png new file mode 100644 index 00000000..83d1774b Binary files /dev/null and b/src/views/databoard/assets/flow.png differ diff --git a/src/views/databoard/assets/full.png b/src/views/databoard/assets/full.png new file mode 100644 index 00000000..e777a601 Binary files /dev/null and b/src/views/databoard/assets/full.png differ diff --git a/src/views/databoard/assets/gas.png b/src/views/databoard/assets/gas.png new file mode 100644 index 00000000..e1d09d17 Binary files /dev/null and b/src/views/databoard/assets/gas.png differ diff --git a/src/views/databoard/assets/head.png b/src/views/databoard/assets/head.png new file mode 100644 index 00000000..6c189973 Binary files /dev/null and b/src/views/databoard/assets/head.png differ diff --git a/src/views/databoard/assets/high.png b/src/views/databoard/assets/high.png new file mode 100644 index 00000000..c1a50f3c Binary files /dev/null and b/src/views/databoard/assets/high.png differ diff --git a/src/views/databoard/assets/middle.png b/src/views/databoard/assets/middle.png new file mode 100644 index 00000000..d8694857 Binary files /dev/null and b/src/views/databoard/assets/middle.png differ diff --git a/src/views/databoard/assets/middle2.png b/src/views/databoard/assets/middle2.png new file mode 100644 index 00000000..d8694857 Binary files /dev/null and b/src/views/databoard/assets/middle2.png differ diff --git a/src/views/databoard/assets/move.png b/src/views/databoard/assets/move.png new file mode 100644 index 00000000..7dbd56d0 Binary files /dev/null and b/src/views/databoard/assets/move.png differ diff --git a/src/views/databoard/assets/short.png b/src/views/databoard/assets/short.png new file mode 100644 index 00000000..3331add6 Binary files /dev/null and b/src/views/databoard/assets/short.png differ diff --git a/src/views/databoard/components/Container.vue b/src/views/databoard/components/Container.vue new file mode 100644 index 00000000..e7985f05 --- /dev/null +++ b/src/views/databoard/components/Container.vue @@ -0,0 +1,97 @@ + + + + + + + diff --git a/src/views/databoard/components/DateBtnGroup.vue b/src/views/databoard/components/DateBtnGroup.vue new file mode 100644 index 00000000..290da3c8 --- /dev/null +++ b/src/views/databoard/components/DateBtnGroup.vue @@ -0,0 +1,84 @@ + + + + + + + diff --git a/src/views/databoard/components/GasChart.vue b/src/views/databoard/components/GasChart.vue new file mode 100644 index 00000000..3fec8ab3 --- /dev/null +++ b/src/views/databoard/components/GasChart.vue @@ -0,0 +1,150 @@ + + + + + + + diff --git a/src/views/databoard/components/Header.vue b/src/views/databoard/components/Header.vue new file mode 100644 index 00000000..ee87ff79 --- /dev/null +++ b/src/views/databoard/components/Header.vue @@ -0,0 +1,75 @@ + + + + + + + diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue new file mode 100644 index 00000000..f57f84de --- /dev/null +++ b/src/views/databoard/components/ISRAChart.vue @@ -0,0 +1,235 @@ + + + + + + + diff --git a/src/views/databoard/components/SelectorBtnGroup.vue b/src/views/databoard/components/SelectorBtnGroup.vue new file mode 100644 index 00000000..a4a889b4 --- /dev/null +++ b/src/views/databoard/components/SelectorBtnGroup.vue @@ -0,0 +1,69 @@ + + + + + + + diff --git a/src/views/databoard/components/ShadowRect.vue b/src/views/databoard/components/ShadowRect.vue new file mode 100644 index 00000000..c5cf9bc5 --- /dev/null +++ b/src/views/databoard/components/ShadowRect.vue @@ -0,0 +1,71 @@ + + + + + + + diff --git a/src/views/databoard/components/Switcher.vue b/src/views/databoard/components/Switcher.vue new file mode 100644 index 00000000..06a0a9c7 --- /dev/null +++ b/src/views/databoard/components/Switcher.vue @@ -0,0 +1,57 @@ + + + + + + + diff --git a/src/views/databoard/components/line.js b/src/views/databoard/components/line.js new file mode 100644 index 00000000..a078cb79 --- /dev/null +++ b/src/views/databoard/components/line.js @@ -0,0 +1,16 @@ +export default { + name: 'KilnLine', + props: ['horizontal'], + render: function (h) { + return ( +
+ ); + }, +}; diff --git a/src/views/databoard/kiln/EnergeCost.vue b/src/views/databoard/kiln/EnergeCost.vue new file mode 100644 index 00000000..4d121b4a --- /dev/null +++ b/src/views/databoard/kiln/EnergeCost.vue @@ -0,0 +1,101 @@ + + + + + + + diff --git a/src/views/databoard/kiln/EnergeTop.vue b/src/views/databoard/kiln/EnergeTop.vue new file mode 100644 index 00000000..214a2735 --- /dev/null +++ b/src/views/databoard/kiln/EnergeTop.vue @@ -0,0 +1,123 @@ + + + + + + + diff --git a/src/views/databoard/kiln/FanSequence.vue b/src/views/databoard/kiln/FanSequence.vue new file mode 100644 index 00000000..56bf99da --- /dev/null +++ b/src/views/databoard/kiln/FanSequence.vue @@ -0,0 +1,58 @@ + + + + + + + diff --git a/src/views/databoard/kiln/GasHandle.vue b/src/views/databoard/kiln/GasHandle.vue new file mode 100644 index 00000000..7de6c616 --- /dev/null +++ b/src/views/databoard/kiln/GasHandle.vue @@ -0,0 +1,176 @@ + + + + + + + diff --git a/src/views/databoard/kiln/IsraCheck.vue b/src/views/databoard/kiln/IsraCheck.vue new file mode 100644 index 00000000..271c3fdd --- /dev/null +++ b/src/views/databoard/kiln/IsraCheck.vue @@ -0,0 +1,84 @@ + + + + + + + diff --git a/src/views/databoard/kiln/KilnInfo.vue b/src/views/databoard/kiln/KilnInfo.vue new file mode 100644 index 00000000..c4341541 --- /dev/null +++ b/src/views/databoard/kiln/KilnInfo.vue @@ -0,0 +1,71 @@ + + + + + + + diff --git a/src/views/databoard/kiln/LeftFour.vue b/src/views/databoard/kiln/LeftFour.vue new file mode 100644 index 00000000..14028e92 --- /dev/null +++ b/src/views/databoard/kiln/LeftFour.vue @@ -0,0 +1,41 @@ + + + + + + + diff --git a/src/views/databoard/kiln/MaterialCost.vue b/src/views/databoard/kiln/MaterialCost.vue new file mode 100644 index 00000000..319dab01 --- /dev/null +++ b/src/views/databoard/kiln/MaterialCost.vue @@ -0,0 +1,58 @@ + + + + + + + diff --git a/src/views/databoard/kiln/RightTwo.vue b/src/views/databoard/kiln/RightTwo.vue new file mode 100644 index 00000000..001e7116 --- /dev/null +++ b/src/views/databoard/kiln/RightTwo.vue @@ -0,0 +1,37 @@ + + + + + + + diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue new file mode 100644 index 00000000..6d005504 --- /dev/null +++ b/src/views/databoard/kiln/index.vue @@ -0,0 +1,70 @@ + + + + + + + diff --git a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue index a2f09855..4e551941 100644 --- a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue +++ b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue @@ -116,7 +116,7 @@ style="position: absolute; top: -40px; right: 0"> - 添加属性 + 添加参数 - MES + 向世界先进水平挑战,为人类社会文明做贡献