From 781cc7e59fd77d916e7c98c7686ac60dae010f5c Mon Sep 17 00:00:00 2001 From: selia-zx <1771203023@qq.com> Date: Tue, 10 Jun 2025 10:52:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A3=8E=E6=9F=9C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=9B=91=E6=B5=8B-=E5=AE=9A=E6=97=B6=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E6=9C=BA=E5=BC=B9=E6=A1=86=E9=AB=98=E4=BA=AE=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=9C=BA=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 2 +- src/views/aircAndWindc/awSysMonitor/index.vue | 171 ++++++++++++------ .../centerairC/sysMonitor/hostDetails.vue | 87 ++++++--- 3 files changed, 176 insertions(+), 84 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 471be88..7da9626 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -357,7 +357,7 @@ aside { } // 弹框内容超出高度滚动 .dialog-content { - max-height: 500px; /* 设置最大高度，可根据实际情况调整 */ + max-height: 600px; /* 设置最大高度，可根据实际情况调整 */ overflow-y: auto; /* 当内容超出最大高度时，显示垂直滚动条 */ } .intput-text { diff --git a/src/views/aircAndWindc/awSysMonitor/index.vue b/src/views/aircAndWindc/awSysMonitor/index.vue index 54ab96a..1441acb 100644 --- a/src/views/aircAndWindc/awSysMonitor/index.vue +++ b/src/views/aircAndWindc/awSysMonitor/index.vue @@ -277,61 +277,73 @@ title="定时开关机功能" :visible.sync="isOpenTimeSwitch" append-to-body + width="800px" > -
-
-
定时名称
-
定时开机
-
定时关机
-
启动状态
-
-
-
{{ item.name }}
-
- -
:
- -
-
- -
:
- +
+
+
+
定时名称
+
定时开机
+
定时关机
+
启动状态
-
- - +
+
{{ item.name }}
+
+ +
:
+ +
+
+ +
:
+ +
+
+ + +
@@ -381,6 +393,7 @@ export default { frequency: "v", isOpenTimeSwitch: false, delayList: [], + currentWeekday: "", }; }, watch: { @@ -412,6 +425,21 @@ export default { } }, }, + created() { + const weekdays = [ + "星期日", + "星期一", + "星期二", + "星期三", + "星期四", + "星期五", + "星期六", + ]; + const date = new Date(); + const dayIndex = date.getDay(); + this.currentWeekday = weekdays[dayIndex]; + console.log("今天是星期几", this.currentWeekday); + }, mounted() { this.getSysBuild(); }, @@ -1553,6 +1581,43 @@ export default { color: #9ca3af; } } +.highlight { + background-color: rgb(118, 134, 145) !important; /* 定义高亮的背景颜色 */ + color: #ffffff !important; + font-weight: bold; +} +.device-container .highlight .device-name .slip { + color: #ffffff !important; + font-weight: bold; +} +/* 为高亮行添加图片箭头 */ +.device-li.highlight::before { + content: ""; + background-image: url("../../../assets/images/step.png"); + background-size: contain; + background-repeat: no-repeat; + width: 30px; + height: 30px; + position: absolute; + left: 2px; /* 图片位置，根据实际情况调整 */ + top: 20%; + transform: translateY(-50%); + z-index: 999; + animation: moveRight 1s ease-in-out infinite alternate; +} +@keyframes moveRight { + 0% { + transform: translateX(0); /* 初始位置，不移动 */ + } + 100% { + transform: translateX(0.04rem); /* 向右移动 1rem 的距离 */ + } +} + +/* 确保 device-li 有相对定位 */ +.device-li { + position: relative; +} // 媒体查询，适配大于2000px分辨率的大屏样式 @media (min-width: 2000px) { .device-container { diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue index 7ae6760..05b3e67 100644 --- a/src/views/centerairC/sysMonitor/hostDetails.vue +++ b/src/views/centerairC/sysMonitor/hostDetails.vue @@ -114,23 +114,21 @@
- 手自动切换: - {{ automaticObj.showValue }} + 远程开关机: + {{ onOffObj.curValue }}
- 本地远程状态: - {{ localObj.showValue }} + 运行累计时间: + {{ timeObj.curValue }}小时
- 故障状态: - {{ - badObj.showValue - }} - {{ badObj.showValue }} + 本地出水温度设定值: + {{ coldWaterSetObj.curValue }}℃
- 运行累计时间: - {{ timeObj.showValue }}小时 + 远程出水温度设定值: + {{ coldWaterControlObj.curValue }}℃ +
@@ -269,10 +267,10 @@ export default { condenserPre: "", //冷凝器压力 evaporatorPre: "", //蒸发器压力 rightHostData: [], //右 - automaticObj: {}, //手自动状态 - localObj: {}, //本地远程状态 - badObj: {}, //故障状态 + onOffObj: {}, //远程开关机 timeObj: {}, //累计运行时间 + coldWaterSetObj: {}, //本地出水温度设定值 + coldWaterControlObj: {}, //远程出水温度设定值 compressorData1: [], //压缩机1参数 compressorData2: [], compressorData3: [], @@ -412,10 +410,34 @@ export default { 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) => { - return !["2", "21", "20", "6", "5", "22", "26"].includes( + 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("用户冷水设定值"); + // 返回 false 表示要排除该元素 + return ( + !isSpecificParamType && + !isCombinedCondition0 && + !isCombinedCondition1 && + !isCombinedCondition2 + ); }); // 根据 ordernum 进行排序 this.rightHostData.sort((a, b) => { @@ -423,24 +445,29 @@ export default { }); this.hostData.forEach((item) => { //左边主机参数 根据不同的 paramType 处理 showValue - if (item.paramType === "6") { - // 运行状态 - item.showValue = - Number(item.curValue) === 0 ? "自动" : "手动"; - this.automaticObj = item; - } else if (item.paramType === "5") { - // 故障状态 - item.showValue = item.curValue; - this.badObj = item; - } else if (item.paramType === "22") { - // 本地远程 - item.showValue = - Number(item.curValue) === 0 ? "本地" : "远程"; - this.localObj = item; + if ( + item.paramType === "2" && + item.otherName.includes("手动启停") + ) { + // 远程开关机-手动启停 + // item.showValue = + // Number(item.curValue) === 0 ? "自动" : "手动"; + this.onOffObj = item; } else if (item.paramType === "26") { // 累计运行时间 - item.showValue = item.curValue; 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; } }); }