diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 6654420..e522185 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -1397,17 +1397,10 @@
 .popup-result {
   border: 1px solid #0e5191 !important;
 }
-<<<<<<< HEAD
-.popup-result table span{
-  border: 1px solid #0e5191 !important;
-}
-.popup-result .title{
-=======
 .popup-result table span {
   border: 1px solid #0e5191 !important;
 }
 .popup-result .title {
->>>>>>> dev
   background: #405e7e !important;
 }
 .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
@@ -1415,13 +1408,6 @@
   border-right-color: transparent;
   border-left-color: transparent;
 }
-<<<<<<< HEAD
-.el-tabs--border-card > .el-tabs__header .el-tabs__item{
-  color: #c3cbd4;
-}
-.drawing-item:hover > .el-form-item, .drawing-row-item:hover > .el-form-item {
-  background: #b6b6b6 !important;
-=======
 .el-tabs--border-card > .el-tabs__header .el-tabs__item {
   color: #c3cbd4;
 }
@@ -1452,5 +1438,4 @@
   flex-direction: row;
   align-items: center;
   flex-wrap: nowrap;
->>>>>>> dev
 }
\ No newline at end of file
diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue
index a1c6a0e..48e5b85 100644
--- a/src/components/Crontab/index.vue
+++ b/src/components/Crontab/index.vue
@@ -104,27 +104,9 @@
       <CrontabResult :ex="crontabValueString"></CrontabResult>
 
       <div class="pop_btn">
-<<<<<<< HEAD
-        <div class="primary-btn">
-          <el-button size="small" type="primary" @click="submitFill"
-            >确定</el-button
-          >
-        </div>
-        <div class="warning-btn">
-          <el-button size="small" type="warning" @click="clearCron"
-            >重置</el-button
-          >
-        </div>
-        <div class="cancel-btn">
-          <el-button size="small" type="cancel" @click="hidePopup"
-            >取消</el-button
-          >
-        </div>
-=======
         <div class="primary-btn"><el-button size="small" type="primary" @click="submitFill">确定</el-button></div>
         <div class="warning-btn"><el-button size="small" type="warning" @click="clearCron">重置</el-button></div>
         <div class="cancel-btn"><el-button size="small" type="cancel" @click="hidePopup">取消</el-button></div>
->>>>>>> dev
       </div>
     </div>
   </div>
diff --git a/src/views/centerairC/sysMonitor/index.vue b/src/views/centerairC/sysMonitor/index.vue
index 2cc9476..fb61bdd 100644
--- a/src/views/centerairC/sysMonitor/index.vue
+++ b/src/views/centerairC/sysMonitor/index.vue
@@ -1,1522 +1,9 @@
 <template>
-<<<<<<< HEAD
-  <div class="monitor" v-loading="loading">
-    <div class="monitor-content">
-      <!-- logo -->
-      <img src="../../../assets/images/logo-3.png" class="sys-logo" alt="" />
-      <!-- 标题 -->
-      <div class="sys-title">铭汉高效冷源站管理系统</div>
-      <!-- 天气数据 -->
-      <div class="weather">
-        <div class="weather-li">
-          <span>室外温度：</span>
-          <span class="deepColor">{{ weatherObj.temperature }}</span>
-          <span>℃</span>
-        </div>
-        <div class="weather-li">
-          <span>室外湿度：</span>
-          <span class="deepColor">{{ weatherObj.humidity }}</span>
-          <span>%</span>
-        </div>
-        <div class="weather-li">
-          <span>室外含湿：</span>
-          <span class="deepColor">{{ weatherObj.humidityRatio }}</span>
-          <span>g/kg</span>
-        </div>
-        <div class="weather-li">
-          <span>室外焓值：</span>
-          <span class="deepColor">{{ weatherObj.enthalpy }}</span>
-          <span>kj/kg</span>
-        </div>
-        <div class="weather-li">
-          <span>室外露点：</span>
-          <span class="deepColor">{{ weatherObj.dewPointTemp }}</span>
-          <span>℃</span>
-        </div>
-        <div class="weather-li">
-          <span>室外湿球：</span>
-          <span class="deepColor">{{ weatherObj.wetBulbTemp }}</span>
-          <span>℃</span>
-        </div>
-      </div>
-      <!-- 系统性能数据 -->
-      <div class="performance">
-        <div class="title">系 统 性 能</div>
-        <div class="perdformance-bg">
-          <div class="weather-li">
-            <span>实时EER：</span>
-            <span class="deepColor">{{ performanceObj.realEER }}</span>
-            <span>kw/kw</span>
-          </div>
-          <div class="weather-li">
-            <span>实时功率：</span>
-            <span class="deepColor">{{ performanceObj.realPower }}</span>
-            <span>kw</span>
-          </div>
-          <div class="weather-li">
-            <span>实时冷量：</span>
-            <span class="deepColor">{{ performanceObj.realCold }}</span>
-            <span>kw</span>
-          </div>
-          <div class="weather-li">
-            <span>全年EER：</span>
-            <span class="deepColor">{{ performanceObj.yearEER }}</span>
-            <span>kw</span>
-          </div>
-          <div class="weather-li">
-            <span>全年用电：</span>
-            <span class="deepColor">{{ performanceObj.yearPower }}</span>
-            <span>kw/h</span>
-          </div>
-          <div class="weather-li">
-            <span>全年产冷：</span>
-            <span class="deepColor">{{ performanceObj.yearCold }}</span>
-            <span>kw</span>
-          </div>
-        </div>
-      </div>
-      <!-- 一键启停 -->
-      <div class="offClass" @click="handleOneKeyButton">
-        <div v-if="isShowOn" class="off-bg on-animation">ON</div>
-        <div v-else class="off-bg">OFF</div>
-      </div>
-      <!-- 系统提示 -->
-      <div class="sysTips" v-if="startOrStopStatus">
-        <img class="step" src="../../../assets/images/step.png" alt="" />
-        <div class="tips-text">{{ startOrStopStatus }}</div>
-      </div>
-      <!-- 整体图 -->
-      <img
-        class="monitor-img"
-        src="../../../assets/images/meizhou.png"
-        alt=""
-      />
-      <!-- 主机1数据定位 -->
-      <div class="hostName1" v-if="hostList.length > 0">
-        {{ hostList[0].deviceName }}
-      </div>
-      <div
-        class="hostStatus1"
-        :class="{ startClass: hostListControlClass(0) }"
-      ></div>
-      <img
-        class="host-img1"
-        v-if="hostListRunClass(0)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass: hostListRunClass(0) }"
-      />
-      <div class="hostLoad1" v-if="hostListRunClass(0) && hostListRunClass(0)">
-        {{ hostLoad0 }}
-      </div>
-      <div class="water-flow1">
-        <div class="water-flow-li">
-          <span>1#冷却水流:</span>
-          <span v-if="hostCoolingWaterFlowClass(0)">接通</span>
-          <span v-else>断开</span>
-          <span
-            class="break"
-            :class="{ connect: hostCoolingWaterFlowClass(0) }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>1#冷冻水流:</span>
-          <span v-if="hostCoolingWaterFlowClass(0)">接通</span>
-          <span v-else>断开</span>
-          <span
-            class="break"
-            :class="{ connect: hostFreezeWaterFlowClass(0) }"
-          ></span>
-        </div>
-      </div>
-      <line-children
-        :angle1="-0"
-        :angle2="-20"
-        :lineWidth1="200"
-        :lineWidth2="190"
-        class="host-line1"
-      ></line-children>
-      <!-- 主机2数据定位 -->
-      <div class="hostName2" v-if="hostList.length > 0">
-        {{ hostList[1].deviceName }}
-      </div>
-      <div
-        class="hostStatus2"
-        :class="{ startClass: hostListControlClass(1) }"
-      ></div>
-      <img
-        class="host-img2"
-        v-if="hostListRunClass(1)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass: hostListRunClass(1) }"
-      />
-      <div class="hostLoad2" v-if="hostListRunClass(1) && hostListRunClass(1)">
-        {{ hostLoad1 }}%
-      </div>
-      <div class="water-flow2">
-        <div class="water-flow-li">
-          <span>2#冷却水流:</span>
-          <span v-if="hostCoolingWaterFlowClass(1)">接通</span>
-          <span v-else>断开</span>
-          <span
-            class="break"
-            :class="{ connect: hostCoolingWaterFlowClass(1) }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>2#冷冻水流:</span>
-          <span v-if="hostCoolingWaterFlowClass(1)">接通</span>
-          <span v-else>断开</span>
-          <span
-            class="break"
-            :class="{ connect: hostFreezeWaterFlowClass(1) }"
-          ></span>
-        </div>
-      </div>
-      <line-children
-        :angle1="-0"
-        :angle2="-32"
-        :lineWidth1="250"
-        :lineWidth2="380"
-        class="host-line2"
-      ></line-children>
-      <!-- 主机3数据定位 -->
-      <div class="hostName3" v-if="hostList.length > 0">
-        {{ hostList[2].deviceName }}
-      </div>
-      <!-- 主机启停状态 -->
-      <div
-        class="hostStatus3"
-        :class="{ startClass: hostListControlClass(2) }"
-      ></div>
-      <!-- 主机运行状态 -->
-      <img
-        class="host-img3"
-        v-if="hostListRunClass(2)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass: hostListRunClass(2) }"
-      />
-      <!-- 主机负载 -->
-      <div class="hostLoad3" v-if="hostListRunClass(2) && hostListRunClass(2)">
-        {{ hostLoad2 }}%
-      </div>
-      <!-- 主机冷却冷冻水流信息 -->
-      <div class="water-flow3">
-        <div class="water-flow-li">
-          <span>3#冷却水流:</span>
-          <span v-if="hostCoolingWaterFlowClass(2)">接通</span>
-          <span v-else>断开</span>
-          <span
-            class="break"
-            :class="{ connect: hostCoolingWaterFlowClass(2) }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>3#冷冻水流:</span>
-          <span v-if="hostCoolingWaterFlowClass(2)">接通</span>
-          <span v-else>断开</span>
-          <span
-            class="break"
-            :class="{ connect: hostFreezeWaterFlowClass(2) }"
-          ></span>
-        </div>
-      </div>
-      <!-- 线+主机冷却水流状态 -->
-      <line-children
-        :angle1="-0"
-        :angle2="-39"
-        :lineWidth1="350"
-        :lineWidth2="530"
-        class="host-line3"
-      ></line-children>
-
-      <!-- 冷却泵数据定位 -->
-      <div class="coolingPump1">1#</div>
-      <div class="coolingPump2">2#</div>
-      <div class="coolingPump3">3#</div>
-      <div class="coolingPump4">4#</div>
-      <div class="coolingPump5">5#</div>
-      <!-- 运行状态 -->
-      <img
-        class="cooling-img1"
-        v-if="coolingPumpRunClass(0)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: coolingPumpRunClass(0) }"
-      />
-      <img
-        class="cooling-img2"
-        v-if="coolingPumpRunClass(1)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: coolingPumpRunClass(1) }"
-      />
-      <img
-        class="cooling-img3"
-        v-if="coolingPumpRunClass(2)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: coolingPumpRunClass(2) }"
-      />
-      <img
-        class="cooling-img4"
-        v-if="coolingPumpRunClass(3)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: coolingPumpRunClass(3) }"
-      />
-      <img
-        class="cooling-img5"
-        v-if="coolingPumpRunClass(4)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: coolingPumpRunClass(4) }"
-      />
-      <!-- 频率反馈 -->
-      <div
-        class="cooling-hz1"
-        v-if="coolingPumpHz(0) && coolingPumpRunClass(0)"
-      >
-        {{ coolingPumpHz0 }}Hz
-      </div>
-      <div
-        class="cooling-hz2"
-        v-if="coolingPumpHz(1) && coolingPumpRunClass(1)"
-      >
-        {{ coolingPumpHz1 }}Hz
-      </div>
-      <div
-        class="cooling-hz3"
-        v-if="coolingPumpHz(2) && coolingPumpRunClass(2)"
-      >
-        {{ coolingPumpHz2 }}Hz
-      </div>
-      <div
-        class="cooling-hz4"
-        v-if="coolingPumpHz(3) && coolingPumpRunClass(3)"
-      >
-        {{ coolingPumpHz3 }}Hz
-      </div>
-      <div
-        class="cooling-hz5"
-        v-if="coolingPumpHz(4) && coolingPumpRunClass(4)"
-      >
-        {{ coolingPumpHz4 }}Hz
-      </div>
-      <!-- 冷冻泵数据定位 -->
-      <div class="freezingPump1">1#</div>
-      <div class="freezingPump2">2#</div>
-      <div class="freezingPump3">3#</div>
-      <div class="freezingPump4">4#</div>
-      <div class="freezingPump5">5#</div>
-      <img
-        class="freezing-img1"
-        v-if="freezingPumpRunClass(0)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: freezingPumpRunClass(0) }"
-      />
-      <img
-        class="freezing-img2"
-        v-if="freezingPumpRunClass(1)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: freezingPumpRunClass(1) }"
-      />
-      <img
-        class="freezing-img3"
-        v-if="freezingPumpRunClass(2)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: freezingPumpRunClass(2) }"
-      />
-      <img
-        class="freezing-img4"
-        v-if="freezingPumpRunClass(3)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: freezingPumpRunClass(3) }"
-      />
-      <img
-        class="freezing-img5"
-        v-if="freezingPumpRunClass(4)"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-        :class="{ moveClass2: freezingPumpRunClass(4) }"
-      />
-      <!-- 频率反馈 旋转+有频率反馈才显示 -->
-      <div
-        class="freezing-hz1"
-        v-if="freezingPumpRunClass(0) && freezingPumpHz(0)"
-      >
-        {{ freezingPumpHz0 }}Hz
-      </div>
-      <div
-        class="freezing-hz2"
-        v-if="freezingPumpRunClass(1) && freezingPumpHz(1)"
-      >
-        {{ freezingPumpHz1 }}Hz
-      </div>
-      <div
-        class="freezing-hz3"
-        v-if="freezingPumpRunClass(2) && freezingPumpHz(2)"
-      >
-        {{ freezingPumpHz2 }}Hz
-      </div>
-      <div
-        class="freezing-hz4"
-        v-if="freezingPumpRunClass(3) && freezingPumpHz(3)"
-      >
-        {{ freezingPumpHz3 }}Hz
-      </div>
-      <div
-        class="freezing-hz5"
-        v-if="freezingPumpRunClass(4) && freezingPumpHz(4)"
-      >
-        {{ freezingPumpHz4 }}Hz
-      </div>
-      <!-- 冷却塔数据定位 五个风机 三个出水阀 -->
-      <div class="coolingTower3">3#</div>
-      <div class="coolingTower2">2#</div>
-      <div class="coolingTower1">1#</div>
-      <!-- 风机频率 -->
-      <div
-        class="coolingTowerHz3"
-        v-if="coolingTowerHz(2, 1) && coolingTowerRunClass(2, 1)"
-      >
-        {{ coolingTowerHz3 }}Hz
-      </div>
-      <div
-        class="coolingTowerHz2"
-        v-if="coolingTowerHz(1, 1) && coolingTowerRunClass(1, 1)"
-      >
-        {{ coolingTowerHz2 }}Hz
-      </div>
-      <div
-        class="coolingTowerHz1"
-        v-if="coolingTowerHz(0, 1) && coolingTowerRunClass(0, 1)"
-      >
-        {{ coolingTowerHz1 }}Hz
-      </div>
-      <!-- 3号冷却塔风机1 -->
-      <img
-        class="fan-img1"
-        v-if="coolingTowerRunClass(2, 1)"
-        :class="{ moveClass2: coolingTowerRunClass(2, 1) }"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-      />
-      <!-- 2号冷却塔风机1 -->
-      <img
-        class="fan-img2"
-        v-if="coolingTowerRunClass(1, 1)"
-        :class="{ moveClass2: coolingTowerRunClass(1, 1) }"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-      />
-      <!-- 1 号冷却塔风机1 -->
-      <img
-        class="fan-img3"
-        v-if="coolingTowerRunClass(0, 1)"
-        :class="{ moveClass2: coolingTowerRunClass(0, 1) }"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-      />
-      <div
-        class="towerValve1"
-        :class="{ startClass: towerValveControlClass(2) }"
-      ></div>
-      <div
-        class="towerValve2"
-        :class="{ startClass: towerValveControlClass(1) }"
-      ></div>
-      <div
-        class="towerValve3"
-        :class="{ startClass: towerValveControlClass(0) }"
-      ></div>
-      <div
-        class="towerValve4"
-        :class="{ startClass: towerValveInControlClass(2) }"
-      ></div>
-      <div
-        class="towerValve5"
-        :class="{ startClass: towerValveInControlClass(1) }"
-      ></div>
-      <div
-        class="towerValve6"
-        :class="{ startClass: towerValveInControlClass(0) }"
-      ></div>
-      <!-- 冷冻蝶阀数据定位 -->
-      <div
-        class="frozenValve1"
-        :class="{ startClass: frozenValveControlClass(0) }"
-      ></div>
-      <div
-        class="frozenValve2"
-        :class="{ startClass: frozenValveControlClass(1) }"
-      ></div>
-      <div
-        class="frozenValve3"
-        :class="{ startClass: frozenValveControlClass(2) }"
-      ></div>
-      <!-- 冷却蝶阀数据定位 -->
-      <div
-        class="coolingValue1"
-        :class="{ startClass: coolingValueControlClass(0) }"
-      ></div>
-      <div
-        class="coolingValue2"
-        :class="{ startClass: coolingValueControlClass(1) }"
-      ></div>
-      <div
-        class="coolingValue3"
-        :class="{ startClass: coolingValueControlClass(2) }"
-      ></div>
-      <!-- 箭头 -->
-      <img class="in-arrow" src="../../../assets/images/in-arrow.png" alt="" />
-      <img
-        class="out-arrow"
-        src="../../../assets/images/out-arrow.png"
-        alt=""
-      />
-      <!-- 冷冻进出水温度 0是out供(出)水，1是in回(进)水 -->
-      <div class="freezingInTem">{{ freezingInTem }}℃</div>
-      <div class="freezingOutTem">{{ freezingOutTem }}℃</div>
-      <!-- 冷冻水流 -->
-      <div class="freezingOutWater">{{ freezingOutWater }}m³/h</div>
-      <!-- 冷冻进出水压力 -->
-      <div class="freezingInPre">{{ freezingInPre }}kpa</div>
-      <div class="freezingOutPre">{{ freezingOutPre }}kpa</div>
-      <!-- 冷却进出水温度 -->
-      <div class="coolingInTem">{{ coolingInTem }}℃</div>
-      <div class="coolingOutTem">{{ coolingOutTem }}℃</div>
-      <!-- 报警状态与系统模式 -->
-      <div class="statusAndModel" v-if="isWarning">
-        <img src="../../../assets/images/red.png" class="warnStatus" alt="" />
-        <img
-          src="../../../assets/images/border6.png"
-          class="modelStatus"
-          alt=""
-        />
-        <div class="sysWarning" @click="showAlarm">Warning</div>
-        <div class="sysStatus">{{ sysStatus }}</div>
-      </div>
-      <div class="statusAndModel" v-else>
-        <img src="../../../assets/images/blue.png" class="warnStatus" alt="" />
-        <img
-          src="../../../assets/images/border5.png"
-          class="modelStatus"
-          alt=""
-        />
-        <div class="sysNormal">Normal</div>
-        <div class="sysStatus">{{ sysStatus }}</div>
-      </div>
-      <!-- 供暖区 -->
-      <div class="hotClass">供暖区</div>
-      <!-- 供冷区进水阀 -->
-      <div class="coolingOut-vavle">
-        <div class="water-flow-li">
-          <span>裙楼供冷进水阀:</span>
-          <span
-            class="break"
-            :class="{
-              connect: hostAndCoolingControlClass(this.coolingInletBuild),
-            }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>客房供冷进水阀:</span>
-          <span
-            class="break"
-            :class="{
-              connect: hostAndCoolingControlClass(this.coolingInletGuest),
-            }"
-          ></span>
-        </div>
-      </div>
-      <line-children
-        :angle1="-110"
-        :angle2="0"
-        :lineWidth1="190"
-        :lineWidth2="170"
-        class="coolingOut-line"
-      ></line-children>
-      <!-- 供冷区出水阀 -->
-      <div class="coolingIn-vavle">
-        <div class="water-flow-li">
-          <span>裙楼供冷出水阀:</span>
-          <span
-            class="break"
-            :class="{
-              connect: hostAndCoolingControlClass(this.coolingOutletBuild),
-            }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>客房供冷出水阀:</span>
-          <span
-            class="break"
-            :class="{
-              connect: hostAndCoolingControlClass(this.coolingOutletGuest),
-            }"
-          ></span>
-        </div>
-      </div>
-      <line-children
-        :angle1="-110"
-        :angle2="0"
-        :lineWidth1="130"
-        :lineWidth2="170"
-        class="coolingIn-line"
-      ></line-children>
-      <!--供暖区进水阀  -->
-      <div class="hotOut-vavle">
-        <div class="water-flow-li">
-          <span>裙楼供暖进水阀:</span>
-          <span
-            class="break"
-            :class="{ connect: hostAndCoolingControlClass(this.hotInletBuild) }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>客房供暖进水阀:</span>
-          <span
-            class="break"
-            :class="{ connect: hostAndCoolingControlClass(this.hotInletGuest) }"
-          ></span>
-        </div>
-      </div>
-      <line-children
-        :angle1="-70"
-        :angle2="0"
-        :lineWidth1="140"
-        :lineWidth2="170"
-        class="hotOut-line"
-      ></line-children>
-      <!--供暖区出水阀  -->
-      <div class="hotIn-vavle">
-        <div class="water-flow-li">
-          <span>裙楼供暖出水阀:</span>
-          <span
-            class="break"
-            :class="{
-              connect: hostAndCoolingControlClass(this.hotOutletBuild),
-            }"
-          ></span>
-        </div>
-        <div class="water-flow-li">
-          <span>客房供暖出水阀:</span>
-          <span
-            class="break"
-            :class="{
-              connect: hostAndCoolingControlClass(this.hotOutletGuest),
-            }"
-          ></span>
-        </div>
-      </div>
-      <line-children
-        :angle1="-70"
-        :angle2="0"
-        :lineWidth1="190"
-        :lineWidth2="170"
-        class="hotIn-line"
-      ></line-children>
-    </div>
-    <!-- 报警弹框内容 -->
-    <el-dialog
-      title="报警内容"
-      :visible.sync="openDialog"
-      width="680px"
-      append-to-body
-    >
-      <el-table :data="alarmList" height="600px">
-        <el-table-column
-          prop="otherName"
-          label="报警位置"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          prop="curTime"
-          label="报警时间"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-=======
   <div></div>
->>>>>>> dev
 </template>
 
 <script>
 export default {
-<<<<<<< HEAD
-  name: "sysControl",
-  components: { LineChildren },
-  data() {
-    return {
-      loading: false,
-      weatherObj: {},
-      performanceObj: {},
-      hostList: [], //主机列表
-      coolingPump: [], //冷却泵
-      freezingPump: [], //冷冻泵
-      coolingTower: [], //冷却塔
-      frozenValve: [], //冷冻蝶阀
-      coolingValue: [], //冷却蝶阀
-      coolingTowerInlet: [], //冷却塔进水阀
-      coolingTowerOutlet: [], //冷却塔出水阀
-
-      coolingOutletBuild: [], //裙楼供冷出水阀
-      coolingInletBuild: [], //裙楼供冷进水阀
-      coolingOutletGuest: [], //客房供冷出水阀
-      coolingInletGuest: [], //客房供冷进水阀
-
-      hotOutletBuild: [], //裙楼供暖出水阀
-      hotInletBuild: [], //裙楼供暖进水阀
-      hotOutletGuest: [], //客房供暖出水阀
-      hotInletGuest: [], //客房供暖进水阀
-      freezingManifold: [], //冷冻总管
-      isShowOn: false, //一键启停,false是Off,true显示On
-      oneKeyButtonId: "",
-
-      // 主机负载
-      hostLoad0: "",
-      hostLoad1: "",
-      hostLoad2: "",
-      // 冷却泵频率反馈
-      coolingPumpHz0: "",
-      coolingPumpHz1: "",
-      coolingPumpHz2: "",
-      coolingPumpHz3: "",
-      coolingPumpHz4: "",
-      // 冷冻泵频率反馈
-      freezingPumpHz0: "",
-      freezingPumpHz1: "",
-      freezingPumpHz2: "",
-      freezingPumpHz3: "",
-      freezingPumpHz4: "",
-      // 冷却塔风机频率
-      coolingTowerHz3: "",
-      coolingTowerHz2: "",
-      coolingTowerHz1: "",
-      // 冷冻泵进出水温度
-      freezingInTem: "",
-      freezingOutTem: "",
-      // 冷冻水流
-      freezingOutWater: "",
-      // 冷冻泵进出压力
-      freezingInPre: "",
-      freezingOutPre: "",
-      // 冷却进出水温度
-      coolingInTem: "",
-      coolingOutTem: "",
-
-      // 报警标志
-      isWarning: false,
-      // 报警列表
-      alarmList: [],
-      // 系统模式
-      sysStatus: "",
-      // 模式提示
-      startOrStopStatus: "",
-      openDialog: false,
-      timer: null, // 用于存储定时器 ID
-    };
-  },
-  created() {},
-  mounted() {
-    // 首次进入页面时执行
-    this.getWeatherData();
-    this.getSystemMode();
-    this.getPerformance();
-    this.getOneKeyButton();
-    this.getMonitorList();
-
-    // 设置定时器，每 10 秒执行一次
-    this.timer = setInterval(() => {
-      this.getWeatherData();
-      this.getSystemMode();
-      this.getPerformance();
-      this.getOneKeyButton();
-      this.getMonitorList();
-    }, 10000);
-  },
-  beforeDestroy() {
-    // 组件销毁前清除定时器
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
-  },
-  methods: {
-    // 获取天气相关数据
-    getWeatherData() {
-      weatherData().then((res) => {
-        if (res.code == 200) {
-          this.weatherObj = res.data;
-        }
-      });
-    },
-    // 获取系统性能数据
-    getPerformance() {
-      sysPerformance().then((res) => {
-        if (res.code == 200) {
-          this.performanceObj = res.data;
-        }
-      });
-    },
-    // 获取当前系统模式/启动、停止运行状态/报警列表
-    getSystemMode() {
-      let data = {
-        systemType: "0",
-        paramType: "27",
-      };
-      systemMode(data).then((res) => {
-        console.log("当前系统模式与报警列表返回", res);
-        if (res.code == 200) {
-          this.sysStatus = res.data.autoType;
-          this.alarmList = res.data.alarmList;
-          if (res.data.alarmList.length > 0) {
-            this.isWarning = true;
-          } else {
-            this.isWarning = false;
-          }
-          this.startOrStopStatus = res.data.startOrStopStatus;
-        }
-      });
-    },
-    showAlarm() {
-      this.openDialog = true;
-    },
-    // 获取一键启停信息
-    getOneKeyButton() {
-      return new Promise((resolve, reject) => {
-        let data = {
-          systemType: 0,
-          paramType: "27",
-        };
-        oneKeyButton(data)
-          .then((res) => {
-            console.log("一键启停返回信息", res);
-            if (res.code === 200) {
-              this.oneKeyButtonId = res.data.id;
-              if (Number(res.data.curValue) == 0) {
-                this.isShowOn = false;
-              } else {
-                this.isShowOn = true;
-              }
-            } else {
-              this.oneKeyButtonId = "";
-              this.isShowOn = false;
-            }
-            // 成功时解析 Promise
-            resolve(res);
-          })
-          .catch((error) => {
-            // 失败时拒绝 Promise
-            reject(error);
-          });
-      });
-    },
-    // 一键启停按钮
-    handleOneKeyButton() {
-      let param = "";
-      let paramText = "";
-      if (this.isShowOn) {
-        // this.isShowOn为true代表ON,此时点击按钮想OFF
-        param = 0;
-        paramText = "一键关闭";
-      } else {
-        param = 1;
-        paramText = "一键开启";
-      }
-      this.$confirm(`确定要${paramText}吗?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          let data = {
-            id: this.oneKeyButtonId,
-            param: param,
-          };
-          operationConrol([data])
-            .then((res) => {
-              if (res.code == 200) {
-                this.$modal.msgSuccess("指令下发成功!");
-                // 开启 loading 效果
-                this.loading = true;
-                // 更新状态;
-                setTimeout(() => {
-                  this.getOneKeyButton().finally(() => {
-                    // 关闭 loading 效果
-                    this.loading = false;
-                  });
-                }, 5000);
-              } else {
-                this.getOneKeyButton();
-              }
-            })
-            .catch((error) => {
-              console.log("请求发生错误，更新设备状态", error);
-              this.ggetOneKeyButton();
-            });
-        })
-        .catch(() => {});
-    },
-    // 系统监测数据
-    getMonitorList() {
-      monitorList({ systemType: 0 }).then((res) => {
-        if (res.code === 200) {
-          console.log("设备监测列表返回", res);
-
-          // 初始化各个设备列表
-          this.hostList = [];
-          this.coolingPump = [];
-          this.freezingPump = [];
-          this.coolingTower = [];
-          this.frozenValve = [];
-          this.coolingValue = [];
-          this.coolingTowerInlet = [];
-          this.coolingTowerOutlet = [];
-          this.freezingManifold = [];
-          this.coolingOutletBuild = []; //裙楼供冷出水阀
-          this.coolingInletBuild = []; //裙楼供冷进水阀
-          this.coolingOutletGuest = []; //客房供冷出水阀
-          this.coolingInletGuest = []; //客房供冷进水阀
-          this.hotOutletBuild = []; //裙楼供暖出水阀
-          this.hotInletBuild = []; //裙楼供暖进水阀
-          this.hotOutletGuest = []; //客房供暖出水阀
-          this.hotInletGuest = []; //客房供暖进水阀
-
-          res.rows.forEach((row) => {
-            switch (row.name) {
-              case "0":
-                this.hostList = this.processDeviceList(row.values);
-                console.log("主机列表", this.hostList);
-                break;
-              case "1":
-                this.coolingPump = this.processDeviceList(row.values);
-                console.log("冷却泵列表", this.coolingPump);
-                break;
-              case "2":
-                this.freezingPump = this.processDeviceList(row.values);
-                console.log("冷冻泵列表", this.freezingPump);
-                break;
-              case "3":
-                this.coolingTower = this.processDeviceList(row.values);
-                console.log("冷却塔列表", this.coolingTower);
-                break;
-              case "4":
-                this.frozenValve = this.processDeviceList(row.values);
-                console.log("冷冻蝶阀列表", this.frozenValve);
-                break;
-              case "7":
-                this.coolingValue = this.processDeviceList(row.values);
-                console.log("冷却蝶阀列表", this.coolingValue);
-                break;
-              case "8":
-                this.coolingTowerInlet = this.processDeviceList(row.values);
-                console.log("冷却塔进水阀列表", this.coolingTowerInlet);
-                break;
-              case "9":
-                this.coolingTowerOutlet = this.processDeviceList(row.values);
-                console.log("冷却塔出水阀列表", this.coolingTowerOutlet);
-                break;
-              case "15":
-                this.freezingManifold = row.values;
-                console.log("冷冻总管", this.freezingManifold);
-                this.freezingManifoldData();
-                break;
-              case "18":
-                let buildOutData = row.values;
-                buildOutData.forEach((item) => {
-                  if (item.deviceName.includes("供冷")) {
-                    this.coolingOutletBuild.push(item);
-                  }
-                  if (item.deviceName.includes("供暖")) {
-                    this.hotOutletBuild.push(item);
-                  }
-                });
-                console.log("裙楼供冷出水阀", this.coolingOutletBuild);
-                console.log("裙楼供暖出水阀", this.hotOutletBuild);
-                break;
-              case "19":
-                let buildInData = row.values;
-                buildInData.forEach((item) => {
-                  if (item.deviceName.includes("供冷")) {
-                    this.coolingInletBuild.push(item);
-                  }
-                  if (item.deviceName.includes("供暖")) {
-                    this.hotInletBuild.push(item);
-                  }
-                });
-                console.log("裙楼供冷进水阀", this.coolingInletBuild);
-                console.log("裙楼供暖进水阀", this.hotInletBuild);
-                break;
-              case "20":
-                let guestOutData = row.values;
-                guestOutData.forEach((item) => {
-                  if (item.deviceName.includes("供冷")) {
-                    this.coolingOutletGuest.push(item);
-                  }
-                  if (item.deviceName.includes("供暖")) {
-                    this.hotOutletGuest.push(item);
-                  }
-                });
-                console.log("客房供冷出水阀", this.coolingOutletGuest);
-                console.log("客房供暖出水阀", this.hotOutletGuest);
-                break;
-              case "21":
-                let guestInData = row.values;
-                guestInData.forEach((item) => {
-                  if (item.deviceName.includes("供冷")) {
-                    this.coolingInletGuest.push(item);
-                  }
-                  if (item.deviceName.includes("供暖")) {
-                    this.hotInletGuest.push(item);
-                  }
-                });
-                console.log("客房供冷进水阀", this.coolingInletGuest);
-                console.log("客房供暖进水阀", this.hotInletGuest);
-                break;
-              default:
-                break;
-            }
-          });
-        }
-      });
-    },
-    // 封装一个通用函数来处理设备列表
-    processDeviceList(values) {
-      const deviceList = [];
-      // 遍历每个设备属性
-      values.forEach((item) => {
-        // 提取设备编号
-        const match = item.deviceName.match(/(\d+)号/);
-        if (match) {
-          const deviceNumber = parseInt(match[1]);
-          // 如果 deviceList 中对应编号的对象还不存在，则创建一个新对象
-          if (!deviceList[deviceNumber - 1]) {
-            deviceList[deviceNumber - 1] = {
-              deviceName: item.deviceName,
-              properties: [],
-            };
-          }
-          // 将当前属性添加到对应设备的 properties 数组中
-          deviceList[deviceNumber - 1].properties.push(item);
-        }
-      });
-      // 过滤掉 deviceList 中可能存在的空元素
-      return deviceList.filter((item) => item);
-    },
-    // 主机负载
-    hostLoadData(index) {
-      // 检查 hostList 长度是否足够
-      if (this.hostList.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    hostList[index]数组的properties数组
-      const properties = this.hostList[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 28表示主机负载
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "28") {
-          // 动态构造属性名
-          const propertyName = `hostLoad${index}`;
-          // 使用方括号语法动态设置属性值
-          this[propertyName] = item.collectValue;
-          return true;
-        }
-      }
-      // 否则代表启停控制中的停止
-      return false;
-    },
-    // 主机启停状态
-    hostListControlClass(index) {
-      // 检查 hostList 长度是否足够
-      if (this.hostList.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    hostList[index]数组的properties数组
-      const properties = this.hostList[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 2并且item.collectValue !== "0.00"则便是启停控制中的开启
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "2" && Number(item.collectValue) !== 0) {
-          return true;
-        }
-      }
-      // 否则代表启停控制中的停止
-      return false;
-    },
-    // 主机运行状态
-    hostListRunClass(index) {
-      // 检查 hostList 长度是否足够
-      if (this.hostList.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    hostList[index]数组的properties数组
-      const properties = this.hostList[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 1并且item.collectValue !== "0.00"则便是运行状态中的运行
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "1" && Number(item.collectValue) !== 0) {
-          return true;
-        }
-      }
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    // 主机冷却水流信号
-    hostCoolingWaterFlowClass(index) {
-      // 检查 hostList 长度是否足够
-      if (this.hostList.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    hostList[index]数组的properties数组
-      const properties = this.hostList[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 21并且item.collectValue !== "0.00"则便是主机冷却水流信号：接通
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "21" && Number(item.collectValue) !== 0) {
-          return true;
-        }
-      }
-      // 否则代表主机冷却水流信号：断开
-      return false;
-    },
-    // 主机冷冻水流信号
-    hostFreezeWaterFlowClass(index) {
-      // 检查 hostList 长度是否足够
-      if (this.hostList.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    hostList[index]数组的properties数组
-      const properties = this.hostList[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 20并且item.collectValue !== "0.00"则便是主机冷冻水流信号：接通
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "20" && Number(item.collectValue) !== 0) {
-          return true;
-        }
-      }
-      // 否则代表主机冷冻水流信号：断开
-      return false;
-    },
-    // 冷却泵运行状态
-    coolingPumpRunClass(index) {
-      // 检查 coolingPump 长度是否足够
-      if (this.coolingPump.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    coolingPump[index]数组的properties数组
-      const properties = this.coolingPump[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 1并且item.collectValue !== "0.00"则便是运行状态中的运行
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "1" && Number(item.collectValue) !== 0) {
-          return true;
-        }
-      }
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    // 冷却泵频率
-    coolingPumpHz(index) {
-      // 检查 coolingPump 长度是否足够
-      if (this.coolingPump.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    coolingPump[index]数组的properties数组
-      const properties = this.coolingPump[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 4则有频率反馈
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "4") {
-          // 动态构造属性名
-          const propertyName = `coolingPumpHz${index}`;
-          // 使用方括号语法动态设置属性值
-          this[propertyName] = item.collectValue;
-          // this.coolingPumpHz[index] = item.collectValue;
-          return true;
-        }
-      }
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    // 冷冻泵运行状态
-    freezingPumpRunClass(index) {
-      // 检查 freezingPump 长度是否足够
-      if (this.freezingPump.length <= index) {
-        return false;
-      }
-      // console.log("打印this.freezingPump数组", this.freezingPump);
-      // 检查 properties 数组是否存在    freezingPump[index]数组的properties数组
-      const properties = this.freezingPump[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 1并且item.collectValue !== "0.00"则便是运行状态中的运行
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "1" && Number(item.collectValue) !== 0) {
-          return true;
-        }
-      }
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    //冷冻泵频率
-    freezingPumpHz(index) {
-      // 检查 freezingPump 长度是否足够
-      if (this.freezingPump.length <= index) {
-        return false;
-      }
-      // 检查 properties 数组是否存在    freezingPump[index]数组的properties数组
-      const properties = this.freezingPump[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-      // 遍历 properties 数组，如果当前对象paramType === 4则有频率反馈
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "4") {
-          // 动态构造属性名
-          const propertyName = `freezingPumpHz${index}`;
-          // 使用方括号语法动态设置属性值
-          this[propertyName] = item.collectValue;
-          // this.freezingPumpHz[index] = item.collectValue;
-          return true;
-        }
-      }
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    // 冷却塔风机运行状态,index为多少号风机,0表示1号风机;item表示风机x
-    coolingTowerRunClass(index, item) {
-      // 检查 coolingTower 长度是否足够
-      if (this.coolingTower.length <= index) {
-        return false;
-      }
-
-      // 获取指定索引的 coolingTower 元素的 properties 数组
-      const properties = this.coolingTower[index].properties;
-
-      // 检查 properties 数组是否存在
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-
-      // 创建一个新数组，用于存储 paramType === 1 的对象
-      const filteredProperties = [];
-      let filterItem = {};
-      for (let i = 0; i < properties.length; i++) {
-        // console.log('properties[i].paramType',properties[i].paramType)
-        if (properties[i].paramType === "1") {
-          filteredProperties.push(properties[i]);
-          // filterItem  = properties[i]
-        }
-      }
-      // // 将处理后的对象添加到 deviceList 中
-      // if (Object.keys(filterItem).length > 1) {
-      //   filteredProperties.push(filterItem);
-      // }
-      // console.log("paramType为1的对象", filteredProperties);
-      // console.log("index, item", index, item);
-      // 根据 index 和 item 生成目标属性名称
-      const towerNumber = index + 1;
-      const targetPropertyName = `${towerNumber}号冷却塔风机${item}运行`;
-      // console.log("targetPropertyName",targetPropertyName)
-      // 在新数组中查找与目标名称匹配的对象，并检查其 collectValue 是否不为 "0.00"
-      for (let i = 0; i < filteredProperties.length; i++) {
-        if (
-          filteredProperties[i].collectName === targetPropertyName &&
-          Number(filteredProperties[i].collectValue) !== 0
-        ) {
-          if (index === 0 && item === 1) {
-            // console.log(
-            //   "返回的true",
-            //   filteredProperties[i].collectName === targetPropertyName &&
-            //     Number(filteredProperties[i].collectValue) !== 0
-            // );
-          }
-          return true;
-        }
-      }
-
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    // 冷却塔风机频率,index为多少号风机,0表示1号风机;item表示风机x
-    coolingTowerHz(index, item) {
-      // 检查 coolingTower 长度是否足够
-      if (this.coolingTower.length <= index) {
-        return false;
-      }
-
-      // 获取指定索引的 coolingTower 元素的 properties 数组
-      const properties = this.coolingTower[index].properties;
-
-      // 检查 properties 数组是否存在
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-
-      // 创建一个新数组，用于存储 paramType === 4 的对象
-      const filteredProperties = [];
-      let filterItem = {};
-      for (let i = 0; i < properties.length; i++) {
-        // console.log('properties[i].paramType',properties[i].paramType)
-        if (properties[i].paramType === "4") {
-          filteredProperties.push(properties[i]);
-          // filterItem  = properties[i]
-        }
-      }
-      // // 将处理后的对象添加到 deviceList 中
-      // if (Object.keys(filterItem).length > 1) {
-      //   filteredProperties.push(filterItem);
-      // }
-      // console.log("paramType为4的对象", filteredProperties);
-      // console.log("index, item", index, item);
-      // 根据 index 和 item 生成目标属性名称
-      const towerNumber = index + 1;
-      const targetPropertyName = `${towerNumber}号冷却塔风机${item}频率反馈`;
-      // console.log("targetPropertyName",targetPropertyName)
-      // 在新数组中查找与目标名称匹配的对象，并检查其 collectValue 是否不为 "0.00"
-      for (let i = 0; i < filteredProperties.length; i++) {
-        if (filteredProperties[i].collectName === targetPropertyName) {
-          // 动态构造 coolingTowerHz 相关属性名
-          const coolingTowerHzPropertyName = `coolingTowerHz${towerNumber}${item}`;
-          // console.log(
-          //   "coolingTowerHzPropertyName---",
-          //   coolingTowerHzPropertyName
-          // );
-          // 获取 collectValue 转换为数字后的值
-          const value = Number(filteredProperties[i].collectValue);
-          // 使用方括号语法动态设置属性值
-          this[coolingTowerHzPropertyName] = value;
-          // console.log("Number(filteredProperties[i].collectValue)", value);
-          return true;
-        }
-      }
-
-      // 否则代表运行状态中的不运行
-      return false;
-    },
-    // 冷却塔出水蝶阀启停状态
-    towerValveControlClass(index) {
-      // 检查 coolingTowerOutlet 长度是否足够
-      if (this.coolingTowerOutlet.length <= index) {
-        return false;
-      }
-      // console.log("打印this.coolingTowerOutlet数组", this.coolingTowerOutlet);
-      // 检查 properties 数组是否存在    coolingTowerOutlet[index]数组的properties数组
-      const properties = this.coolingTowerOutlet[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-
-      let valveOpenFeedbackFound = false;
-      let valveCloseFeedbackFound = false;
-      // 遍历 properties 数组
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "7") {
-          // console.log("item.collectName", item.collectName);
-          // console.log("item.collectValue", item.collectValue);
-          // 阀开到位是开启
-          if (
-            item.collectName.includes("阀开到位") &&
-            Number(item.collectValue) == 1
-          ) {
-            valveOpenFeedbackFound = true;
-          }
-          // 阀关到位是关闭
-          if (
-            item.collectName.includes("阀关到位") &&
-            Number(item.collectValue) == 0
-          ) {
-            valveCloseFeedbackFound = true;
-          }
-        }
-      }
-
-      // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
-      return valveOpenFeedbackFound && valveCloseFeedbackFound;
-    },
-    // 冷却塔进水蝶阀启停状态
-    towerValveInControlClass(index) {
-      // 检查 this.coolingTowerInlet 长度是否足够
-      if (this.coolingTowerInlet.length <= index) {
-        return false;
-      }
-      // console.log("打印this.coolingTowerOutlet数组", this.coolingTowerInlet);
-      // 检查 properties 数组是否存在    coolingTowerInlet[index]数组的properties数组
-      const properties = this.coolingTowerInlet[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-
-      let valveOpenFeedbackFound = false;
-      let valveCloseFeedbackFound = false;
-      // 遍历 properties 数组
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "7") {
-          // console.log("item.collectName", item.collectName);
-          // console.log("item.collectValue", item.collectValue);
-          // 阀开到位是开启
-          if (
-            item.collectName.includes("阀开到位") &&
-            Number(item.collectValue) == 1
-          ) {
-            valveOpenFeedbackFound = true;
-          }
-          // 阀关到位是关闭
-          if (
-            item.collectName.includes("阀关到位") &&
-            Number(item.collectValue) == 0
-          ) {
-            valveCloseFeedbackFound = true;
-          }
-        }
-      }
-
-      // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
-      return valveOpenFeedbackFound && valveCloseFeedbackFound;
-    },
-    // 冷冻蝶阀启停状态
-    frozenValveControlClass(index) {
-      // 检查 frozenValve 长度是否足够
-      if (this.frozenValve.length <= index) {
-        return false;
-      }
-      // console.log("打印this.frozenValve数组", this.frozenValve);
-      // 检查 properties 数组是否存在    frozenValve[index]数组的properties数组
-      const properties = this.frozenValve[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-
-      let valveOpenFeedbackFound = false;
-      let valveCloseFeedbackFound = false;
-
-      // 遍历 properties 数组
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "7") {
-          // 阀开到位是开启
-          if (
-            item.collectName.includes("阀开到位") &&
-            Number(item.collectValue) !== 0
-          ) {
-            valveOpenFeedbackFound = true;
-          }
-          // 阀关到位是关闭
-          if (
-            item.collectName.includes("阀关到位") &&
-            Number(item.collectValue) === 0
-          ) {
-            valveCloseFeedbackFound = true;
-          }
-        }
-      }
-
-      // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
-      return valveOpenFeedbackFound && valveCloseFeedbackFound;
-    },
-    // 冷却蝶阀启停状态
-    coolingValueControlClass(index) {
-      // 检查 coolingValue 长度是否足够
-      if (this.coolingValue.length <= index) {
-        return false;
-      }
-      // console.log("打印this.coolingValue数组", this.coolingValue);
-      // 检查 properties 数组是否存在    coolingValue[index]数组的properties数组
-      const properties = this.coolingValue[index].properties;
-      if (!properties || properties.length === 0) {
-        return false;
-      }
-
-      let valveOpenFeedbackFound = false;
-      let valveCloseFeedbackFound = false;
-
-      // 遍历 properties 数组
-      for (let i = 0; i < properties.length; i++) {
-        const item = properties[i];
-        if (item.paramType === "7") {
-          // 阀开到位是开启
-          if (
-            item.collectName.includes("阀开到位") &&
-            Number(item.collectValue) !== 0
-          ) {
-            valveOpenFeedbackFound = true;
-          }
-          // 阀关到位是关闭
-          if (
-            item.collectName.includes("阀关到位") &&
-            Number(item.collectValue) === 0
-          ) {
-            valveCloseFeedbackFound = true;
-            // console.log("冷冻蝶阀阀关到位应该是true才对呀");
-          }
-        }
-      }
-
-      // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
-      return valveOpenFeedbackFound && valveCloseFeedbackFound;
-    },
-    // 冷冻总管数据 供回水温度、压力等
-    freezingManifoldData(index, val) {
-      console.log("this.freezingManifold", this.freezingManifold);
-      // 检查 freezingManifold 长度是否足够
-      if (this.freezingManifold.length <= index) {
-        return false;
-      }
-      this.freezingManifold.forEach((item) => {
-        if (item.collectName === "冷冻供水温度") {
-          this.freezingOutTem = item.collectValue;
-          console.log("item.collectName", item.collectName);
-        } else if (item.collectName === "冷冻回水温度") {
-          this.freezingInTem = item.collectValue;
-        } else if (item.collectName === "冷冻供水压力") {
-          this.freezingOutPre = item.collectValue;
-        } else if (item.collectName === "冷冻回水压力") {
-          this.freezingInPre = item.collectValue;
-        } else if (item.collectName === "冷却供水温度") {
-          this.coolingOutTem = item.collectValue;
-        } else if (item.collectName === "冷却回水温度") {
-          this.coolingInTem = item.collectValue;
-        } else if (item.collectName === "总冷量计瞬时流量") {
-          this.freezingOutWater = item.collectValue;
-        }
-      });
-      return true;
-=======
   created() {
     this.toPage();
   },
@@ -1525,1178 +12,9 @@ export default {
       console.log("需要跳转的")
       // 跳转到高校导航大屏展示
       this.$router.push("/monitorCenter")
->>>>>>> dev
-    },
-    // 裙楼-客房进出水阀启停状态
-    hostAndCoolingControlClass(item) {
-      // 检查数组中是否存在 paramType 为 "7" 的对象
-      const hasParamType7 = item.some((obj) => obj.paramType === "7");
-
-      if (!hasParamType7) {
-        // 如果没有 paramType 为 "7" 的对象
-        for (let i = 0; i < item.length; i++) {
-          if (item[i].paramType === "2") {
-            if (Number(item[i].collectValue) !== 0) {
-              return true;
-            }
-          }
-        }
-      } else {
-        // 如果有 paramType 为 "7" 的对象
-        for (let i = 0; i < item.length; i++) {
-          if (item[i].paramType === "7") {
-            const { collectName, collectValue } = item[i];
-            if (
-              (collectName.includes("开到位") &&
-                Number(collectValue) === 1) ||
-              (collectName.includes("关到位") && Number(collectValue) === 0)
-            ) {
-              return true;
-            }
-          }
-        }
-      }
-      return false;
     },
   },
 };
 </script>
 
-<<<<<<< HEAD
-<style lang="scss" scoped>
-.monitor {
-  width: 100%;
-  .monitor-content {
-    width: 16rem;
-    // height: 9.65rem;
-    position: relative;
-    margin-left: calc((100% - 16rem) / 2);
-    .sys-logo {
-      width: 1.9rem;
-      height: 0.56rem;
-      position: absolute;
-      top: 0.4rem;
-      left: 0;
-      z-index: 10;
-    }
-    .sys-title {
-      background-image: url(../../../assets/images/top.png);
-      background-size: 100% 100%;
-      width: 16rem;
-      height: 0.5rem;
-      position: absolute;
-      top: 0;
-      left: 0;
-      font-size: 0.22rem;
-      color: #ffffff;
-      font-weight: bold;
-      z-index: 100;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-    }
-    .monitor-img {
-      position: absolute;
-      top: 0.75rem;
-      left: calc((100% - 15rem) / 2);
-      width: 15rem;
-      height: 9.15rem;
-      z-index: 1;
-    }
-    .fan-img1 {
-      z-index: 10;
-      position: absolute;
-      top: 1.6rem;
-      left: 7.2rem;
-      width: 0.5rem;
-      height: 0.5rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .fan-img2 {
-      z-index: 10;
-      position: absolute;
-      top: 1.5rem;
-      left: 7.6rem;
-      width: 0.5rem;
-      height: 0.5rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .fan-img3 {
-      z-index: 10;
-      position: absolute;
-      top: 1.43rem;
-      left: 8rem;
-      width: 0.5rem;
-      height: 0.5rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    /* 定义 fan 动画关键帧 */
-    @keyframes fan {
-      0% {
-        /* 修改初始旋转角度 */
-        transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-      }
-      100% {
-        /* 修改结束旋转角度 */
-        transform: translateX(-50%) rotateX(60deg) rotateZ(360deg);
-      }
-    }
-    .towerValve1 {
-      z-index: 10;
-      position: absolute;
-      top: 1.95rem;
-      left: 7.7rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .towerValve2 {
-      z-index: 10;
-      position: absolute;
-      top: 1.87rem;
-      left: 8.13rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .towerValve3 {
-      z-index: 10;
-      position: absolute;
-      top: 1.8rem;
-      left: 8.53rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .towerValve4 {
-      z-index: 10;
-      position: absolute;
-      top: 2.86rem;
-      left: 7.62rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .towerValve5 {
-      z-index: 10;
-      position: absolute;
-      top: 2.8rem;
-      left: 8.02rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .towerValve6 {
-      z-index: 10;
-      position: absolute;
-      top: 2.7rem;
-      left: 8.4rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .in-arrow {
-      position: absolute;
-      top: 3.98rem;
-      right: 2.86rem;
-      transform: rotate(180deg);
-      width: 0.3rem;
-      height: 0.45rem;
-      z-index: 10;
-    }
-    .out-arrow {
-      position: absolute;
-      top: 3.9rem;
-      right: 3.15rem;
-      width: 0.3rem;
-      height: 0.45rem;
-      z-index: 10;
-    }
-    .coolingInTem {
-      z-index: 10;
-      position: absolute;
-      top: 3.55rem;
-      left: 6.8rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .coolingOutTem {
-      z-index: 10;
-      position: absolute;
-      top: 3.6rem;
-      left: 5.85rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezingInTem {
-      z-index: 10;
-      position: absolute;
-      top: 4.5rem;
-      right: 5.5rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezingOutTem {
-      z-index: 10;
-      position: absolute;
-      top: 4.6rem;
-      right: 5rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezingOutWater {
-      z-index: 10;
-      position: absolute;
-      top: 6.7rem;
-      right: 4.4rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-
-    .freezingInPre {
-      z-index: 10;
-      position: absolute;
-      top: 4.8rem;
-      right: 6.4rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezingOutPre {
-      z-index: 10;
-      position: absolute;
-      top: 5.1rem;
-      right: 6rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .host-line1 {
-      position: absolute;
-      left: -0.95rem;
-      top: 6.97rem;
-      z-index: 10;
-    }
-    .host-line2 {
-      position: absolute;
-      left: -1.05rem;
-      top: 7.75rem;
-      z-index: 10;
-    }
-    .host-line3 {
-      position: absolute;
-      left: -0.95rem;
-      top: 8.53rem;
-      z-index: 10;
-    }
-    .hostName1 {
-      border-bottom: 1px solid rgba(0, 255, 255, 1);
-      z-index: 10;
-      font-size: 0.22rem;
-      font-weight: bold;
-      color: aqua;
-      position: absolute;
-      top: 6.8rem;
-      left: 3.05rem;
-      transform: rotateX(50deg) rotateY(0deg) rotateZ(46deg); /* 分别在 X、Y、Z 轴上旋转 */
-      transform-origin: bottom center; /* 设置旋转的基点为底部中心 */
-      text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9); /* 添加文字阴影增强立体感 */
-    }
-    .hostName2 {
-      border-bottom: 1px solid rgba(0, 255, 255, 1);
-      z-index: 10;
-      font-size: 0.22rem;
-      font-weight: bold;
-      color: aqua;
-      position: absolute;
-      top: 6.25rem;
-      left: 4.89rem;
-      transform: rotateX(50deg) rotateY(0deg) rotateZ(42deg);
-      transform-origin: bottom center;
-      text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9);
-    }
-    .hostName3 {
-      border-bottom: 1px solid rgba(0, 255, 255, 1);
-      z-index: 10;
-      font-size: 0.22rem;
-      font-weight: bold;
-      color: aqua;
-      position: absolute;
-      top: 5.65rem;
-      left: 6.47rem;
-      transform: rotateX(50deg) rotateY(0deg) rotateZ(38deg);
-      transform-origin: bottom center;
-      text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9);
-    }
-    /* 定义 host 动画关键帧 */
-    @keyframes host {
-      0% {
-        /* 修改初始旋转角度 */
-        transform: translateX(-50%) rotateX(15deg) rotateZ(0deg);
-      }
-      100% {
-        /* 修改结束旋转角度 */
-        transform: translateX(-50%) rotateX(15deg) rotateZ(360deg);
-      }
-    }
-    .host-img1 {
-      z-index: 10;
-      position: absolute;
-      top: 6.75rem;
-      left: 4.58rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateY(0deg) rotateX(0deg) rotateZ(0deg);
-    }
-    .host-img2 {
-      z-index: 10;
-      position: absolute;
-      top: 6.1rem;
-      left: 6.34rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(0deg) rotateZ(0deg);
-    }
-    .host-img3 {
-      z-index: 10;
-      position: absolute;
-      top: 5.54rem;
-      left: 8.18rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(15deg) rotateZ(0deg);
-    }
-    .hostLoad1 {
-      z-index: 10;
-      position: absolute;
-      top: 6.4rem;
-      left: 4.26rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .hostLoad2 {
-      z-index: 10;
-      position: absolute;
-      top: 5.8rem;
-      left: 6rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .hostLoad3 {
-      z-index: 10;
-      position: absolute;
-      top: 4.9rem;
-      left: 7.7rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .water-flow1 {
-      z-index: 10;
-      position: absolute;
-      top: 7.4rem;
-      left: 0.16rem;
-      font-size: 0.16rem;
-    }
-    .water-flow2 {
-      z-index: 10;
-      position: absolute;
-      top: 8.19rem;
-      left: 0.2rem;
-      font-size: 0.16rem;
-    }
-    .water-flow3 {
-      z-index: 10;
-      position: absolute;
-      top: 9rem;
-      left: 0.32rem;
-      font-size: 0.16rem;
-    }
-    .water-flow-li {
-      margin-bottom: 0.04rem;
-      color: #46f1e3;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      span {
-        background-color: rgba(0, 255, 255, 0.2);
-        border-radius: 0.1rem;
-        padding: 0.01rem 0.03rem;
-      }
-      .break {
-        margin-left: 0.07rem;
-        display: inline-block;
-        width: 0.18rem;
-        height: 0.18rem;
-        border-radius: 50%;
-        border: 1px solid #46f1e3;
-        background-color: transparent !important;
-      }
-      .connect {
-        animation: blink 1s infinite;
-        background-color: #38fc52 !important;
-      }
-    }
-    .moveClass {
-      animation: host 2s linear infinite;
-    }
-    .moveClass2 {
-      animation: fan 2s linear infinite;
-    }
-    .startClass {
-      /* 应用动画 */
-      animation: blink 1s infinite;
-      background-color: #38fc52 !important;
-    }
-    .hostStatus1 {
-      z-index: 10;
-      position: absolute;
-      top: 6.4rem;
-      left: 4rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      border-radius: 50%;
-    }
-    .hostStatus2 {
-      z-index: 10;
-      position: absolute;
-      top: 5.8rem;
-      left: 5.75rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      border-radius: 50%;
-    }
-    .hostStatus3 {
-      z-index: 10;
-      position: absolute;
-      top: 5.1rem;
-      left: 7.5rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      border-radius: 50%;
-    }
-    .coolingPump1 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 4.4rem;
-      left: 7.18rem;
-    }
-    .coolingPump2 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 4.3rem;
-      left: 7.68rem;
-    }
-    .coolingPump3 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 4.14rem;
-      left: 8.22rem;
-    }
-    .coolingPump4 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 4rem;
-      left: 8.68rem;
-    }
-    .coolingPump5 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 3.91rem;
-      left: 9.1rem;
-    }
-    .cooling-img1 {
-      z-index: 10;
-      position: absolute;
-      top: 4rem;
-      left: 7.27rem;
-      width: 0.35rem;
-      height: 0.35rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .cooling-img2 {
-      z-index: 10;
-      position: absolute;
-      top: 3.87rem;
-      left: 7.76rem;
-      width: 0.35rem;
-      height: 0.35rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .cooling-img3 {
-      z-index: 10;
-      position: absolute;
-      top: 3.75rem;
-      left: 8.28rem;
-      width: 0.35rem;
-      height: 0.35rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .cooling-img4 {
-      z-index: 10;
-      position: absolute;
-      top: 3.64rem;
-      left: 8.72rem;
-      width: 0.35rem;
-      height: 0.35rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .cooling-img5 {
-      z-index: 10;
-      position: absolute;
-      top: 3.5rem;
-      left: 9.15rem;
-      width: 0.35rem;
-      height: 0.35rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .cooling-hz1 {
-      z-index: 10;
-      position: absolute;
-      top: 3.89rem;
-      left: 6.95rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .cooling-hz2 {
-      z-index: 10;
-      position: absolute;
-      top: 3.8rem;
-      left: 7.5rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .cooling-hz3 {
-      z-index: 10;
-      position: absolute;
-      top: 3.68rem;
-      left: 8rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .cooling-hz4 {
-      z-index: 10;
-      position: absolute;
-      top: 3.56rem;
-      left: 8.48rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .cooling-hz5 {
-      z-index: 10;
-      position: absolute;
-      top: 3.41rem;
-      left: 9rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezingPump1 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 8.3rem;
-      left: 6.26rem;
-    }
-    .freezingPump2 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 7.92rem;
-      left: 7rem;
-    }
-    .freezingPump3 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 7.18rem;
-      left: 8.6rem;
-    }
-    .freezingPump4 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 6.9rem;
-      left: 9.15rem;
-    }
-    .freezingPump5 {
-      z-index: 10;
-      font-size: 0.15rem;
-      font-weight: bold;
-      color: #46f1e3;
-      position: absolute;
-      top: 6.7rem;
-      left: 9.65rem;
-    }
-    .freezing-img1 {
-      z-index: 10;
-      position: absolute;
-      top: 7.7rem;
-      left: 6.3rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .freezing-img2 {
-      z-index: 10;
-      position: absolute;
-      top: 7.38rem;
-      left: 7.07rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .freezing-img3 {
-      z-index: 10;
-      position: absolute;
-      top: 6.7rem;
-      left: 8.65rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .freezing-img4 {
-      z-index: 10;
-      position: absolute;
-      top: 6.45rem;
-      left: 9.2rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .freezing-img5 {
-      z-index: 10;
-      position: absolute;
-      top: 6.22rem;
-      left: 9.72rem;
-      width: 0.4rem;
-      height: 0.4rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .freezing-hz1 {
-      z-index: 10;
-      position: absolute;
-      top: 7.63rem;
-      left: 6rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezing-hz2 {
-      z-index: 10;
-      position: absolute;
-      top: 7.3rem;
-      left: 6.82rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezing-hz3 {
-      z-index: 10;
-      position: absolute;
-      top: 6.65rem;
-      left: 8.35rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezing-hz4 {
-      z-index: 10;
-      position: absolute;
-      top: 6.4rem;
-      left: 8.93rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .freezing-hz5 {
-      z-index: 10;
-      position: absolute;
-      top: 6.15rem;
-      left: 9.44rem;
-      font-size: 0.16rem;
-      font-weight: bold;
-    }
-    .coolingTower3 {
-      z-index: 10;
-      font-size: 0.18rem;
-      color: #46f1e3;
-      position: absolute;
-      top: 2.28rem;
-      left: 7.35rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(0deg);
-    }
-    .coolingTower2 {
-      z-index: 10;
-      font-size: 0.18rem;
-      color: #46f1e3;
-      position: absolute;
-      top: 2.2rem;
-      left: 7.75rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(0deg);
-    }
-    .coolingTower1 {
-      z-index: 10;
-      font-size: 0.18rem;
-      color: #46f1e3;
-      position: absolute;
-      top: 2.13rem;
-      left: 8.16rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(0deg);
-    }
-    .coolingTowerHz1 {
-      z-index: 10;
-      font-size: 0.16rem;
-      color: #ffffff;
-      position: absolute;
-      top: 1.34rem;
-      left: 7.7rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
-    }
-    .coolingTowerHz2 {
-      z-index: 10;
-      font-size: 0.16rem;
-      color: #ffffff;
-      position: absolute;
-      top: 1.45rem;
-      left: 7.15rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
-    }
-    .coolingTowerHz3 {
-      z-index: 10;
-      font-size: 0.16rem;
-      color: #ffffff;
-      position: absolute;
-      top: 1.56rem;
-      left: 6.6rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
-    }
-    /* 定义灯闪烁的动画 */
-    @keyframes blink {
-      0% {
-        opacity: 1;
-      }
-      50% {
-        opacity: 0.7;
-      }
-      100% {
-        opacity: 1;
-      }
-    }
-    .frozenValve1 {
-      z-index: 10;
-      position: absolute;
-      top: 6.75rem;
-      left: 5.22rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .frozenValve2 {
-      z-index: 10;
-      position: absolute;
-      top: 6.11rem;
-      left: 6.99rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .frozenValve3 {
-      z-index: 10;
-      position: absolute;
-      top: 5.38rem;
-      left: 8.51rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .coolingValue1 {
-      z-index: 10;
-      position: absolute;
-      top: 5.86rem;
-      left: 3.3rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .coolingValue2 {
-      z-index: 10;
-      position: absolute;
-      top: 5.33rem;
-      left: 5rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .coolingValue3 {
-      z-index: 10;
-      position: absolute;
-      top: 4.85rem;
-      left: 6.78rem;
-      width: 0.18rem;
-      height: 0.18rem;
-      background-color: #ebebeb;
-      border-radius: 50%;
-    }
-    .statusAndModel {
-      z-index: 10;
-      position: absolute;
-      top: 8.7rem;
-      right: 3rem;
-      width: 3rem;
-      .warnStatus {
-        position: absolute;
-        left: 0.04rem;
-        top: 0.3rem;
-        width: 0.45rem;
-        height: 0.45rem;
-        animation: breathe 4s ease-in-out infinite;
-      }
-      @keyframes breathe {
-        0% {
-          transform: scale(1);
-          opacity: 0.5;
-        }
-        50% {
-          transform: scale(1.1);
-          opacity: 1;
-        }
-        100% {
-          transform: scale(1);
-          opacity: 0.5;
-        }
-      }
-      .modelStatus {
-        position: absolute;
-        top: 0;
-        right: 0rem;
-        width: 2.65rem;
-        height: 0.83rem;
-      }
-      .sysNormal {
-        position: absolute;
-        top: 0.63rem;
-        right: 0.7rem;
-        font-size: 0.14rem;
-        font-weight: bold;
-        color: #89e8f5;
-        letter-spacing: 0.02rem;
-      }
-      .sysWarning {
-        position: absolute;
-        top: 0.63rem;
-        right: 0.7rem;
-        font-size: 0.14rem;
-        font-weight: bold;
-        cursor: pointer;
-        color: #ffffff;
-        letter-spacing: 0.02rem;
-        animation: blink 0.5s ease-in-out infinite;
-      }
-      .sysStatus {
-        position: absolute;
-        top: 0.2rem;
-        left: 0.8rem;
-        font-size: 0.18rem;
-        font-weight: bold;
-        color: #ffffff;
-        letter-spacing: 0.02rem;
-      }
-    }
-  }
-  .weather {
-    min-width: 2.85rem;
-    z-index: 10;
-    position: absolute;
-    top: 1rem;
-    left: 1.1rem;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
-    font-size: 0.2rem;
-    // color: rgb(18, 155, 209);
-    // color: rgb(147, 204, 236);
-    color: rgb(144, 167, 197);
-    background-image: url(../../../assets/images/border1.png);
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    padding: 0.15rem 0.1rem 0.25rem 0rem;
-  }
-  .weather-li {
-    width: 100%;
-    padding: 0.05rem 0 0.05rem 0.3rem;
-    /* 初始设置上下边框宽度为 1px，颜色和样式可以先设为透明，后续由 border-image 覆盖 */
-    border-top: 1px solid transparent;
-    border-bottom: 1px dashed #1a3f8f;
-    position: relative;
-    .deepColor {
-      display: inline-block;
-      margin: 0 0.1rem 0 0.05rem;
-      // color: #20ebfa;
-      // color: #18f13c;
-      // color: #6cf02f;
-      color: #6cf02f;
-      font-weight: bold;
-      font-family: DIN;
-      font-size: 0.25rem;
-    }
-  }
-
-  .performance {
-    position: absolute;
-    top: 6.3rem !important;
-    right: 0rem !important;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
-    font-size: 0.16rem;
-  }
-  .perdformance-bg {
-    width: 2.85rem;
-    z-index: 10;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
-    font-size: 0.2rem;
-    color: rgb(144, 167, 197);
-    background-image: url(../../../assets/images/border4.png);
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    padding: 0.15rem 0.1rem 0.25rem 0rem;
-  }
-  .title {
-    z-index: 10;
-    width: 100%;
-    background-image: url(../../../assets/images/text_img_title.png);
-    background-repeat: no-repeat;
-    background-repeat: no-repeat;
-    background-size: 2rem 0.45rem;
-    background-position: bottom left;
-    font-family: SourceHanSansCN-Medium;
-    font-size: 0.2rem;
-    font-style: italic;
-    font-weight: bold;
-    line-height: 0.6rem;
-    color: rgba(209, 214, 223, 1);
-    padding-left: 0.5rem;
-    margin-bottom: 0.01rem;
-    margin-left: 0.4rem;
-  }
-  .offClass {
-    position: absolute;
-    width: 1.6rem;
-    height: 1.6rem;
-    background-image: url(../../../assets/images/border2.png);
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    top: 0.6rem;
-    right: 0.8rem;
-    z-index: 10;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    .off-bg {
-      position: absolute;
-      left: 0.38rem;
-      top: 0.32rem;
-      width: 1rem;
-      height: 1rem;
-      background-image: url(../../../assets/images/border3.png);
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      text-align: center;
-      line-height: 1rem;
-      font-family: DIN;
-      font-size: 0.3rem;
-      color: #6cf02f;
-      font-weight: bold;
-    }
-    .on-animation {
-      animation: rotateZ 5s linear infinite;
-      transition: 0.6s; /* 设置过渡时间，控制翻转速度 */
-      transform-style: preserve-3d; /* 保持子元素的 3D 效果 */
-    }
-    /* 定义旋转动画 */
-    @keyframes rotateZ {
-      0% {
-        transform: rotateY(0deg); /* 初始状态，不旋转 */
-      }
-      50% {
-        transform: rotateY(180deg); /* 旋转到 180 度，呈现翻面效果 */
-      }
-      100% {
-        transform: rotateY(360deg); /* 旋转回 360 度，回到初始状态 */
-      }
-    }
-  }
-  /* 鼠标悬停时移除动画 */
-  .offClass:hover .on-animation {
-    animation: none;
-  }
-  .sysTips {
-    position: absolute;
-    top: 2.3rem;
-    left: 13.6rem;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    z-index: 10;
-    .step {
-      width: 0.2rem;
-      height: 0.3rem;
-      margin-right: 0.04rem;
-      animation: moveRight 1s ease-in-out infinite alternate;
-    }
-    @keyframes moveRight {
-      0% {
-        transform: translateX(0); /* 初始位置，不移动 */
-      }
-      100% {
-        transform: translateX(0.04rem); /* 向右移动 1rem 的距离 */
-      }
-    }
-    .tips-text {
-      border: 0.01rem solid transparent;
-      border-image: linear-gradient(to right, #007bff, #00ffff);
-      border-image-slice: 1;
-      font-size: 0.18rem;
-      color: #1fecf3;
-      padding: 0.01rem 0.03rem;
-    }
-  }
-  .hotClass {
-    z-index: 10;
-    position: absolute;
-    top: 4.9rem;
-    right: 3.8rem;
-    font-size: 0.16rem;
-    color: #00ffff;
-    font-weight: bold;
-  }
-  .coolingOut-line {
-    z-index: 10;
-    position: absolute;
-    right: 6.5rem;
-    top: 3.45rem;
-    z-index: 10;
-  }
-  .coolingOut-vavle {
-    z-index: 10;
-    position: absolute;
-    top: 2.1rem;
-    right: 4.5rem;
-    font-size: 0.16rem;
-  }
-  .coolingIn-line {
-    z-index: 10;
-    position: absolute;
-    right: 5.8rem;
-    top: 3.67rem;
-    z-index: 10;
-  }
-  .coolingIn-vavle {
-    z-index: 10;
-    position: absolute;
-    top: 2.9rem;
-    right: 3.6rem;
-    font-size: 0.16rem;
-  }
-  .hotIn-vavle {
-    z-index: 10;
-    position: absolute;
-    top: 2.9rem;
-    right: 0.8rem;
-    font-size: 0.16rem;
-  }
-  .hotIn-line {
-    z-index: 10;
-    position: absolute;
-    top: 4.25rem;
-    right: 4rem;
-    font-size: 0.16rem;
-  }
-  .hotOut-vavle {
-    z-index: 10;
-    position: absolute;
-    top: 3.6rem;
-    right: 0.2rem;
-    font-size: 0.16rem;
-  }
-  .hotOut-line {
-    z-index: 10;
-    position: absolute;
-    top: 4.45rem;
-    right: 3.3rem;
-    font-size: 0.16rem;
-  }
-}
-// @media (min-width: 1240px) and (max-width: 1440px) {
-// }
-@media (max-width: 1440px) {
-  .monitor-content {
-    transform: scale(0.9);
-  }
-}
-</style>
-<style scoped>
-.monitor >>> .el-dialog:not(.is-fullscreen) {
-  margin-top: 15% !important;
-}
-</style>
-=======
 <style></style>
->>>>>>> dev
diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue
index 76ac4ed..c1d8540 100644
--- a/src/views/centerairC/sysMonitor/monitorCenter.vue
+++ b/src/views/centerairC/sysMonitor/monitorCenter.vue
@@ -135,7 +135,7 @@
       <!-- 整体图 -->
       <img
         class="monitor-img"
-        src="../../../assets/images/haiwang.png"
+        src="../../../assets/images/meizhou.png"
         alt=""
       />
 
@@ -160,8 +160,8 @@
         :title="`${hostList[0].deviceName}性能`"
         @click="goHostDetail(hostList[0], false)"
       ></div>
-      <div class="hostLoad1" v-if="hostLoadData(0) && hostListRunClass(0)">
-        {{ hostLoad0 }}
+      <div class="hostLoad1" v-if="hostListRunClass(0) && hostLoadData(0)">
+        {{ hostLoad0 }}%
       </div>
       <div class="water-flow1">
         <div class="water-flow-li">
@@ -185,9 +185,9 @@
       </div>
       <line-children
         :angle1="-0"
-        :angle2="-40"
-        :lineWidth1="200"
-        :lineWidth2="100"
+        :angle2="-35"
+        :lineWidth1="190"
+        :lineWidth2="150"
         class="host-line1"
       ></line-children>
       <!-- 主机2数据定位 -->
@@ -211,8 +211,8 @@
         :title="`${hostList[1].deviceName}性能`"
         @click="goHostDetail(hostList[1], false)"
       ></div>
-      <div class="hostLoad2" v-if="hostListRunClass(1) && hostListRunClass(1)">
-        {{ hostLoad1 }}
+      <div class="hostLoad2" v-if="hostListRunClass(1) && hostLoadData(1)">
+        {{ hostLoad1 }}%
       </div>
       <div class="water-flow2">
         <div class="water-flow-li">
@@ -236,9 +236,9 @@
       </div>
       <line-children
         :angle1="-0"
-        :angle2="-40"
-        :lineWidth1="230"
-        :lineWidth2="330"
+        :angle2="-35"
+        :lineWidth1="220"
+        :lineWidth2="360"
         class="host-line2"
       ></line-children>
       <!-- 主机3数据定位 -->
@@ -266,8 +266,8 @@
         @click="goHostDetail(hostList[2], true)"
       ></div>
       <!-- 主机负载 -->
-      <div class="hostLoad3" v-if="hostListRunClass(2) && hostListRunClass(2)">
-        {{ hostLoad2 }}
+      <div class="hostLoad3" v-if="hostListRunClass(2) && hostLoadData(2)">
+        {{ hostLoad2 }}%
       </div>
       <!-- 主机冷却冷冻水流信息 -->
       <div class="water-flow3">
@@ -293,9 +293,9 @@
       <!-- 线+主机冷却水流状态 -->
       <line-children
         :angle1="-0"
-        :angle2="-45"
+        :angle2="-39"
         :lineWidth1="300"
-        :lineWidth2="500"
+        :lineWidth2="530"
         class="host-line3"
       ></line-children>
 
@@ -303,6 +303,8 @@
       <div class="coolingPump1">1#</div>
       <div class="coolingPump2">2#</div>
       <div class="coolingPump3">3#</div>
+      <div class="coolingPump4">4#</div>
+      <div class="coolingPump5">5#</div>
       <!-- 运行状态 -->
       <img
         class="cooling-img1"
@@ -325,6 +327,20 @@
         alt=""
         :class="{ moveClass2: coolingPumpRunClass(2) }"
       />
+      <img
+        class="cooling-img4"
+        v-if="coolingPumpRunClass(3)"
+        src="../../../assets/images/fan-img.png"
+        alt=""
+        :class="{ moveClass2: coolingPumpRunClass(3) }"
+      />
+      <img
+        class="cooling-img5"
+        v-if="coolingPumpRunClass(4)"
+        src="../../../assets/images/fan-img.png"
+        alt=""
+        :class="{ moveClass2: coolingPumpRunClass(4) }"
+      />
       <!-- 频率反馈 -->
       <div
         class="cooling-hz1"
@@ -344,10 +360,24 @@
       >
         {{ coolingPumpHz2 }}Hz
       </div>
+      <div
+        class="cooling-hz4"
+        v-if="coolingPumpHz(3) && coolingPumpRunClass(3)"
+      >
+        {{ coolingPumpHz3 }}Hz
+      </div>
+      <div
+        class="cooling-hz5"
+        v-if="coolingPumpHz(4) && coolingPumpRunClass(4)"
+      >
+        {{ coolingPumpHz4 }}Hz
+      </div>
       <!-- 冷冻泵数据定位 -->
       <div class="freezingPump1">1#</div>
       <div class="freezingPump2">2#</div>
       <div class="freezingPump3">3#</div>
+      <div class="freezingPump4">4#</div>
+      <div class="freezingPump5">5#</div>
       <img
         class="freezing-img1"
         v-if="freezingPumpRunClass(0)"
@@ -369,6 +399,20 @@
         alt=""
         :class="{ moveClass2: freezingPumpRunClass(2) }"
       />
+      <img
+        class="freezing-img4"
+        v-if="freezingPumpRunClass(3)"
+        src="../../../assets/images/fan-img.png"
+        alt=""
+        :class="{ moveClass2: freezingPumpRunClass(3) }"
+      />
+      <img
+        class="freezing-img5"
+        v-if="freezingPumpRunClass(4)"
+        src="../../../assets/images/fan-img.png"
+        alt=""
+        :class="{ moveClass2: freezingPumpRunClass(4) }"
+      />
       <!-- 频率反馈 旋转+有频率反馈才显示 -->
       <div
         class="freezing-hz1"
@@ -388,42 +432,40 @@
       >
         {{ freezingPumpHz2 }}Hz
       </div>
-      <!-- 冷却塔数据定位 五个风机 三个出水阀 -->
-      <div class="coolingTower3">3#-1</div>
-      <div class="coolingTower22">2#-2</div>
-      <div class="coolingTower21">2#-1</div>
-      <div class="coolingTower12">1#-2</div>
-      <div class="coolingTower11">1#-1</div>
-      <!-- 风机频率 -->
       <div
-        class="coolingTowerHz3"
-        v-if="coolingTowerHz(2, 1) && coolingTowerRunClass(2, 1)"
+        class="freezing-hz4"
+        v-if="freezingPumpHz(3) && freezingPumpRunClass(3)"
       >
-        {{ coolingTowerHz31 }}Hz
+        {{ freezingPumpHz3 }}Hz
       </div>
       <div
-        class="coolingTowerHz22"
-        v-if="coolingTowerHz(1, 2) && coolingTowerRunClass(1, 2)"
+        class="freezing-hz5"
+        v-if="freezingPumpHz(4) && freezingPumpRunClass(4)"
       >
-        {{ coolingTowerHz22 }}Hz
+        {{ freezingPumpHz4 }}Hz
       </div>
+      <!-- 冷却塔数据定位 3个风机 三个出水阀 -->
+      <div class="coolingTower3">3#</div>
+      <div class="coolingTower2">2#</div>
+      <div class="coolingTower1">1#</div>
+      <!-- 风机频率 -->
       <div
-        class="coolingTowerHz21"
-        v-if="coolingTowerHz(1, 1) && coolingTowerRunClass(1, 1)"
+        class="coolingTowerHz3"
+        v-if="coolingTowerHz(2, 1) && coolingTowerRunClass(2, 1)"
       >
-        {{ coolingTowerHz21 }}Hz
+        {{ coolingTowerHz3 }}Hz
       </div>
       <div
-        class="coolingTowerHz12"
-        v-if="coolingTowerHz(0, 2) && coolingTowerRunClass(0, 2)"
+        class="coolingTowerHz2"
+        v-if="coolingTowerHz(1, 1) && coolingTowerRunClass(1, 1)"
       >
-        {{ coolingTowerHz12 }}Hz
+        {{ coolingTowerHz2 }}Hz
       </div>
       <div
-        class="coolingTowerHz11"
+        class="coolingTowerHz1"
         v-if="coolingTowerHz(0, 1) && coolingTowerRunClass(0, 1)"
       >
-        {{ coolingTowerHz11 }}Hz
+        {{ coolingTowerHz1 }}Hz
       </div>
       <!-- 3号冷却塔风机1 -->
       <img
@@ -435,36 +477,20 @@
       />
       <!-- 2号冷却塔风机1 -->
       <img
-        class="fan-img3"
+        class="fan-img2"
         v-if="coolingTowerRunClass(1, 1)"
         :class="{ moveClass2: coolingTowerRunClass(1, 1) }"
         src="../../../assets/images/fan-img.png"
         alt=""
       />
-      <!-- 2号冷却塔风机2 -->
-      <img
-        class="fan-img2"
-        v-if="coolingTowerRunClass(1, 2)"
-        :class="{ moveClass2: coolingTowerRunClass(1, 2) }"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-      />
       <!-- 1 号冷却塔风机1 -->
       <img
-        class="fan-img5"
+        class="fan-img3"
         v-if="coolingTowerRunClass(0, 1)"
         :class="{ moveClass2: coolingTowerRunClass(0, 1) }"
         src="../../../assets/images/fan-img.png"
         alt=""
       />
-      <!-- 1号冷却塔风机2 -->
-      <img
-        class="fan-img4"
-        v-if="coolingTowerRunClass(0, 2)"
-        :class="{ moveClass2: coolingTowerRunClass(0, 2) }"
-        src="../../../assets/images/fan-img.png"
-        alt=""
-      />
       <div
         class="towerValve1"
         :class="{ startClass: towerValveControlClass(2) }"
@@ -477,6 +503,18 @@
         class="towerValve3"
         :class="{ startClass: towerValveControlClass(0) }"
       ></div>
+      <div
+        class="towerValve4"
+        :class="{ startClass: towerValveInControlClass(2) }"
+      ></div>
+      <div
+        class="towerValve5"
+        :class="{ startClass: towerValveInControlClass(1) }"
+      ></div>
+      <div
+        class="towerValve6"
+        :class="{ startClass: towerValveInControlClass(0) }"
+      ></div>
       <!-- 冷冻蝶阀数据定位 -->
       <div
         class="frozenValve1"
@@ -542,6 +580,116 @@
         <div class="sysNormal">Normal</div>
         <div class="sysStatus">{{ sysStatus }}</div>
       </div>
+      <!-- 供暖区 -->
+      <div class="hotClass">供暖区</div>
+      <!-- 供冷区进水阀 -->
+      <div class="coolingOut-vavle">
+        <div class="water-flow-li">
+          <span>裙楼供冷进水阀:</span>
+          <span
+            class="break"
+            :class="{
+              connect: hostAndCoolingControlClass(this.coolingInletBuild),
+            }"
+          ></span>
+        </div>
+        <div class="water-flow-li">
+          <span>客房供冷进水阀:</span>
+          <span
+            class="break"
+            :class="{
+              connect: hostAndCoolingControlClass(this.coolingInletGuest),
+            }"
+          ></span>
+        </div>
+      </div>
+      <line-children
+        :angle1="-110"
+        :angle2="0"
+        :lineWidth1="230"
+        :lineWidth2="170"
+        class="coolingOut-line"
+      ></line-children>
+      <!-- 供冷区出水阀 -->
+      <div class="coolingIn-vavle">
+        <div class="water-flow-li">
+          <span>裙楼供冷出水阀:</span>
+          <span
+            class="break"
+            :class="{
+              connect: hostAndCoolingControlClass(this.coolingOutletBuild),
+            }"
+          ></span>
+        </div>
+        <div class="water-flow-li">
+          <span>客房供冷出水阀:</span>
+          <span
+            class="break"
+            :class="{
+              connect: hostAndCoolingControlClass(this.coolingOutletGuest),
+            }"
+          ></span>
+        </div>
+      </div>
+      <line-children
+        :angle1="-110"
+        :angle2="0"
+        :lineWidth1="170"
+        :lineWidth2="170"
+        class="coolingIn-line"
+      ></line-children>
+      <!--供暖区进水阀  -->
+      <div class="hotOut-vavle">
+        <div class="water-flow-li">
+          <span>裙楼供暖进水阀:</span>
+          <span
+            class="break"
+            :class="{ connect: hostAndCoolingControlClass(this.hotInletBuild) }"
+          ></span>
+        </div>
+        <div class="water-flow-li">
+          <span>客房供暖进水阀:</span>
+          <span
+            class="break"
+            :class="{ connect: hostAndCoolingControlClass(this.hotInletGuest) }"
+          ></span>
+        </div>
+      </div>
+      <line-children
+        :angle1="-20"
+        :angle2="0"
+        :lineWidth1="140"
+        :lineWidth2="170"
+        class="hotOut-line"
+      ></line-children>
+      <!--供暖区出水阀  -->
+      <div class="hotIn-vavle">
+        <div class="water-flow-li">
+          <span>裙楼供暖出水阀:</span>
+          <span
+            class="break"
+            :class="{
+              connect: hostAndCoolingControlClass(this.hotOutletBuild),
+            }"
+          ></span>
+        </div>
+        <div class="water-flow-li">
+          <span>客房供暖出水阀:</span>
+          <span
+            class="break"
+            :class="{
+              connect: hostAndCoolingControlClass(this.hotOutletGuest),
+            }"
+          ></span>
+        </div>
+      </div>
+      <line-children
+        :angle1="-30"
+        :angle2="0"
+        :lineWidth1="210"
+        :lineWidth2="170"
+        class="hotIn-line"
+      ></line-children>
     </div>
     <!-- 报警弹框内容 -->
     <el-dialog
@@ -594,6 +742,16 @@ export default {
       coolingValue: [], //冷却蝶阀
       coolingTowerInlet: [], //冷却塔进水阀
       coolingTowerOutlet: [], //冷却塔出水阀
+
+      coolingOutletBuild: [], //裙楼供冷出水阀
+      coolingInletBuild: [], //裙楼供冷进水阀
+      coolingOutletGuest: [], //客房供冷出水阀
+      coolingInletGuest: [], //客房供冷进水阀
+
+      hotOutletBuild: [], //裙楼供暖出水阀
+      hotInletBuild: [], //裙楼供暖进水阀
+      hotOutletGuest: [], //客房供暖出水阀
+      hotInletGuest: [], //客房供暖进水阀
       freezingManifold: [], //冷冻总管
       isShowOn: false, //一键启停,false是Off,true显示On
       oneKeyButtonId: "",
@@ -606,16 +764,18 @@ export default {
       coolingPumpHz0: "",
       coolingPumpHz1: "",
       coolingPumpHz2: "",
+      coolingPumpHz3: "",
+      coolingPumpHz4: "",
       // 冷冻泵频率反馈
       freezingPumpHz0: "",
       freezingPumpHz1: "",
       freezingPumpHz2: "",
+      freezingPumpHz3: "",
+      freezingPumpHz4: "",
       // 冷却塔风机频率
-      coolingTowerHz31: "",
-      coolingTowerHz22: "",
-      coolingTowerHz21: "",
-      coolingTowerHz12: "",
-      coolingTowerHz11: "",
+      coolingTowerHz3: "",
+      coolingTowerHz2: "",
+      coolingTowerHz1: "",
       // 冷冻泵进出水温度
       freezingInTem: "",
       freezingOutTem: "",
@@ -914,6 +1074,14 @@ export default {
           this.coolingTowerInlet = [];
           this.coolingTowerOutlet = [];
           this.freezingManifold = [];
+          this.coolingOutletBuild = []; //裙楼供冷出水阀
+          this.coolingInletBuild = []; //裙楼供冷进水阀
+          this.coolingOutletGuest = []; //客房供冷出水阀
+          this.coolingInletGuest = []; //客房供冷进水阀
+          this.hotOutletBuild = []; //裙楼供暖出水阀
+          this.hotInletBuild = []; //裙楼供暖进水阀
+          this.hotOutletGuest = []; //客房供暖出水阀
+          this.hotInletGuest = []; //客房供暖进水阀
 
           res.rows.forEach((row) => {
             switch (row.name) {
@@ -954,6 +1122,58 @@ export default {
                 console.log("冷冻总管", this.freezingManifold);
                 this.freezingManifoldData();
                 break;
+              case "18":
+                let buildOutData = row.values;
+                buildOutData.forEach((item) => {
+                  if (item.deviceName.includes("供冷")) {
+                    this.coolingOutletBuild.push(item);
+                  }
+                  if (item.deviceName.includes("供暖")) {
+                    this.hotOutletBuild.push(item);
+                  }
+                });
+                console.log("裙楼供冷出水阀", this.coolingOutletBuild);
+                console.log("裙楼供暖出水阀", this.hotOutletBuild);
+                break;
+              case "19":
+                let buildInData = row.values;
+                buildInData.forEach((item) => {
+                  if (item.deviceName.includes("供冷")) {
+                    this.coolingInletBuild.push(item);
+                  }
+                  if (item.deviceName.includes("供暖")) {
+                    this.hotInletBuild.push(item);
+                  }
+                });
+                console.log("裙楼供冷进水阀", this.coolingInletBuild);
+                console.log("裙楼供暖进水阀", this.hotInletBuild);
+                break;
+              case "20":
+                let guestOutData = row.values;
+                guestOutData.forEach((item) => {
+                  if (item.deviceName.includes("供冷")) {
+                    this.coolingOutletGuest.push(item);
+                  }
+                  if (item.deviceName.includes("供暖")) {
+                    this.hotOutletGuest.push(item);
+                  }
+                });
+                console.log("客房供冷出水阀", this.coolingOutletGuest);
+                console.log("客房供暖出水阀", this.hotOutletGuest);
+                break;
+              case "21":
+                let guestInData = row.values;
+                guestInData.forEach((item) => {
+                  if (item.deviceName.includes("供冷")) {
+                    this.coolingInletGuest.push(item);
+                  }
+                  if (item.deviceName.includes("供暖")) {
+                    this.hotInletGuest.push(item);
+                  }
+                });
+                console.log("客房供冷进水阀", this.coolingInletGuest);
+                console.log("客房供暖进水阀", this.hotInletGuest);
+                break;
               default:
                 break;
             }
@@ -1340,6 +1560,47 @@ export default {
       // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
       return valveOpenFeedbackFound && valveCloseFeedbackFound;
     },
+    // 冷却塔进水蝶阀启停状态
+    towerValveInControlClass(index) {
+      // 检查 this.coolingTowerInlet 长度是否足够
+      if (this.coolingTowerInlet.length <= index) {
+        return false;
+      }
+      // console.log("打印this.coolingTowerOutlet数组", this.coolingTowerInlet);
+      // 检查 properties 数组是否存在    coolingTowerInlet[index]数组的properties数组
+      const properties = this.coolingTowerInlet[index].properties;
+      if (!properties || properties.length === 0) {
+        return false;
+      }
+
+      let valveOpenFeedbackFound = false;
+      let valveCloseFeedbackFound = false;
+      // 遍历 properties 数组
+      for (let i = 0; i < properties.length; i++) {
+        const item = properties[i];
+        if (item.paramType === "7") {
+          // console.log("item.collectName", item.collectName);
+          // console.log("item.collectValue", item.collectValue);
+          // 阀开到位是开启
+          if (
+            item.collectName.includes("阀开到位") &&
+            Number(item.collectValue) == 1
+          ) {
+            valveOpenFeedbackFound = true;
+          }
+          // 阀关到位是关闭
+          if (
+            item.collectName.includes("阀关到位") &&
+            Number(item.collectValue) == 0
+          ) {
+            valveCloseFeedbackFound = true;
+          }
+        }
+      }
+
+      // 当阀开到位和阀关到位的条件都满足时返回 true ,才是真正的阀门开启,其他都是阀门关闭
+      return valveOpenFeedbackFound && valveCloseFeedbackFound;
+    },
     // 冷冻蝶阀启停状态
     frozenValveControlClass(index) {
       // 检查 frozenValve 长度是否足够
@@ -1448,6 +1709,36 @@ export default {
       });
       return true;
     },
+    // 裙楼-客房进出水阀启停状态
+    hostAndCoolingControlClass(item) {
+      // 检查数组中是否存在 paramType 为 "7" 的对象
+      const hasParamType7 = item.some((obj) => obj.paramType === "7");
+
+      if (!hasParamType7) {
+        // 如果没有 paramType 为 "7" 的对象
+        for (let i = 0; i < item.length; i++) {
+          if (item[i].paramType === "2") {
+            if (Number(item[i].collectValue) !== 0) {
+              return true;
+            }
+          }
+        }
+      } else {
+        // 如果有 paramType 为 "7" 的对象
+        for (let i = 0; i < item.length; i++) {
+          if (item[i].paramType === "7") {
+            const { collectName, collectValue } = item[i];
+            if (
+              (collectName.includes("开到位") && Number(collectValue) === 1) ||
+              (collectName.includes("关到位") && Number(collectValue) === 0)
+            ) {
+              return true;
+            }
+          }
+        }
+      }
+      return false;
+    },
     // 报警列表
     getAlarnStatus() {
       let data = {
@@ -1581,6 +1872,31 @@ export default {
     min-height: calc(10.74rem - 1rem);
     position: relative;
     margin-left: calc((100% - 16rem) / 2);
+    .sys-logo {
+      width: 1.9rem;
+      height: 0.56rem;
+      position: absolute;
+      top: 0.4rem;
+      left: 0;
+      z-index: 10;
+    }
+    .sys-title {
+      background-image: url(../../../assets/images/top.png);
+      background-size: 100% 100%;
+      width: 16rem;
+      height: 0.5rem;
+      position: absolute;
+      top: 0;
+      left: 0;
+      font-size: 0.22rem;
+      color: #ffffff;
+      font-weight: bold;
+      z-index: 100;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+    }
     .monitor-img {
       position: absolute;
       top: 0.2rem;
@@ -1593,8 +1909,8 @@ export default {
     .fan-img1 {
       z-index: 10;
       position: absolute;
-      top: 1.06rem;
-      left: 5.2rem;
+      top: 1.04rem;
+      left: 7.2rem;
       width: 0.5rem;
       height: 0.5rem;
       transform-style: preserve-3d;
@@ -1603,8 +1919,8 @@ export default {
     .fan-img2 {
       z-index: 10;
       position: absolute;
-      top: 0.77rem;
-      left: 6.2rem;
+      top: 0.98rem;
+      left: 7.65rem;
       width: 0.5rem;
       height: 0.5rem;
       transform-style: preserve-3d;
@@ -1613,28 +1929,8 @@ export default {
     .fan-img3 {
       z-index: 10;
       position: absolute;
-      top: 0.67rem;
-      left: 6.69rem;
-      width: 0.5rem;
-      height: 0.5rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .fan-img4 {
-      z-index: 10;
-      position: absolute;
-      top: 0.46rem;
-      left: 7.54rem;
-      width: 0.5rem;
-      height: 0.5rem;
-      transform-style: preserve-3d;
-      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
-    }
-    .fan-img5 {
-      z-index: 10;
-      position: absolute;
-      top: 0.34rem;
-      left: 7.95rem;
+      top: 0.92rem;
+      left: 8.07rem;
       width: 0.5rem;
       height: 0.5rem;
       transform-style: preserve-3d;
@@ -1654,8 +1950,8 @@ export default {
     .towerValve1 {
       z-index: 10;
       position: absolute;
-      top: 1.51rem;
-      left: 5.91rem;
+      top: 1.43rem;
+      left: 7.7rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -1664,8 +1960,8 @@ export default {
     .towerValve2 {
       z-index: 10;
       position: absolute;
-      top: 1.24rem;
-      left: 7.02rem;
+      top: 1.37rem;
+      left: 8.13rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -1674,8 +1970,38 @@ export default {
     .towerValve3 {
       z-index: 10;
       position: absolute;
-      top: 0.91rem;
-      left: 8.29rem;
+      top: 1.3rem;
+      left: 8.56rem;
+      width: 0.18rem;
+      height: 0.18rem;
+      background-color: #ebebeb;
+      border-radius: 50%;
+    }
+    .towerValve4 {
+      z-index: 10;
+      position: absolute;
+      top: 2.35rem;
+      left: 7.62rem;
+      width: 0.18rem;
+      height: 0.18rem;
+      background-color: #ebebeb;
+      border-radius: 50%;
+    }
+    .towerValve5 {
+      z-index: 10;
+      position: absolute;
+      top: 2.27rem;
+      left: 8.02rem;
+      width: 0.18rem;
+      height: 0.18rem;
+      background-color: #ebebeb;
+      border-radius: 50%;
+    }
+    .towerValve6 {
+      z-index: 10;
+      position: absolute;
+      top: 2.2rem;
+      left: 8.44rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -1683,58 +2009,58 @@ export default {
     }
     .in-arrow {
       position: absolute;
-      top: 2.9rem;
-      right: 3.6rem;
+      top: 3.46rem;
+      right: 2.78rem;
       transform: rotate(180deg);
-      width: 0.4rem;
-      height: 0.6rem;
+      width: 0.3rem;
+      height: 0.45rem;
       z-index: 10;
     }
     .out-arrow {
       position: absolute;
-      top: 3.7rem;
-      right: 1.3rem;
-      width: 0.4rem;
-      height: 0.6rem;
+      top: 3.4rem;
+      right: 3.05rem;
+      width: 0.3rem;
+      height: 0.45rem;
       z-index: 10;
     }
     .coolingInTem {
       z-index: 10;
       position: absolute;
-      top: 2.2rem;
-      left: 8.35rem;
+      top: 2.9rem;
+      left: 6.8rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .coolingOutTem {
       z-index: 10;
       position: absolute;
-      top: 3.1rem;
-      left: 4.77rem;
+      top: 2.9rem;
+      left: 5.85rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .freezingInTem {
       z-index: 10;
       position: absolute;
-      top: 4.45rem;
-      right: 4.35rem;
+      top: 4rem;
+      right: 5.5rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .freezingOutTem {
       z-index: 10;
       position: absolute;
-      top: 5.06rem;
-      right: 2.9rem;
+      top: 4.2rem;
+      right: 5rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .freezingOutWater {
       z-index: 10;
       position: absolute;
-      top: 6.2rem;
-      right: 4.4rem;
+      top: 5.4rem;
+      right: 4.9rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
@@ -1742,35 +2068,35 @@ export default {
     .freezingInPre {
       z-index: 10;
       position: absolute;
-      top: 4.9rem;
-      right: 4.9rem;
+      top: 4.3rem;
+      right: 6.3rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .freezingOutPre {
       z-index: 10;
       position: absolute;
-      top: 5.6rem;
-      right: 3.4rem;
+      top: 4.7rem;
+      right: 6rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .host-line1 {
       position: absolute;
-      left: -0.2rem;
-      top: 7.04rem;
+      left: -0.5rem;
+      top: 6.55rem;
       z-index: 10;
     }
     .host-line2 {
       position: absolute;
-      left: -0.25rem;
-      top: 7.72rem;
+      left: -0.5rem;
+      top: 7.3rem;
       z-index: 10;
     }
     .host-line3 {
       position: absolute;
-      left: 0.3rem;
-      top: 8.4rem;
+      left: -0.4rem;
+      top: 8.02rem;
       z-index: 10;
     }
     .hostName1 {
@@ -1780,9 +2106,9 @@ export default {
       font-weight: bold;
       color: aqua;
       position: absolute;
-      top: 6.95rem;
-      left: 2.85rem;
-      transform: rotateX(50deg) rotateY(0deg) rotateZ(45deg); /* 分别在 X、Y、Z 轴上旋转 */
+      top: 6.35rem;
+      left: 3.05rem;
+      transform: rotateX(50deg) rotateY(0deg) rotateZ(46deg); /* 分别在 X、Y、Z 轴上旋转 */
       transform-origin: bottom center; /* 设置旋转的基点为底部中心 */
       text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9); /* 添加文字阴影增强立体感 */
     }
@@ -1793,8 +2119,8 @@ export default {
       font-weight: bold;
       color: aqua;
       position: absolute;
-      top: 6.15rem;
-      left: 4.87rem;
+      top: 5.73rem;
+      left: 4.89rem;
       transform: rotateX(50deg) rotateY(0deg) rotateZ(42deg);
       transform-origin: bottom center;
       text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9);
@@ -1806,9 +2132,9 @@ export default {
       font-weight: bold;
       color: aqua;
       position: absolute;
-      top: 5.3rem;
-      left: 6.7rem;
-      transform: rotateX(50deg) rotateY(0deg) rotateZ(39deg);
+      top: 5.14rem;
+      left: 6.47rem;
+      transform: rotateX(50deg) rotateY(0deg) rotateZ(36deg);
       transform-origin: bottom center;
       text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9);
     }
@@ -1826,8 +2152,8 @@ export default {
     .host-img1 {
       z-index: 10;
       position: absolute;
-      top: 6.83rem;
-      left: 4.3rem;
+      top: 6.25rem;
+      left: 4.5rem;
       width: 0.4rem;
       height: 0.4rem;
       transform-style: preserve-3d;
@@ -1836,8 +2162,8 @@ export default {
     .host-img2 {
       z-index: 10;
       position: absolute;
-      top: 6rem;
-      left: 6.3rem;
+      top: 5.62rem;
+      left: 6.28rem;
       width: 0.4rem;
       height: 0.4rem;
       transform-style: preserve-3d;
@@ -1846,8 +2172,8 @@ export default {
     .host-img3 {
       z-index: 10;
       position: absolute;
-      top: 5.22rem;
-      left: 8.43rem;
+      top: 5.05rem;
+      left: 8.18rem;
       width: 0.4rem;
       height: 0.4rem;
       transform-style: preserve-3d;
@@ -1856,20 +2182,20 @@ export default {
     .host-main1 {
       z-index: 100;
       position: absolute;
-      top: 5.99rem;
-      left: 4.02rem;
+      top: 5.4rem;
+      left: 4.15rem;
       width: 1.6rem;
-      height: 1.3rem;
+      height: 1.4rem;
       // background-color: #007bff;
       cursor: pointer;
       opacity: 0.4;
       transform-style: preserve-3d;
-      transform: translateX(-50%) rotateY(0deg) rotateX(0deg) rotateZ(30deg);
+      transform: translateX(-50%) rotateY(0deg) rotateX(0deg) rotateZ(35deg);
     }
     .host-main2 {
       z-index: 100;
       position: absolute;
-      top: 5.13rem;
+      top: 4.8rem;
       left: 6rem;
       width: 1.55rem;
       height: 1.3rem;
@@ -1882,8 +2208,8 @@ export default {
     .host-main3 {
       z-index: 100;
       position: absolute;
-      top: 4.6rem;
-      left: 8rem;
+      top: 4.4rem;
+      left: 7.7rem;
       width: 1.5rem;
       height: 1rem;
       // background-color: #007bff;
@@ -1895,46 +2221,46 @@ export default {
     .hostLoad1 {
       z-index: 10;
       position: absolute;
-      top: 6.4rem;
-      left: 4.1rem;
+      top: 5.9rem;
+      left: 4.09rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .hostLoad2 {
       z-index: 10;
       position: absolute;
-      top: 5.6rem;
-      left: 6.1rem;
+      top: 5.35rem;
+      left: 5.93rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .hostLoad3 {
       z-index: 10;
       position: absolute;
-      top: 4.8rem;
-      left: 8.05rem;
+      top: 4.5rem;
+      left: 7.6rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .water-flow1 {
       z-index: 10;
       position: absolute;
-      top: 7.5rem;
-      left: 0.75rem;
+      top: 7rem;
+      left: 0.6rem;
       font-size: 0.16rem;
     }
     .water-flow2 {
       z-index: 10;
       position: absolute;
-      top: 8.18rem;
-      left: 1rem;
+      top: 7.76rem;
+      left: 0.6rem;
       font-size: 0.16rem;
     }
     .water-flow3 {
       z-index: 10;
       position: absolute;
-      top: 8.84rem;
-      left: 1.52rem;
+      top: 8.48rem;
+      left: 0.8rem;
       font-size: 0.16rem;
     }
     .water-flow-li {
@@ -1976,7 +2302,7 @@ export default {
     .hostStatus1 {
       z-index: 10;
       position: absolute;
-      top: 6.4rem;
+      top: 5.9rem;
       left: 3.8rem;
       width: 0.18rem;
       height: 0.18rem;
@@ -1985,8 +2311,8 @@ export default {
     .hostStatus2 {
       z-index: 10;
       position: absolute;
-      top: 5.6rem;
-      left: 5.83rem;
+      top: 5.35rem;
+      left: 5.7rem;
       width: 0.18rem;
       height: 0.18rem;
       border-radius: 50%;
@@ -1994,8 +2320,8 @@ export default {
     .hostStatus3 {
       z-index: 10;
       position: absolute;
-      top: 4.8rem;
-      left: 7.8rem;
+      top: 4.7rem;
+      left: 7.6rem;
       width: 0.18rem;
       height: 0.18rem;
       border-radius: 50%;
@@ -2006,8 +2332,8 @@ export default {
       font-weight: bold;
       color: #46f1e3;
       position: absolute;
-      top: 4.07rem;
-      left: 7.57rem;
+      top: 3.9rem;
+      left: 7.23rem;
     }
     .coolingPump2 {
       z-index: 10;
@@ -2015,8 +2341,8 @@ export default {
       font-weight: bold;
       color: #46f1e3;
       position: absolute;
-      top: 3.67rem;
-      left: 8.5rem;
+      top: 3.75rem;
+      left: 7.68rem;
     }
     .coolingPump3 {
       z-index: 10;
@@ -2024,60 +2350,114 @@ export default {
       font-weight: bold;
       color: #46f1e3;
       position: absolute;
-      top: 3.34rem;
-      left: 9.4rem;
+      top: 3.6rem;
+      left: 8.22rem;
+    }
+    .coolingPump4 {
+      z-index: 10;
+      font-size: 0.15rem;
+      font-weight: bold;
+      color: #46f1e3;
+      position: absolute;
+      top: 3.5rem;
+      left: 8.68rem;
+    }
+    .coolingPump5 {
+      z-index: 10;
+      font-size: 0.15rem;
+      font-weight: bold;
+      color: #46f1e3;
+      position: absolute;
+      top: 3.4rem;
+      left: 9.1rem;
     }
     .cooling-img1 {
       z-index: 10;
       position: absolute;
-      top: 3.57rem;
-      left: 7.65rem;
-      width: 0.4rem;
-      height: 0.4rem;
+      top: 3.48rem;
+      left: 7.25rem;
+      width: 0.35rem;
+      height: 0.35rem;
       transform-style: preserve-3d;
       transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
     }
     .cooling-img2 {
       z-index: 10;
       position: absolute;
-      top: 3.24rem;
-      left: 8.58rem;
-      width: 0.4rem;
-      height: 0.4rem;
+      top: 3.36rem;
+      left: 7.75rem;
+      width: 0.35rem;
+      height: 0.35rem;
       transform-style: preserve-3d;
       transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
     }
     .cooling-img3 {
       z-index: 10;
       position: absolute;
-      top: 2.93rem;
-      left: 9.49rem;
-      width: 0.4rem;
-      height: 0.4rem;
+      top: 3.23rem;
+      left: 8.28rem;
+      width: 0.35rem;
+      height: 0.35rem;
+      transform-style: preserve-3d;
+      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
+    }
+    .cooling-img4 {
+      z-index: 10;
+      position: absolute;
+      top: 3.11rem;
+      left: 8.74rem;
+      width: 0.35rem;
+      height: 0.35rem;
+      transform-style: preserve-3d;
+      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
+    }
+    .cooling-img5 {
+      z-index: 10;
+      position: absolute;
+      top: 3rem;
+      left: 9.18rem;
+      width: 0.35rem;
+      height: 0.35rem;
       transform-style: preserve-3d;
       transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
     }
     .cooling-hz1 {
       z-index: 10;
       position: absolute;
-      top: 3.5rem;
-      left: 7.43rem;
+      top: 3.42rem;
+      left: 6.95rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .cooling-hz2 {
       z-index: 10;
       position: absolute;
-      top: 3.17rem;
-      left: 8.35rem;
+      top: 3.3rem;
+      left: 7.5rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .cooling-hz3 {
       z-index: 10;
       position: absolute;
-      top: 2.87rem;
-      left: 9.25rem;
+      top: 3.16rem;
+      left: 8rem;
+      font-size: 0.16rem;
+      font-weight: bold;
+    }
+    .cooling-hz4 {
+      z-index: 10;
+      position: absolute;
+      top: 2.99rem;
+      left: 8.48rem;
+      font-size: 0.16rem;
+      font-weight: bold;
+    }
+    .cooling-hz5 {
+      z-index: 10;
+      position: absolute;
+      top: 2.92rem;
+      left: 9.05rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
@@ -2087,8 +2467,8 @@ export default {
       font-weight: bold;
       color: #46f1e3;
       position: absolute;
-      top: 7.56rem;
-      left: 7.11rem;
+      top: 7.8rem;
+      left: 6.2rem;
     }
     .freezingPump2 {
       z-index: 10;
@@ -2096,8 +2476,8 @@ export default {
       font-weight: bold;
       color: #46f1e3;
       position: absolute;
-      top: 6.89rem;
-      left: 8.43rem;
+      top: 7.43rem;
+      left: 6.96rem;
     }
     .freezingPump3 {
       z-index: 10;
@@ -2105,14 +2485,32 @@ export default {
       font-weight: bold;
       color: #46f1e3;
       position: absolute;
-      top: 6.38rem;
-      left: 9.5rem;
+      top: 6.7rem;
+      left: 8.6rem;
+    }
+    .freezingPump4 {
+      z-index: 10;
+      font-size: 0.15rem;
+      font-weight: bold;
+      color: #46f1e3;
+      position: absolute;
+      top: 6.4rem;
+      left: 9.15rem;
+    }
+    .freezingPump5 {
+      z-index: 10;
+      font-size: 0.15rem;
+      font-weight: bold;
+      color: #46f1e3;
+      position: absolute;
+      top: 6.2rem;
+      left: 9.7rem;
     }
     .freezing-img1 {
       z-index: 10;
       position: absolute;
-      top: 7rem;
-      left: 7.18rem;
+      top: 7.25rem;
+      left: 6.25rem;
       width: 0.4rem;
       height: 0.4rem;
       transform-style: preserve-3d;
@@ -2121,8 +2519,8 @@ export default {
     .freezing-img2 {
       z-index: 10;
       position: absolute;
-      top: 6.41rem;
-      left: 8.51rem;
+      top: 6.89rem;
+      left: 7.04rem;
       width: 0.4rem;
       height: 0.4rem;
       transform-style: preserve-3d;
@@ -2131,8 +2529,28 @@ export default {
     .freezing-img3 {
       z-index: 10;
       position: absolute;
-      top: 5.91rem;
-      left: 9.6rem;
+      top: 6.2rem;
+      left: 8.67rem;
+      width: 0.4rem;
+      height: 0.4rem;
+      transform-style: preserve-3d;
+      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
+    }
+    .freezing-img4 {
+      z-index: 10;
+      position: absolute;
+      top: 5.95rem;
+      left: 9.22rem;
+      width: 0.4rem;
+      height: 0.4rem;
+      transform-style: preserve-3d;
+      transform: translateX(-50%) rotateX(60deg) rotateZ(0deg);
+    }
+    .freezing-img5 {
+      z-index: 10;
+      position: absolute;
+      top: 5.72rem;
+      left: 9.76rem;
       width: 0.4rem;
       height: 0.4rem;
       transform-style: preserve-3d;
@@ -2141,126 +2559,102 @@ export default {
     .freezing-hz1 {
       z-index: 10;
       position: absolute;
-      top: 6.96rem;
-      left: 6.93rem;
+      top: 7.21rem;
+      left: 6rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .freezing-hz2 {
       z-index: 10;
       position: absolute;
-      top: 6.36rem;
-      left: 8.25rem;
+      top: 6.85rem;
+      left: 6.82rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
     .freezing-hz3 {
       z-index: 10;
       position: absolute;
-      top: 5.85rem;
-      left: 9.36rem;
+      top: 6.16rem;
+      left: 8.35rem;
       font-size: 0.16rem;
       font-weight: bold;
     }
-    .coolingTower3 {
+    .freezing-hz4 {
       z-index: 10;
-      font-size: 0.18rem;
-      color: #46f1e3;
       position: absolute;
-      top: 2.1rem;
-      left: 5.34rem;
+      top: 5.89rem;
+      left: 8.93rem;
+      font-size: 0.16rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
     }
-    .coolingTower22 {
+    .freezing-hz5 {
       z-index: 10;
-      font-size: 0.18rem;
-      color: #46f1e3;
       position: absolute;
-      top: 1.8rem;
-      left: 6.3rem;
+      top: 5.68rem;
+      left: 9.46rem;
+      font-size: 0.16rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
     }
-    .coolingTower21 {
+    .coolingTower3 {
       z-index: 10;
       font-size: 0.18rem;
       color: #46f1e3;
       position: absolute;
-      top: 1.7rem;
-      left: 6.76rem;
+      top: 1.8rem;
+      left: 7.35rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
+      transform: rotateX(20deg) rotateY(-25deg) rotateZ(0deg);
     }
-    .coolingTower12 {
+    .coolingTower2 {
       z-index: 10;
       font-size: 0.18rem;
       color: #46f1e3;
       position: absolute;
-      top: 1.47rem;
-      left: 7.57rem;
+      top: 1.73rem;
+      left: 7.75rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
+      transform: rotateX(20deg) rotateY(-25deg) rotateZ(0deg);
     }
-    .coolingTower11 {
+    .coolingTower1 {
       z-index: 10;
       font-size: 0.18rem;
       color: #46f1e3;
       position: absolute;
-      top: 1.36rem;
-      left: 8rem;
+      top: 1.65rem;
+      left: 8.16rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
+      transform: rotateX(20deg) rotateY(-25deg) rotateZ(0deg);
     }
-    .coolingTowerHz11 {
+    .coolingTowerHz1 {
       z-index: 10;
       font-size: 0.16rem;
       color: #ffffff;
       position: absolute;
-      top: 0.33rem;
-      left: 7.5rem;
+      top: 0.86rem;
+      left: 7.71rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
+      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
     }
-    .coolingTowerHz12 {
+    .coolingTowerHz2 {
       z-index: 10;
       font-size: 0.16rem;
       color: #ffffff;
       position: absolute;
-      top: 0.48rem;
-      left: 7.03rem;
+      top: 0.95rem;
+      left: 7.16rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
-    }
-    .coolingTowerHz21 {
-      z-index: 10;
-      font-size: 0.16rem;
-      color: #ffffff;
-      position: absolute;
-      top: 0.65rem;
-      left: 6.2rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
-    }
-    .coolingTowerHz22 {
-      z-index: 10;
-      font-size: 0.16rem;
-      color: #ffffff;
-      position: absolute;
-      top: 0.79rem;
-      left: 5.64rem;
-      font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
+      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
     }
     .coolingTowerHz3 {
       z-index: 10;
       font-size: 0.16rem;
       color: #ffffff;
       position: absolute;
-      top: 1rem;
-      left: 4.7rem;
+      top: 1.05rem;
+      left: 6.6rem;
       font-weight: bold;
-      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-5deg);
+      transform: rotateX(20deg) rotateY(-25deg) rotateZ(-2deg);
     }
     /* 定义灯闪烁的动画 */
     @keyframes blink {
@@ -2277,8 +2671,8 @@ export default {
     .frozenValve1 {
       z-index: 10;
       position: absolute;
-      top: 6.75rem;
-      left: 4.88rem;
+      top: 6.27rem;
+      left: 5.15rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -2287,8 +2681,8 @@ export default {
     .frozenValve2 {
       z-index: 10;
       position: absolute;
-      top: 5.93rem;
-      left: 6.87rem;
+      top: 5.61rem;
+      left: 6.96rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -2297,8 +2691,8 @@ export default {
     .frozenValve3 {
       z-index: 10;
       position: absolute;
-      top: 5rem;
-      left: 8.73rem;
+      top: 4.88rem;
+      left: 8.53rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -2307,8 +2701,8 @@ export default {
     .coolingValue1 {
       z-index: 10;
       position: absolute;
-      top: 5.93rem;
-      left: 2.97rem;
+      top: 5.37rem;
+      left: 3.16rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -2317,8 +2711,8 @@ export default {
     .coolingValue2 {
       z-index: 10;
       position: absolute;
-      top: 5.17rem;
-      left: 4.98rem;
+      top: 4.85rem;
+      left: 4.92rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -2327,8 +2721,8 @@ export default {
     .coolingValue3 {
       z-index: 10;
       position: absolute;
-      top: 4.45rem;
-      left: 7.11rem;
+      top: 4.35rem;
+      left: 6.77rem;
       width: 0.18rem;
       height: 0.18rem;
       background-color: #ebebeb;
@@ -2337,8 +2731,8 @@ export default {
     .statusAndModel {
       z-index: 10;
       position: absolute;
-      top: 8.6rem;
-      right: 2.3rem;
+      top: 8.5rem;
+      right: 2.7rem;
       width: 3rem;
       .warnStatus {
         position: absolute;
@@ -2404,8 +2798,8 @@ export default {
     min-width: 2.85rem;
     z-index: 10;
     position: absolute;
-    top: 0.5rem;
-    left: 0rem;
+    top: 0.2rem;
+    left: 1.1rem;
     display: flex;
     flex-direction: column;
     align-items: flex-start;
@@ -2441,8 +2835,8 @@ export default {
 
   .performance {
     position: absolute;
-    top: 6.2rem !important;
-    right: -1rem !important;
+    top: 6.1rem !important;
+    right: -0.6rem !important;
     display: flex;
     flex-direction: column;
     align-items: flex-start;
@@ -2488,7 +2882,7 @@ export default {
     background-image: url(../../../assets/images/border2.png);
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    top: 0.5rem;
+    top: 0.6rem;
     right: 0.3rem;
     z-index: 10;
     display: flex;
@@ -2536,8 +2930,8 @@ export default {
   }
   .sysTips {
     position: absolute;
-    top: 2.2rem;
-    left: 14.3rem;
+    top: 2.3rem;
+    left: 14.2rem;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -2642,6 +3036,71 @@ export default {
       transform: scale(1.1);
     }
   }
+  .hotClass {
+    z-index: 10;
+    position: absolute;
+    top: 4.3rem;
+    right: 3.7rem;
+    font-size: 0.16rem;
+    color: #00ffff;
+    font-weight: bold;
+  }
+  .coolingOut-line {
+    z-index: 10;
+    position: absolute;
+    right: 6.45rem;
+    top: 2.95rem;
+    z-index: 10;
+  }
+  .coolingOut-vavle {
+    z-index: 10;
+    position: absolute;
+    top: 1.2rem;
+    right: 4.5rem;
+    font-size: 0.16rem;
+  }
+  .coolingIn-line {
+    z-index: 10;
+    position: absolute;
+    right: 5.6rem;
+    top: 3.2rem;
+    z-index: 10;
+  }
+  .coolingIn-vavle {
+    z-index: 10;
+    position: absolute;
+    top: 2.0rem;
+    right: 3.6rem;
+    font-size: 0.16rem;
+  }
+  .hotIn-vavle {
+    z-index: 10;
+    position: absolute;
+    top: 3.1rem;
+    right: -0.5rem;
+    font-size: 0.16rem;
+  }
+  .hotIn-line {
+    z-index: 10;
+    position: absolute;
+    top: 3.72rem;
+    right: 3.9rem;
+    font-size: 0.16rem;
+  }
+  .hotOut-vavle {
+    z-index: 10;
+    position: absolute;
+    top: 3.96rem;
+    right: -0.8rem;
+    font-size: 0.16rem;
+  }
+  .hotOut-line {
+    z-index: 10;
+    position: absolute;
+    top: 4rem;
+    right: 3.1rem;
+    font-size: 0.16rem;
+  }
 }
 // @media (min-width: 1240px) and (max-width: 1440px) {
 // }
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 7888ffe..78a6829 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -285,11 +285,7 @@
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
               <el-input
-<<<<<<< HEAD
-                style="width: 76%"
-=======
               style="width: 76%;"
->>>>>>> dev
                 v-model="form.cronExpression"
                 placeholder="请输入cron执行表达式"
               >
diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue
index daa51c6..db7199f 100644
--- a/src/views/tool/build/index.vue
+++ b/src/views/tool/build/index.vue
@@ -599,11 +599,7 @@ $lighterBlue: #409eff;
   height: calc(100vh - 42px);
   overflow: hidden;
   border-left: 1px solid #0e5191;
-<<<<<<< HEAD
-  border-left: 1px solid #0e5191;
-=======
   border-right: 1px solid #0e5191 ;
->>>>>>> dev
   box-sizing: border-box;
 }
 .center-board {
@@ -627,13 +623,8 @@ $lighterBlue: #409eff;
   height: 42px;
   text-align: right;
   padding: 0 15px;
-<<<<<<< HEAD
-  box-sizing: border-box;
-  border: 1px solid #0e5191;
-=======
   box-sizing: border-box;;
   border: 1px solid  #0e5191 ;
->>>>>>> dev
   border-top: none;
   border-left: none;
   .delete-btn {