修改甲方要求

src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue

@@ -468,7 +468,7 @@
         <div
           class="offClass"
           @click="handleOneKeyButton(remoteManualObj, '远程手动停止')"
-          v-if="isObjectValid(remoteManualObj) && startStopValue === 0"
+          v-if="isObjectValid(remoteManualObj) && startStopValue === 0 && !automaticObj.collectValue"
         >
           <div v-if="remoteManualObj.collectValue" class="off-bg on-animation">
             运行
@@ -479,7 +479,7 @@
         <div
           class="offClass"
           @click="handleOneKeyButton(timeScheduleObj, '时间表停止')"
-          v-if="isObjectValid(timeScheduleObj) && startStopValue === 1"
+          v-if="isObjectValid(timeScheduleObj) && startStopValue === 1 && !automaticObj.collectValue"
         >
           <div v-if="timeScheduleObj.collectValue" class="off-bg on-animation">
             运行
@@ -681,6 +681,7 @@ export default {
       isShowMode2: false,
       isShowMode3: false,
       isShowMode4: false,
+      timer: null, // 用于存储定时器 ID
     };
   },
   watch: {
@@ -726,6 +727,7 @@ export default {
       },
     },
   },
+
   created() {
     const weekdays = [
       "星期日",
@@ -741,6 +743,18 @@ export default {
     this.currentWeekday = weekdays[dayIndex];
     console.log("今天是星期几", this.currentWeekday);
   },
+  mounted() {
+    // 设置定时器，每 10 秒执行一次
+    this.timer = setInterval(() => {
+      this.getWindList(this.currentId);
+    }, 10000);
+  },
+  beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+  },
   methods: {
     // 判断对象是否有效（不为空且不为 undefined）
     isObjectValid(obj) {
@@ -2102,7 +2116,7 @@ export default {
       text-align: center;
       line-height: 1rem;
       font-family: DIN;
-      font-size: 0.3rem;
+      font-size: 0.22rem;
       color: #6cf02f;
       font-weight: bold;
     }

src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="right-monitor">
+  <div class="right-monitor" v-loading="loading">
     <div class="buildingDiv">
       <img
         class="title-bg"
@@ -141,7 +141,11 @@
           </div>
         </div>
         <!--风机启停控制 -->
-        <div class="offClass" @click="handleOneKeyButton(startControlObj)">
+        <div
+          class="offClass"
+          @click="handleOneKeyButton(startControlObj)"
+          v-if="!automaticObj.collectValue"
+        >
           <div v-if="startControlObj.collectValue" class="off-bg on-animation">
             运行
           </div>
@@ -390,6 +394,8 @@ export default {
       isOpenTimeSwitch: false,
       delayList: [],
       currentWeekday: "",
+
+      timer: null, // 用于存储定时器 ID
     };
   },
   watch: {
@@ -450,6 +456,18 @@ export default {
     this.currentWeekday = weekdays[dayIndex];
     console.log("今天是星期几", this.currentWeekday);
   },
+  mounted() {
+    // 设置定时器，每 10 秒执行一次
+    this.timer = setInterval(() => {
+      this.getWindList(this.currentId);
+    }, 10000);
+  },
+  beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+  },
   methods: {
     // 判断对象是否有效（不为空且不为 undefined）
     isObjectValid(obj) {
@@ -699,13 +717,13 @@ export default {
           if (res.code == 200) {
             this.$modal.msgSuccess("指令下发成功!");
             // // 开启 loading 效果
-            // this.loading = true;
+            this.loading = true;
             // 更新所有设备状态;
             setTimeout(() => {
               this.getWindList(this.currentId);
             }, 5000);
             // // 关闭 loading 效果
-            // this.loading = false;
+            this.loading = false;
           } else {
             // this.$modal.msgError("操作失败");
             console.log("应该更新状态的");
@@ -1172,7 +1190,7 @@ export default {
       text-align: center;
       line-height: 1rem;
       font-family: DIN;
-      font-size: 0.3rem;
+      font-size: 0.22rem;
       color: #6cf02f;
       font-weight: bold;
     }

src/views/boilerSys/boilerMonitor/boilerMonitorDetails.vue

@@ -16,7 +16,7 @@
         src="../../../assets/images/title-right.png"
         alt=""
       />
-      <div class="sys-title" @click="goSys">蒸汽锅炉监测</div>
+      <div class="sys-title" @click="goSys">洗衣房蒸汽机监测</div>
       <!-- logo -->
       <img src="../../../assets/images/logo-3.png" class="sys-logo" alt="" />
       <div class="nowTime">{{ formattedDate }}</div>
@@ -301,6 +301,7 @@ export default {
       loading: false,
       currentDate: new Date(),
       nowTimer: null,
+      timer: null, // 用于存储定时器 ID
       isShowWarning: false, //是否有报警
       dayData: "", //监测天数
       currentWeekday: "",
@@ -360,8 +361,18 @@ export default {
     }, 100); // 延迟 100 毫秒执行全屏操作
     // 获取蒸汽锅炉数据
     this.getSteamBoiler();
+    // 设置定时器，每 10 秒执行一次
+    this.timer = setInterval(() => {
+      this.getAlarnStatus();
+      this.getDayData();
+      this.getSteamBoiler();
+    }, 10000);
   },
   beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
     // 组件销毁前清除定时器
     if (this.nowTimer) {
       clearInterval(this.nowTimer);

src/views/boilerSys/hotWaterBoiler/hotWaterBoilerDetails.vue

@@ -225,6 +225,7 @@ export default {
       loading: false,
       currentDate: new Date(),
       nowTimer: null,
+      timer: null, // 用于存储定时器 ID
       isShowWarning: false, //是否有报警
       dayData: "", //监测天数
       currentWeekday: "",
@@ -273,8 +274,19 @@ export default {
     this.getDayData();
     // 获取当前热水锅炉数据
     this.getHotWaterBoiler();
+    // 设置定时器，每 10 秒执行一次
+    this.timer = setInterval(() => {
+      this.getAlarnStatus();
+      this.getDayData();
+      // 获取当前热水锅炉数据
+      this.getHotWaterBoiler();
+    }, 10000);
   },
   beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
     // 组件销毁前清除定时器
     if (this.nowTimer) {
       clearInterval(this.nowTimer);

src/views/centerairC/sysMonitor/monitorCenter.vue

@@ -57,7 +57,7 @@
           <span class="deepColor">{{ weatherObj.humidity }}</span>
           <span>%</span>
         </div>
-        <div class="weather-li">
+        <!-- <div class="weather-li">
           <span>室外含湿：</span>
           <span class="deepColor">{{ weatherObj.humidityRatio }}</span>
           <span>g/kg</span>
@@ -76,7 +76,7 @@
           <span>室外湿球：</span>
           <span class="deepColor">{{ weatherObj.wetBulbTemp }}</span>
           <span>℃</span>
-        </div>
+        </div> -->
       </div>
       <!-- 系统性能数据 -->
       <div class="performance">
@@ -115,7 +115,7 @@
         </div>
       </div>
       <!-- 主机加减载时间 -->
-      <div class="detail-data-bottom">
+      <!-- <div class="detail-data-bottom">
         <div class="detail-data-li">
           <div class="rightDot">
             <div class="leftDot">
@@ -134,11 +134,11 @@
             </div>
           </div>
         </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 v-if="isShowOn" class="off-bg on-animation">启动</div>
+        <div v-else class="off-bg">停止</div>
       </div>
       <!-- 系统提示 -->
       <div class="sysTips" v-if="startOrStopStatus">
@@ -1072,7 +1072,6 @@ export default {
     this.getMonitorList();
     this.getAlarnStatus();
     this.getDayData();
-    this.getPolicyList();
 
     // 设置定时器，每 10 秒执行一次
     this.timer = setInterval(() => {
@@ -1081,6 +1080,8 @@ export default {
       this.getPerformance();
       this.getOneKeyButton();
       this.getMonitorList();
+      this.getAlarnStatus();
+      this.getDayData();
     }, 10000);
     // 每秒更新一次时间
     this.nowTimer = setInterval(() => {
@@ -3739,10 +3740,11 @@ export default {
   }
   .weather {
     min-width: 2.85rem;
+    min-height: 1.6rem;
     z-index: 10;
     position: absolute;
-    top: 0.2rem;
-    left: -0.5rem;
+    top: 0.8rem;
+    left: 0rem;
     display: flex;
     flex-direction: column;
     align-items: flex-start;
@@ -3845,7 +3847,7 @@ export default {
       text-align: center;
       line-height: 1rem;
       font-family: DIN;
-      font-size: 0.3rem;
+      font-size: 0.22rem;
       color: #6cf02f;
       font-weight: bold;
     }

src/views/hotWater/waterMonitor/waterMonitorDetails.vue

@@ -592,6 +592,7 @@ export default {
       loading: false,
       currentDate: new Date(),
       nowTimer: null,
+      timer: null, // 用于存储定时器 ID
       isShowWarning: false, //是否有报警
       dayData: "", //监测天数
       treeData: [],
@@ -682,12 +683,22 @@ export default {
     this.getSysBuild();
     this.getAlarnStatus();
     this.getDayData();
+    // 设置定时器，每 10 秒执行一次
+    this.timer = setInterval(() => {
+      this.getSysBuild();
+      this.getAlarnStatus();
+      this.getDayData();
+    }, 10000);
     // 每秒更新一次时间
     this.nowTimer = setInterval(() => {
       this.currentDate = new Date();
     }, 1000);
   },
   beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
     // 组件销毁前清除定时器
     if (this.nowTimer) {
       clearInterval(this.nowTimer);

src/views/index.vue

@@ -72,13 +72,13 @@
             <div class="overview-details">{{ projectView.totalEle }}</div>
           </div>
           <div class="overview-li">
-            <div>总耗水量(吨)</div>
+            <div>总热水补水(吨)</div>
             <div class="overview-details">
               {{ projectView.totalWater }}
             </div>
           </div>
           <div class="overview-li">
-            <div>总用气量(吨)</div>
+            <div>总蒸汽流量(吨)</div>
             <div class="overview-details">
               {{ projectView.totalGas }}
             </div>
@@ -96,13 +96,13 @@
             </div>
           </div>
           <div class="overview-li">
-            <div>今年耗水量(吨)</div>
+            <div>今年热水补水(吨)</div>
             <div class="overview-details">
               {{ projectView.yearWater }}
             </div>
           </div>
           <div class="overview-li">
-            <div>今年用气量(吨)</div>
+            <div>今年蒸汽流量(吨)</div>
             <div class="overview-details">
               {{ projectView.yearGas }}
             </div>
@@ -708,14 +708,14 @@ export default {
     flex-wrap: wrap;
     .overview-li {
       width: calc(25%);
-      height: 1.56rem;
+      height: 1.65rem;
       display: flex;
       flex-direction: column;
       align-items: center;
       justify-content: center;
       background-image: url(../assets/images/overview-img.png);
       background-repeat: no-repeat;
-      background-size: 1.56rem 1.56rem;
+      background-size: 1.65rem 1.65rem;
       background-position: center center;
       margin-bottom: 0.3rem;
       font-family: SourceHanSansCN-Regular;
@@ -747,8 +747,8 @@ export default {
 @media (max-width: 1485px) {
   .overview-li {
     width: calc(33.33%) !important;
-    height: 2rem !important;
-    background-size: 2rem 2rem !important;
+    height: 2.5rem !important;
+    background-size: 2.5rem 2.5rem !important;
     margin-bottom: 0.3rem;
     font-size: 0.22rem !important;
     .overview-details {