1.处理中央空调-系统监测页面样式，添加冷冻泵冷却泵的频率

2.处理能源管理-能源分析-机房能耗页面的数据异常问题

src/views/centerairC/enSourceAnalysis/components/machineRoom.vue

@@ -434,7 +434,7 @@ export default {
       this.listLoading = true;
       energyAnalyze(data).then((res) => {
         console.log("能源返回", res);
-        if (res.code == 200 && res.data.length > 0) {
+        if (res.code == 200 && res.data) {
           this.allDataArr = res.data.all;
           this.allDataArr = this.allDataArr.map((item) => {
             item.value = parseFloat(item.value);

src/views/centerairC/sysControl/index.vue

@@ -25,7 +25,7 @@
     </div>
     <!-- 非蝶阀控制列表 -->
     <div class="device-container">
-      <div class="device-li">
+      <!-- <div class="device-li">
         <div class="device-name">设备名称</div>
         <div class="device-name">运行状态</div>
         <div class="device-name">手动控制</div>
@@ -34,7 +34,8 @@
         <div class="device-name">故障报警</div>
         <div class="device-name">频率调节</div>
         <div class="device-name">频率反馈</div>
-      </div>
+      </div> -->
+      <list-header></list-header>
       <div class="device-li" v-for="(item, index) in deviceList" :key="index">
         <div class="device-name">{{ item.name }}</div>
         <div class="device-name">
@@ -163,32 +164,23 @@
 
 <script>
 import { operationList, operationConrol } from "@/api/centerairC/sysMonitor";
+import listHeader from "./listHeader.vue";
 export default {
+  components: { listHeader },
   name: "sysMonitor",
   data() {
     return {
       loading: false,
-      deviceList: [
+      deviceList: [], //全部
-        {
+      hostList: [], //主机
-          name: "",
+      coolingTowerFanList: [], //冷却塔风机
-          runStatus: "",
+      coolingPump: [], //冷却泵
-          controlText: "",
+      freezingPump: [], //冷冻泵
-          automaticText: "",
+      valveList: [], //阀
-          warnText: "",
-          frequencySet: "",
-          frequency: "",
-        },
-      ],
-      valveList: [
-        {
-          name: "",
-          openText: "",
-          openStatus: "",
-          closeText: "",
-          closeStatus: "",
-        },
-      ],
       total: null,
+      freezingValve: [], //冷冻蝶阀
+      coolingValve: [], //冷却蝶阀
+      coolingTowerOutValve: [], //冷却塔出水阀
     };
   },
   computed: {
@@ -376,6 +368,15 @@ export default {
               console.log("处理过的this.deviceList", this.deviceList);
               console.log("处理过的this.valveList", this.valveList);
               this.total = this.deviceList.length + this.valveList.length;
+
+              // 再分类不同的设备列表
+              this.hostList = [];
+              this.deviceList.forEach((list) => {
+                if (list.name.includes("机") && !list.name.includes("风")) {
+                  this.hostList.push(list);
+                }
+              });
+              console.log("处理过后的主机列表", this.hostList);
             } else {
               this.deviceList = [];
               this.valveList = [];

src/views/centerairC/sysControl/listHeader.vue

@@ -0,0 +1,92 @@
+<template>
+  <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 class="device-name">频率调节</div>
+      <div class="device-name">频率反馈</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped>
+.device-li {
+  flex: 1;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 12px 0;
+  color: #abcdfc;
+  border-bottom: 1px dashed #0349ac;
+  .device-name {
+    flex: 1;
+    white-space: nowrap;
+    .el-switch {
+      width: 120px !important;
+    }
+    .run {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      display: block;
+    }
+    .run::before {
+      content: "";
+      display: inline-block;
+      width: 10px;
+      height: 10px;
+      background-color: rgb(16, 231, 16);
+      border-radius: 50%;
+      margin-right: 5px;
+    }
+    .no-run {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      display: block;
+    }
+    .no-run::before {
+      content: "";
+      display: inline-block;
+      width: 10px;
+      height: 10px;
+      background-color: rgb(180, 180, 180);
+      border-radius: 50%;
+      margin-right: 5px;
+    }
+    .el-input {
+      width: 100px;
+    }
+    .strong-electric {
+      background-color: rgba(59, 130, 246, 0.2);
+      color: #60a5fa;
+      padding: 5px 20px;
+      border-radius: 10px;
+    }
+    .auto-electric {
+      background-color: rgba(231, 144, 45, 0.2);
+      color: #e47f21;
+      padding: 5px 20px;
+      border-radius: 10px;
+    }
+    .good-status {
+      color: #4ade80;
+    }
+    .bad-status {
+      color: #f05348;
+    }
+  }
+}
+.device-li:nth-child(1) {
+  color: #9ca3af;
+}
+</style>

src/views/centerairC/sysMonitor/index1.vue

@@ -873,15 +873,15 @@ export default {
 .monitor {
   width: 100%;
   .monitor-content {
-    width: 14rem;
+    width: 12.19rem;
     position: relative;
-    margin-left: calc((100% - 14rem) / 2);
+    margin-left: calc((100% - 12.19rem) / 2);
     .monitor-img {
       position: absolute;
-      top: 0.2rem;
+      top: 0rem;
-      left: calc((100% - 14rem) / 2);
+      left: calc((100% - 12.19rem) / 2);
-      width: 14rem;
+      width: 12.19rem;
-      height: 7.9rem;
+      height: 8.2rem;
       z-index: 1;
     }
     .fan-img1 {
@@ -1409,7 +1409,7 @@ export default {
 
   .performance {
     position: absolute;
-    top: 5.4rem !important;
+    top: 4.7rem !important;
     right: -1rem !important;
     display: flex;
     flex-direction: column;

src/views/centerairC/sysMonitor/lineChildren.vue

@@ -96,7 +96,7 @@ export default {
 .line {
   position: absolute;
   height: 1px;
-  background-color: rgba(0, 255, 255, 0.3);
+  background-color: rgba(0, 255, 255, 0.5);
   transform-origin: left center;
 }