1、冷源监测dialog添加固定；

2、冷源控制添加进出水阀门；
3、温湿度历史折线图优化；
4、温湿度实时监测总计离线优化；
5、生活热水样式优化；

src/views/centerairC/sysControl/index.vue

@@ -43,6 +43,12 @@
             @operationControl="hadleOperationConrol"
           ></vavleheader>
         </div>
+        <div class="device-container">
+          <vavleheader
+            :valveList="coolingAndHeatingOutValve"
+            @operationControl="hadleOperationConrol"
+          ></vavleheader>
+        </div>
       </el-tab-pane>
       <el-tab-pane label="冷却泵" name="coolingPump">
         <div class="device-container">
@@ -105,7 +111,8 @@ export default {
       total: null,
       freezingValve: [], //冷冻蝶阀
       coolingValve: [], //冷却蝶阀
-      coolingTowerOutValve: [], //冷却塔出水阀
+      coolingTowerOutValve: [], //冷却塔出水进水阀
+      coolingAndHeatingOutValve: [], //供冷供暖出水进水阀
       activeName: "valve", //设备管理
     };
   },
@@ -310,6 +317,7 @@ export default {
               this.freezingValve = [];
               this.coolingValve = [];
               this.coolingTowerOutValve = [];
+              this.coolingAndHeatingOutValve = [];
               this.deviceList.forEach((list) => {
                 if (list.name.includes("机") && !list.name.includes("风")) {
                   this.hostList.push(list);
@@ -334,6 +342,21 @@ export default {
                 if (list.name.includes("冷却塔出水阀")) {
                   this.coolingTowerOutValve.push(list);
                 }
+                if (list.name.includes("冷却塔进水阀")) {
+                  this.coolingTowerOutValve.push(list);
+                }
+                if (list.name.includes("供冷出水阀")) {
+                  this.coolingAndHeatingOutValve.push(list);
+                }
+                if (list.name.includes("供冷进水阀")) {
+                  this.coolingAndHeatingOutValve.push(list);
+                }
+                if (list.name.includes("供暖出水阀")) {
+                  this.coolingAndHeatingOutValve.push(list);
+                }
+                if (list.name.includes("供暖进水阀")) {
+                  this.coolingAndHeatingOutValve.push(list);
+                }
               });
               console.log("处理过后的主机列表", this.hostList);
             } else {

src/views/centerairC/sysMonitor/index.vue

@@ -482,7 +482,7 @@
       width="680px"
       append-to-body
     >
-      <el-table :data="alarmList">
+      <el-table :data="alarmList" height="600px">
         <el-table-column
           prop="otherName"
           label="报警位置"

src/views/hotWater/waterControl/index.vue

@@ -143,7 +143,7 @@
                     </div>
                   </div>
                   <div class="words-li">
-                    <div class="ash">启停控制:</div>
+                    <div class="ash">启&nbsp;停&nbsp;控&nbsp;制:</div>
                     <div class="white">
                       <el-switch
                         style="display: block"

src/views/temSys/temHistory/components/historyCharts.vue

@@ -27,6 +27,9 @@ export default {
       immediate: true, // 页面加载时立即触发一次监听
       handler(newVal, oldVal) {
         if (newVal) {
+          this.chartData1 = []; // 清空 chartData1
+          this.chartData2 = []; // 清空 chartData2
+          this.bottomData = []; // 清空 bottomData
           console.log("charts传值", newVal);
           let data = newVal;
           if (data.length > 0) {

src/views/temSys/temHistory/index.vue

@@ -68,7 +68,7 @@
             />
           </div>
         </div>
-        <div class="title">{{ timeDate[0] }}-{{ timeDate[1] }}温湿度数据</div>
+        <div class="title">{{ dayDate[0] }}至{{ dayDate[1] }}温湿度数据</div>
         <!-- 图表和表格可以自由切换 -->
         <history-charts
           v-if="item.showCharts"
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import { format2 } from "@/utils/datetime";
+import { format2,formatDay } from "@/utils/datetime";
 import { spaceTree } from "@/api/region";
 import { temHistory } from "@/api/temSys/temMonitor";
 import historyCharts from "./components/historyCharts.vue";
@@ -92,6 +92,7 @@ export default {
     return {
       loading: false,
       timeDate: [],
+      dayDate:[],
       // 查询参数
       queryParams: {
         systemType: "4",
@@ -133,6 +134,7 @@ export default {
       const start = new Date(new Date().setHours(0, 0, 0, 0));
       const end = new Date(new Date().setHours(23, 59, 59, 59));
       this.timeDate = [format2(start), format2(end)]; // 更新
+      this.dayDate = [formatDay(start), formatDay(end)];
     },
     getSysBuild() {
       spaceTree().then((res) => {

src/views/temSys/temMonitor/index.vue

@@ -47,7 +47,7 @@
           <div class="wanrn-li">
             <i class="el-icon-message-solid" style="color: #fa260a"></i>
             <span>离线设备:</span>
-            <span class="gray-text">{{ offlineData }}个</span>
+            <span class="gray-text">{{ offlineData/2 }}个</span>
           </div>
         </div>
       </div>