diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 564bf3e..3262f36 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -88,9 +88,9 @@ h6 { word-break: break-word; } -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; -} +// .el-dialog:not(.is-fullscreen) { +// margin-top: 6vh !important; +// } .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body { overflow: auto; diff --git a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue index fd351b1..f4e98dc 100644 --- a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue +++ b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue @@ -125,23 +125,37 @@
P7
P8
P9
-
P10
+
P11
-
P12
-
T1
+ +
T2
T3
T4
T5
T6
-
T7
-
热量表1
-
热量表2
-
热量表3
-
热量表4
-
热量表5
-
热量表6
-
热量表7
+ +
+ 热量表1 +
+
+ 热量表2 +
+
+ 热量表3 +
+
+ 热量表4 +
+
+ 热量表5 +
+
+ 热量表6 +
+
+ 热量表7 +
{{ getTemPreData(pressureArr, "9号压力传感器") }}bar
-
+
{{ getTemPreData(pressureArr, "11号压力传感器") }}bar
-
+ + -
{{ getTemPreData(temArr, "1号温度传感器") }}℃
+
{{ getTemPreData(temArr, "2号温度传感器") }}℃
{{ getTemPreData(temArr, "3号温度传感器") }}℃
{{ getTemPreData(temArr, "4号温度传感器") }}℃
{{ getTemPreData(temArr, "5号温度传感器") }}℃
{{ getTemPreData(temArr, "6号温度传感器") }}℃
-
{{ getTemPreData(temArr, "7号温度传感器") }}℃
+ +
- {{ getHotMeterTemp(hotArrOne, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrOne, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrOne, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrOne, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrOne, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrOne, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(hotArrTwo, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrTwo, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrTwo, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrTwo, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrTwo, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrTwo, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(hotArrThree, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrThree, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrThree, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrThree, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrThree, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrThree, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(hotArrFour, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrFour, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrFour, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrFour, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrFour, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrFour, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(hotArrFive, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrFive, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrFive, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrFive, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrFive, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrFive, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(hotArrSix, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrSix, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrSix, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrSix, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrSix, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrSix, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(hotArrSix, "进水温度",12) }}℃ + {{ getHotMeterTemp(hotArrSeven, "进水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrSix, "出水温度",12) }}℃ + {{ getHotMeterTemp(hotArrSeven, "出水温度", 12) }}℃
- {{ getHotMeterTemp(hotArrSix, "瞬时热量",47) }}kwh + {{ getHotMeterTemp(hotArrSeven, "瞬时热量", 47) }}kw
- {{ getHotMeterTemp(valveOneArr, "开度反馈",4) }}% + {{ getHotMeterTemp(valveOneArr, "开度反馈", 4) }}%
- {{ getHotMeterTemp(valveTwoArr, "开度反馈",4) }}% + {{ getHotMeterTemp(valveTwoArr, "开度反馈", 4) }}%
+ + +
+
+
进水温度:
+
+ {{ getHotMeterTemp(hotDialogArr, "进水温度", 12) }}℃ +
+
+
+
出水温度:
+
+ {{ getHotMeterTemp(hotDialogArr, "出水温度", 12) }}℃ +
+
+
+
瞬时热量:
+
+ {{ getHotMeterTemp(hotDialogArr, "瞬时热量", 47) }}kw +
+
+
+
瞬时流量小时:
+
+ {{ getHotMeterTemp(hotDialogArr, "瞬时流量", 31) }}m³/h +
+
+
+
@@ -313,6 +364,10 @@ export default { hotArrSeven: [], //热量表7数据 valveOneArr: [], //二通阀门开度 valveTwoArr: [], //三通阀门开度 + + openHotDialog: false, + controlTitle: "热量表", + hotDialogArr: [], }; }, computed: { @@ -538,7 +593,7 @@ export default { console.log("热量表7数据:", this.hotArrSeven); }, // 获取热量表的温度值(进水温度/出水温度) 阀门开度反馈 - getHotMeterTemp(arr, type,id) { + getHotMeterTemp(arr, type, id) { if (!arr || !Array.isArray(arr)) return null; // 查找对应类型的温度数据 @@ -697,6 +752,14 @@ export default { // this.exitFullscreen(); this.$router.push("/alarm/alarmRecord"); }, + // 热量表弹框 + hotListData(arr, title) { + this.hotDialogArr = []; + this.controlTitle = title; + this.hotDialogArr = arr; + console.log("当前热量表数据", this.hotDialogArr); + this.openHotDialog = true; + }, }, }; @@ -1299,6 +1362,7 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; } .h2 { top: 3.15rem; @@ -1307,6 +1371,7 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; } .h3 { top: 4.25rem; @@ -1315,6 +1380,7 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; } .h4 { top: 5rem; @@ -1323,6 +1389,7 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; } .h5 { top: 7.9rem; @@ -1331,6 +1398,7 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; } .h6 { top: 8.35rem; @@ -1339,6 +1407,7 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; } .h7 { top: 5.5rem; @@ -1347,6 +1416,33 @@ export default { font-size: 0.16rem; padding: 0.06rem; border: 0.01rem dashed #646866; + cursor: pointer; + } + } +} +.hot-list { + display: flex; + flex-direction: column; + margin-left: 50px; + .hot-data { + display: flex; + flex-direction: row; + align-items: center; + margin-bottom: 10px; + .hot-text { + // text-align: center; + margin-right: 8px; + width: 100px; + } + .hot-details { + background-color: #1960a3; + border-radius: 10px; + padding: 8px 10px; + font-size: 16px; + width: 120px; + text-align: center; + font-weight: bold; + letter-spacing: 0.1em; } } }