2.修改综合能耗报表-热水热泵运行记录表头

3.修改综合能耗报表-水电表抄表记录默认查询上一日数据
4.风柜监测系统-风机停止-同步箭头停止

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

@@ -30,21 +30,25 @@
         <div class="arrow-flex2">
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
@@ -52,21 +56,25 @@
         <div class="arrow-flex3">
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
@@ -2665,6 +2673,8 @@ export default {
     width: 0.4rem;
     height: 0.6rem;
     margin-right: 0.15rem;
+  }
+  .windShift {
     animation: moveArrow 2s linear infinite;
   }
   /* 定义每个箭头的透明度 */

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

@@ -30,21 +30,25 @@
         <div class="arrow-flex2">
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
@@ -52,21 +56,25 @@
         <div class="arrow-flex3">
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
           <img
             class="wind-arrow"
+            :class="{ windShift: runStatusObj.collectValue }"
             src="../../../../assets/images/blue-arrow.png"
             alt=""
           />
@@ -152,9 +160,7 @@
           @click="handleOneKeyButton(startControlObj)"
           v-if="!automaticObj.collectValue"
         >
-          <div v-if="startControlObj.collectValue" class="off-bg">
+          <div v-if="startControlObj.collectValue" class="off-bg">运行</div>
-            运行
-          </div>
           <div v-else class="off-bg">停止</div>
         </div>
         <div class="fan-satatus1">
@@ -244,7 +250,10 @@
             </el-form>
           </div>
         </div>
-        <div class="wind-valve" v-if="isObjectValid(airValveBackObj)">
+        <div
+          class="wind-valve greenContext"
+          v-if="isObjectValid(airValveBackObj)"
+        >
           <div :class="getTextClass(airValveBackObj, 'wind-text')">
             新风阀反馈：
           </div>
@@ -631,7 +640,10 @@ export default {
     // 根据对象的 quality 属性返回对应的类名
     getTextClass(obj, claseName) {
       // console.log("打印所有点位的quality值······",obj.collectName, obj.quality);
-      return [claseName, obj.quality !== "0" && obj.quality !== "8" ? "alarm-text" : ""];
+      return [
+        claseName,
+        obj.quality !== "0" && obj.quality !== "8" ? "alarm-text" : "",
+      ];
     },
     // 处理输入事件，过滤非数字字符
     handleInput(item) {
@@ -1390,11 +1402,11 @@ export default {
     flex-direction: row;
     align-items: center;
     font-size: 0.18rem;
-    .wind-text {
-      color: #00d2ff;
-      font-size: 0.18rem;
-      white-space: nowrap;
   }
+  .greenContext {
+    color: #39f833;
+    font-size: 0.18rem;
+    font-weight: bold;
   }
   .wind-valve2 {
     z-index: 10;
@@ -1464,6 +1476,8 @@ export default {
     width: 0.4rem;
     height: 0.6rem;
     margin-right: 0.15rem;
+  }
+  .windShift {
     animation: moveArrow 2s linear infinite;
   }
   /* 定义每个箭头的透明度 */

src/views/comprehensiveEnergy/hotPumpLog/index.vue

@@ -54,10 +54,8 @@
         </div>
       </div>
     </div>
-    <el-table :data="tableData" border style="width: 100%" v-loading="loading">
+    <el-table :data="tableData" border style="width: 100%" v-loading="loading" height="750">
-      <el-table-column prop="curDate" label="日期"> </el-table-column>
       <el-table-column prop="curTime" label="时间"> </el-table-column>
-      <el-table-column prop="classes" label="班次"> </el-table-column>
       <el-table-column label="1号热泵">
         <el-table-column prop="tempSetHotPumpOne" label="设定温度℃">
         </el-table-column>
@@ -262,7 +260,7 @@
     <!-- 添加或修改设备台账对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body>
       <el-form ref="form" :model="form" :rules="rules">
-        <el-row type="flex" justify="center">
+        <el-row type="flex" justify="felx-start">
           <el-col :span="12">
             <el-form-item label="时间" prop="curTime">
               <!-- <el-date-picker
@@ -278,15 +276,6 @@
                 placeholder=""
               /> </el-form-item
           ></el-col>
-          <el-col :span="12">
-            <el-form-item label="班次" prop="classes">
-              <el-input
-                v-model="form.classes"
-                clearable
-                placeholder="请输入班次"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row type="flex" justify="center">
           <el-col :span="24" class="oneRowLabel">1号热泵</el-col>

src/views/comprehensiveEnergy/meterRecord/index.vue

@@ -154,15 +154,23 @@ export default {
   created() {
     // 获取当前日期
     const currentDate = new Date();
-    // 获取当前年份
+    // 获取前一天的日期
-    const year = currentDate.getFullYear();
+    const previousDate = new Date(currentDate);
-    // 获取当前月份，注意月份是从 0 开始的，所以要加 1
+    previousDate.setDate(currentDate.getDate() - 1);
-    const month = String(currentDate.getMonth() + 1).padStart(2, "0");
+
-    // 获取当前日期中的“天”，并进行补零处理
+    // 获取前一天的年份
-    const day = String(currentDate.getDate()).padStart(2, "0");
+    const year = previousDate.getFullYear();
-    // 格式化日期为 yyyy-MM-dd 格式
+    // 获取前一天的月份，注意月份是从 0 开始的，所以要加 1
+    const month = String(previousDate.getMonth() + 1).padStart(2, "0");
+    // 获取前一天日期中的“天”，并进行补零处理
+    const day = String(previousDate.getDate()).padStart(2, "0");
+
+    // 格式化前一天的日期为 yyyy-MM-dd 格式
     this.dayValue = `${year}-${month}-${day}`;
-    this.monthValue = `${year}-${month}`;
+    // 格式化当前月份为 yyyy-MM 格式
+    const currentYear = currentDate.getFullYear();
+    const currentMonth = String(currentDate.getMonth() + 1).padStart(2, "0");
+    this.monthValue = `${currentYear}-${currentMonth}`;
   },
   mounted() {
     this.getList();