From d647dc0448ded5d750d325a8deaaf7ed3547b433 Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 20 Dec 2023 17:01:40 +0800 Subject: [PATCH 01/19] update --- src/views/specialEquipment/maintain/Record.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue index bf33d9a0..be4d1309 100644 --- a/src/views/specialEquipment/maintain/Record.vue +++ b/src/views/specialEquipment/maintain/Record.vue @@ -195,18 +195,21 @@ export default { { id: 3, name: '特种设备' }, ], filterable: true, + defaultSelect: null }, { type: 'select', label: '设备', placeholder: '请选择设备', param: 'equipmentId', + defaultSelect: null }, { type: 'select', label: '计划名称', placeholder: '请选择计划名称', param: 'maintainPlanId', + defaultSelect: null }, // 开始结束时间 { @@ -220,6 +223,7 @@ export default { endPlaceholder: '结束日期', defaultTime: ['00:00:00', '23:59:59'], param: 'startTime', + defaultSelect: null // width: 350, }, { @@ -229,6 +233,7 @@ export default { { name: '是', id: 1 }, { name: '否', id: 2 }, ], + defaultSelect: null, param: 'relatePlan', }, { @@ -434,12 +439,16 @@ export default { created() { this.initSearchBar(); if (this.$route.query) { + this.queryParams.specialType = + this.$route.query?.specialType ?? undefined; this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined; this.queryParams.maintainPlanId = this.$route.query?.maintainPlanId ?? undefined; this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined; this.queryParams.startTime = this.$route.query?.createTime ?? undefined; + this.searchBarFormConfig[0].defaultSelect = + this.$route.query.specialType ?? undefined; this.searchBarFormConfig[1].defaultSelect = this.$route.query.equipmentId ?? undefined; this.searchBarFormConfig[2].defaultSelect = From 5974e7026e7dc872a0b26be0ec60940ed7499ff9 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 21 Dec 2023 10:26:56 +0800 Subject: [PATCH 02/19] update kiln databorad --- src/views/databoard/kiln/index.vue | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue index 6d005504..12eef32c 100644 --- a/src/views/databoard/kiln/index.vue +++ b/src/views/databoard/kiln/index.vue @@ -6,18 +6,7 @@ --> diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue index f57f84de..2f8baf7c 100644 --- a/src/views/databoard/components/ISRAChart.vue +++ b/src/views/databoard/components/ISRAChart.vue @@ -11,9 +11,11 @@ diff --git a/src/views/databoard/kiln/GasHandle.vue b/src/views/databoard/kiln/GasHandle.vue index 7de6c616..c719f9a2 100644 --- a/src/views/databoard/kiln/GasHandle.vue +++ b/src/views/databoard/kiln/GasHandle.vue @@ -21,7 +21,7 @@ 氧气含量 - 82% + 82%
一氧化氮

排放浓度

- 82% + 82%
二氧化硫

排放浓度

- 82% + 59mg/m³
二氧化氮

排放浓度

- 82% + 82%
-

+ style="margin-bottom: 10px; display: flex; align-items: center"> +

烟气趋势图

- +
- 总量 - 白班 - 夜班 + +
+ :options="['氧气含量', '二氧化硫', '一氧化氮', '二氧化氮']" />
-
+
@@ -118,7 +118,7 @@ import Container from '../components/Container.vue'; import ShadowRect from '../components/ShadowRect.vue'; import KilnLine from '../components/line'; -import Switcher from '../components/Switcher.vue'; +import Switcher from '../components/Switcher'; import SelectorBtnGroup from '../components/SelectorBtnGroup.vue'; import GasChart from '../components/GasChart.vue'; diff --git a/src/views/databoard/kiln/IsraCheck.vue b/src/views/databoard/kiln/IsraCheck.vue index 271c3fdd..a583f2f9 100644 --- a/src/views/databoard/kiln/IsraCheck.vue +++ b/src/views/databoard/kiln/IsraCheck.vue @@ -7,9 +7,10 @@ diff --git a/src/views/databoard/kiln/KilnInfo.vue b/src/views/databoard/kiln/KilnInfo.vue index c4341541..503c9dc8 100644 --- a/src/views/databoard/kiln/KilnInfo.vue +++ b/src/views/databoard/kiln/KilnInfo.vue @@ -17,22 +17,37 @@ grid-auto-rows: auto; gap: 8px; "> - - - {{ info.name }} - - - {{ info.value }} - - + + 窑炉压力: + {{ kilnInfoMsg?.kilnPressure }} + + + 循环水温度: + {{ kilnInfoMsg?.waterTemp }} + + + 循环水流量: + {{ kilnInfoMsg?.waterFlow }} + + + 循环水压力: + {{ kilnInfoMsg?.waterPressure }} + + + 助燃风压力: + {{ kilnInfoMsg?.combustionAirPressure }} + + + 碹顶加权温度: + {{ kilnInfoMsg?.topTemp }} + + + 压缩气压力: + {{ kilnInfoMsg?.compressedAirPressure }} + + + 熔化加权温度: + {{ kilnInfoMsg?.meltTemp }}
@@ -48,24 +63,26 @@ export default { props: {}, data() { return { - kilnInfo: [ - { name: '窑炉压力', value: '83Kpa' }, - { name: '循环水温度', value: '53℃' }, - { name: '循环水流量', value: '23m³/h' }, - { name: '循环水压力', value: '33Kpa' }, - { name: '助燃风压力', value: '12Kpa' }, - { name: '碹顶加权温度', value: '32℃' }, - { name: '压缩气压力', value: '83Kpa' }, - { name: '融化加权温度', value: '123℃' }, - ], }; }, - computed: {}, + computed: { + kilnInfoMsg() { + return this.$store.state.websocket.kilnInfo + } + }, methods: {}, }; diff --git a/src/views/databoard/kiln/LeftFour.vue b/src/views/databoard/kiln/LeftFour.vue index 14028e92..8ce225ff 100644 --- a/src/views/databoard/kiln/LeftFour.vue +++ b/src/views/databoard/kiln/LeftFour.vue @@ -12,7 +12,7 @@ display: grid; gap: 16px; grid-template-columns: 1fr 1fr; - grid-template-rows: 1fr 1fr; + grid-template-rows: 462px 462px; "> diff --git a/src/views/databoard/kiln/MaterialCost.vue b/src/views/databoard/kiln/MaterialCost.vue index 319dab01..e6aa548a 100644 --- a/src/views/databoard/kiln/MaterialCost.vue +++ b/src/views/databoard/kiln/MaterialCost.vue @@ -21,7 +21,7 @@ class="material" style=" flex: 1; - padding: 6px; + padding: 12px 6px 20px; display: flex; flex-direction: column; gap: 4px; @@ -31,7 +31,7 @@ 234 - + - 原料1/吨 - diff --git a/src/views/databoard/kiln/RightTwo.vue b/src/views/databoard/kiln/RightTwo.vue index 001e7116..7f628b19 100644 --- a/src/views/databoard/kiln/RightTwo.vue +++ b/src/views/databoard/kiln/RightTwo.vue @@ -8,7 +8,11 @@