diff --git a/.env.development b/.env.development
index 320989b..91a0a56 100644
--- a/.env.development
+++ b/.env.development
@@ -7,9 +7,11 @@ ENV = 'development'
# 开发环境
# VUE_APP_BASE_API = '/dev-api'
# 后台
-VUE_APP_BASE_API = 'http://192.168.1.222:8080'
+# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
# 梅州云端
# VUE_APP_BASE_API = 'http://106.55.173.225:8091'
+# 广合
+VUE_APP_BASE_API = 'http://106.55.173.225:8092'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue
index 76f75d5..fd351b1 100644
--- a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue
+++ b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue
@@ -203,81 +203,81 @@
{{ getTemPreData(temArr, "7号温度传感器") }}℃
- {{ getHotMeterTemp(hotArrOne, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrOne, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrOne, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrOne, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrOne, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrOne, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(hotArrTwo, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrTwo, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrTwo, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrTwo, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrTwo, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrTwo, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(hotArrThree, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrThree, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrThree, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrThree, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrThree, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrThree, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(hotArrFour, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrFour, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrFour, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrFour, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrFour, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrFour, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(hotArrFive, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrFive, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrFive, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrFive, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrFive, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrFive, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(hotArrSix, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrSix, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrSix, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrSix, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrSix, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrSix, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(hotArrSix, "进水温度") }}℃
+ {{ getHotMeterTemp(hotArrSix, "进水温度",12) }}℃
- {{ getHotMeterTemp(hotArrSix, "出水温度") }}℃
+ {{ getHotMeterTemp(hotArrSix, "出水温度",12) }}℃
- {{ getHotMeterTemp(hotArrSix, "瞬时热量") }}kwh
+ {{ getHotMeterTemp(hotArrSix, "瞬时热量",47) }}kwh
- {{ getHotMeterTemp(valveOneArr, "开度反馈") }}%
+ {{ getHotMeterTemp(valveOneArr, "开度反馈",4) }}%
- {{ getHotMeterTemp(valveTwoArr, "开度反馈") }}%
+ {{ getHotMeterTemp(valveTwoArr, "开度反馈",4) }}%
@@ -538,13 +538,13 @@ export default {
console.log("热量表7数据:", this.hotArrSeven);
},
// 获取热量表的温度值(进水温度/出水温度) 阀门开度反馈
- getHotMeterTemp(arr, type) {
+ getHotMeterTemp(arr, type,id) {
if (!arr || !Array.isArray(arr)) return null;
// 查找对应类型的温度数据
const item = arr.find((item) => {
if (!item || !item.collectName) return false;
- return item.collectName.includes(type);
+ return item.collectName.includes(type) && item.paramType == id;
});
if (!item) return null;
// console.log("当前匹配名称和值", item.collectName, item.collectValue);
@@ -974,7 +974,7 @@ export default {
}
.pres3 {
top: 5rem;
- left: 10.6rem;
+ left: 10.5rem;
color: #eaf12a;
}
.pres4 {
@@ -999,7 +999,7 @@ export default {
}
.pres8 {
top: 7.5rem;
- left: 2.8rem;
+ left: 2.6rem;
color: #eaf12a;
}
.pres9 {
@@ -1034,7 +1034,7 @@ export default {
}
.tem3 {
top: 5.27rem;
- left: 10.6rem;
+ left: 10.5rem;
color: #ef4317;
}
.tem4 {
@@ -1044,7 +1044,7 @@ export default {
}
.tem5 {
top: 7.49rem;
- left: 3.55rem;
+ left: 3.4rem;
color: #ef4317;
}
.tem6 {
@@ -1074,32 +1074,32 @@ export default {
}
.intem2 {
top: 3.25rem;
- left: 6.1rem;
+ left: 6rem;
color: #16cb64;
}
.outtem2 {
top: 2.35rem;
- left: 6.1rem;
+ left: 6rem;
color: #ef4317;
}
.nowhot2 {
top: 2.85rem;
- left: 6.1rem;
+ left: 6rem;
color: #ffffff;
}
.intem3 {
top: 4.7rem;
- left: 6.1rem;
+ left: 6rem;
color: #16cb64;
}
.outtem3 {
top: 3.9rem;
- left: 6.1rem;
+ left: 6rem;
color: #ef4317;
}
.nowhot3 {
top: 4.3rem;
- left: 6.1rem;
+ left: 6rem;
color: #ffffff;
}
.intem4 {
@@ -1124,7 +1124,7 @@ export default {
}
.outtem5 {
top: 7.7rem;
- left: 11.2rem;
+ left: 11.1rem;
color: #ef4317;
}
.nowhot5 {
@@ -1149,7 +1149,7 @@ export default {
}
.intem7 {
top: 6rem;
- left: 13.5rem;
+ left: 13.4rem;
color: #16cb64;
}
.outtem7 {
@@ -1164,7 +1164,7 @@ export default {
}
.valve1 {
top: 5.57rem;
- left: 10.6rem;
+ left: 10.5rem;
color: #ffffff;
cursor: pointer;
}
@@ -1234,7 +1234,7 @@ export default {
}
.p8 {
top: 7.72rem;
- left: 2.9rem;
+ left: 2.8rem;
color: #ffffff;
}
.p9 {
@@ -1279,7 +1279,7 @@ export default {
}
.t5 {
top: 7.72rem;
- left: 3.65rem;
+ left: 3.55rem;
color: #ffffff;
}
.t6 {
@@ -1302,7 +1302,7 @@ export default {
}
.h2 {
top: 3.15rem;
- left: 5.2rem;
+ left: 5.1rem;
color: #cecece;
font-size: 0.16rem;
padding: 0.06rem;
@@ -1310,7 +1310,7 @@ export default {
}
.h3 {
top: 4.25rem;
- left: 5.2rem;
+ left: 5.1rem;
color: #cecece;
font-size: 0.16rem;
padding: 0.06rem;