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 dd465b2..9e52db6 100644 Binary files a/src/assets/images/usedEle/bg.png and b/src/assets/images/usedEle/bg.png differ diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue index 93dd3c2..3408ec0 100644 --- a/src/components/content/airInfo/AirInfo.vue +++ b/src/components/content/airInfo/AirInfo.vue @@ -3,8 +3,7 @@
-
风速进风:{{ 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 @@