@@ -65,29 +69,43 @@
出水温度:
-
{{ getTemperatureData(boiler, '出水温度') }}℃
+
+ {{ getTemperatureData(boiler, "出水温度") }}℃
+
回水温度:
-
{{ getTemperatureData(boiler, '回水温度') }}℃
+
+ {{ getTemperatureData(boiler, "回水温度") }}℃
+
炉水温度:
-
{{ getTemperatureData(boiler, '炉水温度') }}℃
+
+ {{ getTemperatureData(boiler, "炉水温度") }}℃
+
烟道温度:
-
{{ getTemperatureData(boiler, '烟道温度') }}℃
+
+ {{ getTemperatureData(boiler, "烟道温度") }}℃
+
-
大火控制信号发出
-
小火控制信号发出
+
+ 大火控制信号发出
+
+
+ 小火控制信号发出
+
燃烧机电源
- 故障信息:{{ getFaultInfo(boiler) }}
+ 故障信息:{{
+ getFaultInfo(boiler)
+ }}
@@ -253,7 +271,7 @@ export default {
mounted() {
this.getAlarnStatus();
this.getDayData();
- // 获取当前热水锅炉数据
+ // 获取当前热水锅炉数据
this.getHotWaterBoiler();
},
beforeDestroy() {
@@ -265,117 +283,133 @@ export default {
methods: {
// Get temperature data by type (keep as is)
getTemperatureData(boiler, type) {
- if (!boiler || !boiler.values) return '--';
-
- const item = boiler.values.find(v => v.otherName && v.otherName.includes(type));
- return item && item.curValue !== null ? item.curValue : '--';
+ if (!boiler || !boiler.values) return "--";
+
+ const item = boiler.values.find(
+ (v) => v.otherName && v.otherName.includes(type)
+ );
+ return item && item.curValue !== null ? item.curValue : "--";
},
-
+
// Get fire signal class for individual signals
getFireSignalClass(boiler, signalType) {
- if (!boiler || !boiler.values) return 'port-close';
-
+ if (!boiler || !boiler.values) return "port-close";
+
// Get fire signal values
- const fire1Item = boiler.values.find(v => v.otherName && v.otherName.includes('火力1'));
- const fire2Item = boiler.values.find(v => v.otherName && v.otherName.includes('火力2'));
-
- const fire1Value = fire1Item && fire1Item.curValue !== null ? fire1Item.curValue : 0;
- const fire2Value = fire2Item && fire2Item.curValue !== null ? fire2Item.curValue : 0;
-
+ const fire1Item = boiler.values.find(
+ (v) => v.otherName && v.otherName.includes("火力1")
+ );
+ const fire2Item = boiler.values.find(
+ (v) => v.otherName && v.otherName.includes("火力2")
+ );
+
+ const fire1Value =
+ fire1Item && fire1Item.curValue !== null ? fire1Item.curValue : 0;
+ const fire2Value =
+ fire2Item && fire2Item.curValue !== null ? fire2Item.curValue : 0;
+
// Determine which signal should be open based on the logic:
// 大火: fire1=1 and fire2=1
// 小火: fire1=1 and fire2=0
- if (signalType === '大火' && fire1Value == 1 && fire2Value == 1) {
- return 'port-open';
- } else if (signalType === '小火' && fire1Value == 1 && fire2Value == 0) {
- return 'port-open';
+ if (signalType === "大火" && fire1Value == 1 && fire2Value == 1) {
+ return "port-open";
+ } else if (signalType === "小火" && fire1Value == 1 && fire2Value == 0) {
+ return "port-open";
} else {
- return 'port-close';
+ return "port-close";
}
},
-
+
// Get fire status text based on both fire signals (for other uses if needed)
getFireStatusText(boiler) {
- if (!boiler || !boiler.values) return '未开机';
-
- const fire1Item = boiler.values.find(v => v.otherName && v.otherName.includes('火力1'));
- const fire2Item = boiler.values.find(v => v.otherName && v.otherName.includes('火力2'));
-
- const fire1Value = fire1Item && fire1Item.curValue !== null ? fire1Item.curValue : 0;
- const fire2Value = fire2Item && fire2Item.curValue !== null ? fire2Item.curValue : 0;
-
+ if (!boiler || !boiler.values) return "未开机";
+
+ const fire1Item = boiler.values.find(
+ (v) => v.otherName && v.otherName.includes("火力1")
+ );
+ const fire2Item = boiler.values.find(
+ (v) => v.otherName && v.otherName.includes("火力2")
+ );
+
+ const fire1Value =
+ fire1Item && fire1Item.curValue !== null ? fire1Item.curValue : 0;
+ const fire2Value =
+ fire2Item && fire2Item.curValue !== null ? fire2Item.curValue : 0;
+
// If both are 0, boiler is off
if (fire1Value == 0 && fire2Value == 0) {
- return '无火信号';
+ return "无火信号";
}
// If fire1 is 1 and fire2 is 0, small fire
else if (fire1Value == 1 && fire2Value == 0) {
- return '小火控制信号发出';
+ return "小火控制信号发出";
}
// If both fire1 and fire2 are 1, big fire
else if (fire1Value == 1 && fire2Value == 1) {
- return '大火控制信号发出';
+ return "大火控制信号发出";
}
// Any other case
else {
- return '未开机';
+ return "未开机";
}
},
-
+
// Get fault information (placeholder implementation)
// Get fault information based on fault code
getFaultInfo(boiler) {
- if (!boiler || !boiler.values) return '无故障';
-
+ if (!boiler || !boiler.values) return "无故障";
+
// Find the fault item - you might need to adjust this based on actual data structure
- const faultItem = boiler.values.find(v => v.otherName && v.otherName.includes('故障'));
-
+ const faultItem = boiler.values.find(
+ (v) => v.otherName && v.otherName.includes("故障")
+ );
+
if (!faultItem || faultItem.curValue === null) {
- return '无故障';
+ return "无故障";
}
-
+
// Convert fault code to descriptive text
const faultCode = parseInt(faultItem.curValue);
-
+
switch (faultCode) {
case 0:
- return '无故障';
+ return "无故障";
case 1:
- return '炉水温度传感器故障';
+ return "炉水温度传感器故障";
case 2:
- return '出水温度传感器故障';
+ return "出水温度传感器故障";
case 3:
- return '回水温度传感器故障';
+ return "回水温度传感器故障";
case 4:
- return '锅炉水位极低';
+ return "锅炉水位极低";
case 5:
- return '燃烧机故障';
+ return "燃烧机故障";
case 6:
- return '炉水超温';
+ return "炉水超温";
case 7:
- return '循环水流故障';
+ return "循环水流故障";
case 9:
- return '定时时间到关机(正常关机模式)';
+ return "定时时间到关机(正常关机模式)";
case 11:
- return '烟道传感器故障';
+ return "烟道传感器故障";
case 12:
- return '烟道超温故障';
+ return "烟道超温故障";
case 13:
- return '检漏故障';
+ return "检漏故障";
default:
- return '未知故障';
+ return "未知故障";
}
},
// 获取热水锅炉数据
getHotWaterBoiler() {
let queryParams = {
- systemType: '3',
- type: '0',
+ systemType: "3",
+ type: "0",
};
- hotWaterBoiler(queryParams).then((res) => {
+ hotWaterBoiler(queryParams).then((res) => {
if (res.code == 200) {
console.log("热水锅炉数据", res.rows);
- if(res.rows.length > 0){
+ if (res.rows.length > 0) {
this.hotWaterBoilerData = res.rows;
} else {
this.hotWaterBoilerData = [];
@@ -447,7 +481,7 @@ export default {
}
.title-right {
width: 5.04rem;
- height: 0.61rem;
+ height: 0.78rem;
}
.sys-title {
position: absolute;
@@ -461,7 +495,7 @@ export default {
}
.nowTime {
position: absolute;
- top: 0.3rem;
+ top: 0.37rem;
right: 0.6rem;
font-size: 0.18rem;
color: #ffffff;
@@ -487,11 +521,11 @@ export default {
}
.icon_warning {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4.4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.25rem 0 0.27rem;
cursor: pointer;
/* 添加闪烁动画 */
@@ -507,21 +541,21 @@ export default {
}
.icon_home {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.2rem 0 0.27rem;
cursor: pointer;
}
.back-icon {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 3.7rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
cursor: pointer;
}
}
@@ -554,7 +588,7 @@ export default {
width: 100%;
padding: 0 0.25rem 0.15rem 0.7rem;
gap: 0.5rem; /* Add space between elements */
-
+
.hotWater-tem {
flex: 1; /* Allow to grow */
min-width: 35%; /* Minimum width */
diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue
index 96dd42b..11a4adf 100644
--- a/src/views/centerairC/sysMonitor/hostDetails.vue
+++ b/src/views/centerairC/sysMonitor/hostDetails.vue
@@ -142,7 +142,8 @@
"
@input="handleInput(offsetValuerControlObj.curValue)"
@blur="handleBlur()"
- >
℃
+
℃
@@ -801,7 +802,7 @@ export default {
}
.title-right {
width: 5.04rem;
- height: 0.61rem;
+ height: 0.78rem;
}
.sys-title {
position: absolute;
@@ -815,7 +816,7 @@ export default {
}
.nowTime {
position: absolute;
- top: 0.3rem;
+ top: 0.37rem;
right: 0.6rem;
font-size: 0.18rem;
color: #ffffff;
@@ -841,11 +842,11 @@ export default {
}
.icon_warning {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4.4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.25rem 0 0.27rem;
cursor: pointer;
/* 添加闪烁动画 */
@@ -861,21 +862,21 @@ export default {
}
.icon_home {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.2rem 0 0.27rem;
cursor: pointer;
}
.back-icon {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 3.7rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
cursor: pointer;
}
}
diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue
index 1350366..c860f83 100644
--- a/src/views/centerairC/sysMonitor/monitorCenter.vue
+++ b/src/views/centerairC/sysMonitor/monitorCenter.vue
@@ -2664,7 +2664,7 @@ export default {
}
.title-right {
width: 5.04rem;
- height: 0.61rem;
+ height: 0.78rem;
}
.sys-title {
position: absolute;
@@ -2678,7 +2678,7 @@ export default {
}
.nowTime {
position: absolute;
- top: 0.3rem;
+ top: 0.37rem;
right: 0.6rem;
font-size: 0.18rem;
color: #ffffff;
@@ -2704,11 +2704,11 @@ export default {
}
.icon_warning {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4.4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.25rem 0 0.27rem;
cursor: pointer;
/* 添加闪烁动画 */
@@ -2724,21 +2724,21 @@ export default {
}
.icon_home {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.2rem 0 0.27rem;
cursor: pointer;
}
.back-icon {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 3.7rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
cursor: pointer;
}
}
diff --git a/src/views/centerairC/sysMonitor/performance.vue b/src/views/centerairC/sysMonitor/performance.vue
index 4104b76..2bf0de4 100644
--- a/src/views/centerairC/sysMonitor/performance.vue
+++ b/src/views/centerairC/sysMonitor/performance.vue
@@ -397,7 +397,7 @@ import {
import { alarmRecordList } from "@/api/alarm/alarmRecord";
import titleImg from "./components/titleImg.vue";
import { format } from "@/utils/datetime";
-import PerformanceChart from './components/performanceChart.vue';
+import PerformanceChart from "./components/performanceChart.vue";
export default {
name: "sysControl",
components: { titleImg, PerformanceChart },
@@ -561,7 +561,7 @@ export default {
}
.title-right {
width: 5.04rem;
- height: 0.61rem;
+ height: 0.78rem;
}
.sys-title {
position: absolute;
@@ -575,7 +575,7 @@ export default {
}
.nowTime {
position: absolute;
- top: 0.3rem;
+ top: 0.37rem;
right: 0.6rem;
font-size: 0.18rem;
color: #ffffff;
@@ -601,11 +601,11 @@ export default {
}
.icon_warning {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4.4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.25rem 0 0.27rem;
cursor: pointer;
/* 添加闪烁动画 */
@@ -621,21 +621,21 @@ export default {
}
.icon_home {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.2rem 0 0.27rem;
cursor: pointer;
}
.back-icon {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 3.7rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
cursor: pointer;
}
}
@@ -669,7 +669,7 @@ export default {
height: 2.6rem;
margin-bottom: 0.1rem;
}
- .host-name{
+ .host-name {
position: absolute;
top: 0.8rem;
left: 1.6rem;
@@ -726,7 +726,7 @@ export default {
display: flex;
flex-direction: row;
justify-content: space-between;
- height:3rem;
+ height: 3rem;
// background-color: #217df5;
}
}
diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
index b2afe61..5709c71 100644
--- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
+++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
@@ -1069,7 +1069,7 @@ export default {
}
.title-right {
width: 5.04rem;
- height: 0.61rem;
+ height: 0.78rem;
}
.sys-title {
position: absolute;
@@ -1083,7 +1083,7 @@ export default {
}
.nowTime {
position: absolute;
- top: 0.3rem;
+ top: 0.37rem;
right: 0.6rem;
font-size: 0.18rem;
color: #ffffff;
@@ -1109,11 +1109,11 @@ export default {
}
.icon_warning {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4.4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.25rem 0 0.27rem;
cursor: pointer;
/* 添加闪烁动画 */
@@ -1129,21 +1129,21 @@ export default {
}
.icon_home {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.2rem 0 0.27rem;
cursor: pointer;
}
.back-icon {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 3.7rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
cursor: pointer;
}
}
diff --git a/src/views/temSys/temMonitor/index copy.vue b/src/views/temSys/temMonitor/index copy.vue
deleted file mode 100644
index 33ecc49..0000000
--- a/src/views/temSys/temMonitor/index copy.vue
+++ /dev/null
@@ -1,1021 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ node.label }}
-
-
-
-
-
-
-
-
-
-

-
位置:{{ currentName }}
-
-
-
-
- 高温报警:
- {{ warningData }}个
-
-
-
- 离线设备:
- {{ offlineData / 2 }}个
-
-
-
-
-
-
-
-
-
-

-

-
-
- {{ getDeviceByParamType(item.deviceList, "12").otherName }}
-
-
Temperature
-
-
-
- {{
- getDeviceByParamType(item.deviceList, "12").curValue
- }}
- ℃
-
-
-
-
-
-

-
-
- {{ getDeviceByParamType(item.deviceList, "32").otherName }}
-
-
Humidity
-
-
-
- {{
- getDeviceByParamType(item.deviceList, "32").curValue
- }}
- %
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/temSys/temMonitor/temMonitorDeatils.vue b/src/views/temSys/temMonitor/temMonitorDeatils.vue
index 8303f27..118ee0b 100644
--- a/src/views/temSys/temMonitor/temMonitorDeatils.vue
+++ b/src/views/temSys/temMonitor/temMonitorDeatils.vue
@@ -827,7 +827,7 @@ export default {
}
.title-right {
width: 5.04rem;
- height: 0.61rem;
+ height: 0.78rem;
}
.sys-title {
position: absolute;
@@ -841,7 +841,7 @@ export default {
}
.nowTime {
position: absolute;
- top: 0.3rem;
+ top: 0.37rem;
right: 0.6rem;
font-size: 0.18rem;
color: #ffffff;
@@ -867,11 +867,11 @@ export default {
}
.icon_warning {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4.4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.25rem 0 0.27rem;
cursor: pointer;
/* 添加闪烁动画 */
@@ -887,21 +887,21 @@ export default {
}
.icon_home {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 4rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
margin: 0 0.2rem 0 0.27rem;
cursor: pointer;
}
.back-icon {
position: absolute;
- top: 0.33rem;
+ top: 0.39rem;
right: 3.7rem;
z-index: 10;
- width: 0.3rem;
- height: 0.27rem;
+ width: 0.35rem;
+ height: 0.32rem;
cursor: pointer;
}
}