From 43c4aaa21d7249da758bebb8c23b25f188862fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 22 Dec 2023 16:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/largeScreen.js | 6 +- src/assets/images/usedEle/bg.png | Bin 3354 -> 8216 bytes src/components/content/airInfo/AirInfo.vue | 22 +-- src/components/content/fanInfo/FanInfo.vue | 23 +-- .../content/fanInfo/FanInfoItem.vue | 4 +- src/components/content/usedEle/UsedEle.vue | 154 +++++++----------- src/views/tunnel/index.vue | 2 +- 7 files changed, 74 insertions(+), 137 deletions(-) diff --git a/src/api/largeScreen.js b/src/api/largeScreen.js index 012f9c2..4747a04 100644 --- a/src/api/largeScreen.js +++ b/src/api/largeScreen.js @@ -21,10 +21,10 @@ export const getTunnelBySiteId = (siteId) => { method: 'get' }) } -// 风压echarts数据 +// 传感器echarts数据 export const getEchartsInfo = (equipmentId) => { return request({ - url: `/tunnel/large/screen/echarts/wind/pressure/${equipmentId}`, + url: `/tunnel/large/screen/echarts/sensor/${equipmentId}`, method: 'get' }) } @@ -34,4 +34,4 @@ export const getBadGasEchartsInfo = (tunnelId) => { url: `/tunnel/large/screen/echarts/gas/sensor/${tunnelId}`, method: 'get' }) -} \ No newline at end of file +} diff --git a/src/assets/images/usedEle/bg.png b/src/assets/images/usedEle/bg.png index dd465b2b6c19d82ddae20859f1dbafa9255d6fa3..9e52db64d083adbad637daa4db8f5f4097fd5805 100644 GIT binary patch literal 8216 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
-
风速进风：{{ windSpeed }}m/s
-
出风：{{ windSpeed }}m/s
+
风速{{ windSpeed }}m/s
{ if (item.equipmentType === "dust" || item.equipmentType === "oxygen" || item.equipmentType === "temperature" || item.equipmentType === "humidness") { airObj = changeData(item) airArr.push(airObj) - } else if (item.equipmentType === "windDirection") { + } else if (item.equipmentType === "windSpeed") { windSpeed.value = item.value } }) @@ -233,17 +232,6 @@ const initChart = () => { //配置项 series: [ { - name: '进风口', - data: [56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76, 69, 25, 31, 49, 81, 63], - type: 'line', - smooth: true, - symbolSize: 24, - lineStyle: { - width: 5 - } - }, - { - name: '出风口', data: [3, 85, 47, 92, 17, 76, 69, 25, 56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 31, 49, 81, 63], type: 'line', smooth: true, @@ -391,13 +379,13 @@ const initAirChart = () => { .fan-info { flex: 1; display: flex; - justify-content: space-between; + justify-content: flex-start; .input-fan { - margin: 0 26px; + //margin: 0 26px; > span:last-child { - margin-left: 30px; + margin-left: 25px; } } } diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index 702b7c8..ee584e7 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -92,22 +92,6 @@ const stateC = ref(false) watch(() => props.transducerData, (now) => { getTransData(now.frequencyChangerList) }, {deep: true}); -watch(() => props.list, (now) => { - transducerData.value.forEach(item => { - now.forEach(newItem => { - if (item.equipmentId === newItem.equipmentId) { - if (newItem.frequencyFeedback) { - item.frequencySetting = newItem.frequencySetting - item.frequencyFeedback = newItem.frequencyFeedback - } else if (newItem.phaseCurrentA) { - item.phaseCurrentA = newItem.phaseCurrentA - item.phaseCurrentB = newItem.phaseCurrentB - item.phaseCurrentC = newItem.phaseCurrentC - } - } - }) - }) -}, {deep: true}); watch(() => props.fanData, (now) => { getBasicData(now.frequencyChangerList) }, {deep: true}); @@ -129,9 +113,9 @@ watch(() => props.list, (now) => { item.frequencySetting = newItem.frequencySetting item.frequencyFeedback = newItem.frequencyFeedback } else if (newItem.phaseCurrentA) { - item.phaseCurrentA = newItem.phaseCurrentA - item.phaseCurrentB = newItem.phaseCurrentB - item.phaseCurrentC = newItem.phaseCurrentC + item.valueA = newItem.phaseCurrentA + item.valueB = newItem.phaseCurrentB + item.valueC = newItem.phaseCurrentC } } }) @@ -582,6 +566,7 @@ input[type="number"] { } .units { + z-index: 22; position: relative; } diff --git a/src/components/content/fanInfo/FanInfoItem.vue b/src/components/content/fanInfo/FanInfoItem.vue index 85c7b4a..8f12384 100644 --- a/src/components/content/fanInfo/FanInfoItem.vue +++ b/src/components/content/fanInfo/FanInfoItem.vue @@ -8,7 +8,7 @@
-
+
B相电流:{{params.wp.valueB}}A
@@ -17,7 +17,7 @@
-
+
C相电流:{{params.wp.valueC}}A
diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index b0536d9..786026d 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -1,13 +1,23 @@