1.修改风柜系统监测-定时开关机弹框高亮

2.修改主机详情-主机参数

src/assets/styles/index.scss

@@ -357,7 +357,7 @@ aside {
 }
 // 弹框内容超出高度滚动
 .dialog-content {
-  max-height: 500px; /* 设置最大高度，可根据实际情况调整 */
+  max-height: 600px; /* 设置最大高度，可根据实际情况调整 */
   overflow-y: auto; /* 当内容超出最大高度时，显示垂直滚动条 */
 }
 .intput-text {

src/views/aircAndWindc/awSysMonitor/index.vue

@@ -277,61 +277,73 @@
       title="定时开关机功能"
       :visible.sync="isOpenTimeSwitch"
       append-to-body
+      width="800px"
     >
-      <div class="device-container" v-loading="loading">
+      <div class="dialog-content">
-        <div class="device-li">
+        <div class="device-container" v-loading="loading">
-          <div class="device-name">定时名称</div>
+          <div class="device-li">
-          <div class="device-name">定时开机</div>
+            <div class="device-name">定时名称</div>
-          <div class="device-name">定时关机</div>
+            <div class="device-name">定时开机</div>
-          <div class="device-name">启动状态</div>
+            <div class="device-name">定时关机</div>
-        </div>
+            <div class="device-name">启动状态</div>
-        <div class="device-li" v-for="(item, index) in delayList" :key="index">
-          <div class="device-name">{{ item.name }}</div>
-          <div class="device-name">
-            <el-input
-              size="mini"
-              v-model="item.delayOpenHour"
-              @keyup.enter.native="handleSwitchEnter(item, 'openHour', $event)"
-              @input="handleSwitchInput(item, 'delayOpenHour', 'hour')"
-            ></el-input>
-            <div class="slip">:</div>
-            <el-input
-              size="mini"
-              v-model="item.delayOpenMinute"
-              @keyup.enter.native="
-                handleSwitchEnter(item, 'openMinute', $event)
-              "
-              @input="handleSwitchInput(item, 'delayOpenMinute', 'minute')"
-            ></el-input>
-          </div>
-          <div class="device-name">
-            <el-input
-              size="mini"
-              v-model="item.delayCloseHour"
-              @keyup.enter.native="handleSwitchEnter(item, 'closeHour', $event)"
-              @input="handleSwitchInput(item, 'delayCloseHour', 'hour')"
-            ></el-input>
-            <div class="slip">:</div>
-            <el-input
-              size="mini"
-              v-model="item.delayCloseMinute"
-              @keyup.enter.native="
-                handleSwitchEnter(item, 'closeMinute', $event)
-              "
-              @input="handleSwitchInput(item, 'delayCloseMinute', 'minute')"
-            ></el-input>
           </div>
-          <div class="device-name">
+          <div
-            <el-switch
+            class="device-li"
-              style="display: block"
+            v-for="(item, index) in delayList"
-              active-color="#13ce66"
+            :key="index"
-              inactive-color="#ff4949"
+            :class="{ highlight: item.name.includes(currentWeekday) }"
-              active-text="开启"
+          >
-              inactive-text="停用"
+            <div class="device-name">{{ item.name }}</div>
-              v-model="item.delayStatus"
+            <div class="device-name">
-              @change="handleSwitchStatus(item)"
+              <el-input
-            >
+                size="mini"
-            </el-switch>
+                v-model="item.delayOpenHour"
+                @keyup.enter.native="
+                  handleSwitchEnter(item, 'openHour', $event)
+                "
+                @input="handleSwitchInput(item, 'delayOpenHour', 'hour')"
+              ></el-input>
+              <div class="slip">:</div>
+              <el-input
+                size="mini"
+                v-model="item.delayOpenMinute"
+                @keyup.enter.native="
+                  handleSwitchEnter(item, 'openMinute', $event)
+                "
+                @input="handleSwitchInput(item, 'delayOpenMinute', 'minute')"
+              ></el-input>
+            </div>
+            <div class="device-name">
+              <el-input
+                size="mini"
+                v-model="item.delayCloseHour"
+                @keyup.enter.native="
+                  handleSwitchEnter(item, 'closeHour', $event)
+                "
+                @input="handleSwitchInput(item, 'delayCloseHour', 'hour')"
+              ></el-input>
+              <div class="slip">:</div>
+              <el-input
+                size="mini"
+                v-model="item.delayCloseMinute"
+                @keyup.enter.native="
+                  handleSwitchEnter(item, 'closeMinute', $event)
+                "
+                @input="handleSwitchInput(item, 'delayCloseMinute', 'minute')"
+              ></el-input>
+            </div>
+            <div class="device-name">
+              <el-switch
+                style="display: block"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                active-text="开启"
+                inactive-text="停用"
+                v-model="item.delayStatus"
+                @change="handleSwitchStatus(item)"
+              >
+              </el-switch>
+            </div>
           </div>
         </div>
       </div>
@@ -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 {

src/views/centerairC/sysMonitor/hostDetails.vue

@@ -114,23 +114,21 @@
           </div>
           <div class="hostStatus">
             <div class="hostStatus-li">
-              <span>手自动切换:</span>
+              <span>远程开关机:</span>
-              <span class="automaticData">{{ automaticObj.showValue }}</span>
+              <span class="automaticData">{{ onOffObj.curValue }}</span>
             </div>
             <div class="hostStatus-li">
-              <span>本地远程状态:</span>
+              <span>运行累计时间:</span>
-              <span class="dotData">{{ localObj.showValue }}</span>
+              <span class="timeData">{{ timeObj.curValue }}小时</span>
             </div>
             <div class="hostStatus-li">
-              <span>故障状态:</span>
+              <span>本地出水温度设定值:</span>
-              <span class="goodData" v-if="badObj.showValue === '正常'">{{
+              <span class="dotData">{{ coldWaterSetObj.curValue }}℃</span>
-                badObj.showValue
-              }}</span>
-              <span class="badData" v-else>{{ badObj.showValue }}</span>
             </div>
             <div class="hostStatus-li">
-              <span>运行累计时间:</span>
+              <span>远程出水温度设定值:</span>
-              <span class="timeData">{{ timeObj.showValue }}小时</span>
+              <span class="goodData">{{ coldWaterControlObj.curValue }}℃</span>
+              <!-- <span class="badData" v-else>{{ coldWaterControlObj.curValue }}</span> -->
             </div>
           </div>
           <!-- 负载 -->
@@ -269,10 +267,10 @@ export default {
       condenserPre: "", //冷凝器压力
       evaporatorPre: "", //蒸发器压力
       rightHostData: [], //右
-      automaticObj: {}, //手自动状态
+      onOffObj: {}, //远程开关机
-      localObj: {}, //本地远程状态
-      badObj: {}, //故障状态
       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") {
+                if (
-                  // 运行状态
+                  item.paramType === "2" &&
-                  item.showValue =
+                  item.otherName.includes("手动启停")
-                    Number(item.curValue) === 0 ? "自动" : "手动";
+                ) {
-                  this.automaticObj = item;
+                  // 远程开关机-手动启停
-                } else if (item.paramType === "5") {
+                  // item.showValue =
-                  // 故障状态
+                  //   Number(item.curValue) === 0 ? "自动" : "手动";
-                  item.showValue = item.curValue;
+                  this.onOffObj = item;
-                  this.badObj = item;
-                } else if (item.paramType === "22") {
-                  // 本地远程
-                  item.showValue =
-                    Number(item.curValue) === 0 ? "本地" : "远程";
-                  this.localObj = 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;
                 }
               });
             }