- 自动开关机时间设置
+ /> -->
+
@@ -65,7 +65,7 @@
+ 
@@ -160,7 +166,7 @@
+
-
+
+
@@ -318,7 +324,7 @@ export default {
diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue
index bb6dbdc..7e3f463 100644
--- a/src/views/centerairC/sysMonitor/hostDetails.vue
+++ b/src/views/centerairC/sysMonitor/hostDetails.vue
@@ -596,91 +596,85 @@ export default {
let data = res.rows;
data.forEach((item) => {
if (item.mtType === "0") {
- // 主机参数
+ /** 所有主机参数(不过滤) */
this.hostData = item.list;
- // 主机参数分开两列
- this.leftHostData = [];
- this.rightHostData = [];
- // 筛选去掉特定 paramType 的数据
- // this.rightHostData = this.hostData.filter((item) => {
- // return !["2", "21", "20", "6", "5", "22", "26"].includes(
- // Number(item.paramType)
- // );
- // });
- this.rightHostData = this.hostData.filter((item) => {
- const specificParamTypes = [26];
- // 检查是否属于需要排除的特定 paramType
- const isSpecificParamType = specificParamTypes.includes(
- Number(item.paramType)
- );
- const isCombinedCondition0 =
- Number(item.paramType) === 2 &&
- item.otherName.includes("手动启停");
- // 检查是否满足 item.paramType 为 12 且 otherName 包含 "冷水控制设定值"
- const isCombinedCondition1 =
- Number(item.paramType) === 12 &&
- item.otherName.includes("冷水控制设定值");
- const isCombinedCondition2 =
- Number(item.paramType) === 12 &&
- item.otherName.includes("用户冷水设定值");
- const isCombinedCondition3 =
- Number(item.paramType) === 12 &&
- item.otherName.includes("冷冻水偏移值设置");
- // 返回 false 表示要排除该元素
- return (
- !isSpecificParamType &&
- !isCombinedCondition0 &&
- !isCombinedCondition1 &&
- !isCombinedCondition2 &&
- !isCombinedCondition3
- );
- });
- // 根据 ordernum 进行排序
- this.rightHostData.sort((a, b) => {
- return Number(a.orderNum) - Number(b.orderNum);
- });
+
+ /** 先处理左边面板需要提取的特定数据项 */
this.hostData.forEach((item) => {
- //左边主机参数 根据不同的 paramType 处理 showValue
if (
item.paramType === "22" &&
item.otherName.includes("远程启动信号")
) {
- // 远程开关机-手动启停
- // item.showValue =
- // Number(item.curValue) === 0 ? "自动" : "手动";
+ /** 远程开关机-手动启停 */
this.onOffObj = item;
} else if (item.paramType === "26") {
- // 累计运行时间
+ /** 累计运行时间 */
this.timeObj = item;
} else if (
item.paramType === "12" &&
item.otherName.includes("冷水控制设定值")
) {
- // 本地出水温度设定值
+ /** 本地出水温度设定值 */
this.coldWaterSetObj = item;
} else if (
item.paramType === "12" &&
item.otherName.includes("用户冷水设定值")
) {
- // 远程出水温度设定值
+ /** 远程出水温度设定值 */
this.coldWaterControlObj = item;
} else if (
item.paramType === "12" &&
item.otherName.includes("冷冻水偏移值设置")
) {
- // 远程出水温度设定值
+ /** 偏移值设定 */
this.offsetValuerControlObj = item;
- // 检查 curValue 属性是否存在且为有效的数字
if (
this.offsetValuerControlObj.curValue !== undefined &&
!isNaN(parseFloat(this.offsetValuerControlObj.curValue))
) {
- // 将 curValue 转换为整数并除以 10
+ /** 将 curValue 转换为整数并除以 10 */
this.offsetValuerControlObj.curValue =
parseInt(this.offsetValuerControlObj.curValue, 10) / 10;
}
}
});
+
+ /**
+ * 右侧主机参数需要排除的项配置
+ * 每一项格式：{ paramType: number, otherName?: string }
+ * - 只配置 paramType：排除该 paramType 的所有项
+ * - 同时配置 otherName：排除 paramType 匹配且 otherName 包含该字符串的项
+ * 如需新增过滤项，只需在数组中追加即可
+ */
+ const excludeList = [
+ { paramType: 22, otherName: "远程启动信号" },
+ { paramType: 26 }, //运行累计时间
+ { paramType: 12, otherName: "冷水控制设定值" },
+ { paramType: 12, otherName: "用户冷水设定值" },
+ { paramType: 12, otherName: "冷冻水偏移值设置" },
+ { paramType: 2, otherName: "冷水机组运行" },
+ { paramType: 1, otherName: "运行" },
+ { paramType: 5, otherName: "故障" },
+ { paramType: 20, }, //冷冻水流
+ { paramType: 21, },//冷却水流
+ { paramType: 28, },//负载
+ ];
+
+ /** 生成右侧主机参数：过滤掉排除项，再按 orderNum 排序 */
+ this.rightHostData = this.hostData
+ .filter((dataItem) => {
+ return !excludeList.some((rule) => {
+ const typeMatch =
+ Number(dataItem.paramType) === rule.paramType;
+ if (rule.otherName !== undefined) {
+ return (
+ typeMatch && dataItem.otherName.includes(rule.otherName)
+ );
+ }
+ return typeMatch;
+ });
+ })
+ .sort((a, b) => Number(a.orderNum) - Number(b.orderNum));
}
});
// 使用 filter 方法过滤掉 item 为 '0' 的对象
@@ -807,21 +801,22 @@ export default {
return true;
}
break;
- case "6": // 手自动切换
- if (item.curValue === "自动") {
- return true;
- }
- break;
- case "22": // 本地远程切换
- if (item.curValue === "远程") {
- return true;
- }
+ // case "6": // 手自动切换
+ // if (item.curValue === "自动") {
+ // return true;
+ // }
+ // break;
+ // case "22": // 本地远程切换
+ // if (item.curValue === "远程") {
+ // return true;
+ // }
break;
default:
return false;
break;
}
} else {
+ // 冷冻水流20，冷却水流21，如果curValue不为0，则返回true
if (item.paramType === paramType && Number(item.curValue) !== 0) {
return true;
}
@@ -1671,7 +1666,7 @@ export default {
rotateY(40deg);
}
.rightFan2 {
- z-index: 10;
+ z-index: 10;
position: absolute;
top: 2.4rem;
left: 4.2rem;
diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue
index 7caea68..a697d15 100644
--- a/src/views/centerairC/sysMonitor/monitorCenter.vue
+++ b/src/views/centerairC/sysMonitor/monitorCenter.vue
@@ -72,12 +72,12 @@
室外露点：
{{ weatherObj.dewPointTemp }}
℃
-
+ -->
@@ -1168,6 +1175,8 @@ export default {
// 冷却进出水温度
coolingInTem: "",
coolingOutTem: "",
+ // 冷却水流流量
+ coolingOutWater: "",
// 报警标志
isWarning: false,
@@ -2501,6 +2510,8 @@ export default {
this.coolingOutTem = item.collectValue;
} else if (item.collectName === "冷却回水温度") {
this.coolingInTem = item.collectValue;
+ } else if (item.collectName === "总冷却冷量计瞬时流量") {
+ this.coolingOutWater = item.collectValue;
} else if (item.collectName === "总冷量计瞬时流量") {
this.freezingOutWater = item.collectValue;
}
@@ -3285,6 +3296,14 @@ export default {
font-size: 0.16rem;
font-weight: bold;
}
+ .coolingOutWater {
+ z-index: 10;
+ position: absolute;
+ top: 3.5rem;
+ left: 5.85rem;
+ font-size: 0.16rem;
+ font-weight: bold;
+ }
.freezingInTem {
z-index: 10;
position: absolute;
@@ -4127,6 +4146,12 @@ export default {
border-top: 1px solid transparent;
border-bottom: 1px dashed #1a3f8f;
position: relative;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ span {
+ white-space: nowrap;
+ }
.deepColor {
display: inline-block;
margin: 0 0.1rem 0 0.05rem;
@@ -4142,8 +4167,8 @@ export default {
.performance {
position: absolute;
- top: 6.1rem !important;
- right: -0.6rem !important;
+ top: 5.7rem !important;
+ right: -0.72rem !important;
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -4151,7 +4176,7 @@ export default {
font-size: 0.16rem;
}
.perdformance-bg {
- width: 2.85rem;
+ width: 3rem;
z-index: 10;
display: flex;
flex-direction: column;
diff --git a/src/views/components/aircAndWindcMeter.vue b/src/views/components/aircAndWindcMeter.vue
index ed7c932..d8d6768 100644
--- a/src/views/components/aircAndWindcMeter.vue
+++ b/src/views/components/aircAndWindcMeter.vue
@@ -163,7 +163,7 @@ export default {
name: "风柜系统:",
data: [
{ value: this.chartData1, name: "运行数" },
- { value: this.chartData2, name: "停止数" },
+ { value: this.chartData2, name: "关闭数" },
],
itemStyle: {
color: function (params) {
@@ -177,7 +177,7 @@ export default {
{
data: [
{ value: this.chartData1, name: "运行数" },
- { value: this.chartData2, name: "停止数" },
+ { value: this.chartData2, name: "关闭数" },
],
},
],
@@ -268,7 +268,7 @@ export default {
name: "风柜系统:",
data: [
{ value: 0, name: "运行数" },
- { value: 0, name: "停止数" },
+ { value: 0, name: "关闭数" },
],
itemStyle: {
color: function (params) {
@@ -282,7 +282,7 @@ export default {
{
data: [
{ value: 0, name: "运行数" },
- { value: 0, name: "停止数" },
+ { value: 0, name: "关闭数" },
],
},
],
diff --git a/src/views/index.vue b/src/views/index.vue
index 2f85a7b..7f68de3 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -27,26 +27,26 @@
- 
-