1.修改大屏数据

2.修改生活热水-热泵数据

src/views/bigScreen/bigScreen.vue

@@ -52,7 +52,7 @@
             <div class="special-top">
               <div class="special-title">
                 <div class="title-left">
-                  <div>冷源系统能耗</div>
+                  <div>冷源系统能效</div>
                   <time-data
                     v-model="sharedIndex"
                     :currentIndex="sharedIndex"

src/views/bigScreen/components/coldSysEnergy.vue

@@ -2,8 +2,8 @@
   <div class="energy_content">
     <div class="sys_charts" ref="sys_charts"></div>
     <div class="eer">
-      <div>用电量:{{ energyMes.totalEle }}kw/h</div>
       <div>产冷量:{{ energyMes.totalCold }}kwh</div>
+      <div>用电量:{{ energyMes.totalEle }}kw/h</div>
     </div>
   </div>
 </template>

src/views/hotWater/waterControl/index.vue

@@ -67,59 +67,73 @@
                 />
                 <div class="monitor-words">
                   <div class="words-li">
-                    <div class="ash">运行状态模式:</div>
+                    <div class="ash">开关控制:</div>
                     <div class="white">
-                      <el-select
+                      <el-switch
-                        v-model="item.hotPumpStatus"
+                        style="display: block"
-                        placeholder="请选择"
+                        v-model="item.switchStatus"
+                        active-color="#13ce66"
+                        active-text="开机"
+                        inactive-text="关机"
                         @change="handleHotPump(item)"
                       >
-                        <el-option
+                      </el-switch>
-                          v-for="item in hotPumpOptions"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        >
-                        </el-option>
-                      </el-select>
                     </div>
                   </div>
-                  <div class="words-li">
+                </div>
-                    <div class="ash">故障信息:</div>
+              </div>
-                    <el-tag
+              <div class="control-bottom">
+                <div class="words-li">
+                  <div class="ash">故障信息:</div>
+                  <el-tag
+                    size="mini"
+                    v-if="item.alarmStatus === '无故障'"
+                    type="success"
+                    >{{ item.alarmStatus }}</el-tag
+                  >
+                  <el-tag size="mini" v-else type="danger">{{
+                    item.alarmStatus
+                  }}</el-tag>
+                </div>
+                <div class="words-li">
+                  <div class="ash">运行状态:</div>
+                  <el-tag
+                    size="mini"
+                    v-if="item.hotPumpStatus === 0"
+                    type="danger"
+                    >关机</el-tag
+                  >
+                  <el-tag
+                    size="mini"
+                    v-if="item.hotPumpStatus === 4"
+                    type="success"
+                  >
+                    开机
+                  </el-tag>
+                </div>
+                <div class="words-li">
+                  <div class="ash">实际温度:</div>
+                  <div class="white">{{ item.temp }}℃</div>
+                </div>
+                <div class="words-li">
+                  <div class="ash">设定温度:</div>
+                  <div class="white">
+                    <el-input
                       size="mini"
-                      v-if="item.alarmStatus === '无故障'"
+                      v-model="item.tempSet"
-                      type="success"
+                      placeholder="请输入"
-                      >{{ item.alarmStatus }}</el-tag
+                      @keyup.enter.native="
-                    >
+                        handleEnter(
-                    <el-tag size="mini" v-else type="danger">{{
+                          item,
-                      item.alarmStatus
+                          item.tempSet,
-                    }}</el-tag>
+                          item.tempSetId,
-                  </div>
+                          '设定温度',
-                  <div class="words-li">
+                          '℃'
-                    <div class="ash">实际温度:</div>
+                        )
-                    <div class="white">{{ item.temp }}℃</div>
+                      "
-                  </div>
+                      @input="handleInput(item)"
-                  <div class="words-li">
+                      @blur="handleBlur()"
-                    <div class="ash">设定温度:</div>
+                    ></el-input>
-                    <div class="white">
-                      <el-input
-                        size="mini"
-                        v-model="item.tempSet"
-                        placeholder="请输入"
-                        @keyup.enter.native="
-                          handleEnter(
-                            item,
-                            item.tempSet,
-                            item.tempSetId,
-                            '设定温度',
-                            '℃'
-                          )
-                        "
-                        @input="handleInput(item)"
-                        @blur="handleBlur()"
-                      ></el-input>
-                    </div>
                   </div>
                 </div>
               </div>
@@ -593,15 +607,7 @@ export default {
           value: 0,
         },
         {
-          label: "制冷",
+          label: "开机",
-          value: 2,
-        },
-        {
-          label: "制热",
-          value: 3,
-        },
-        {
-          label: "热水",
           value: 4,
         },
       ],
@@ -933,26 +939,10 @@ export default {
     },
     // 设置热泵开关状态
     handleHotPump(item) {
-      // 记录原始状态
-      const originalStatus = item.hotPumpStatus;
-      // 根据 value 值获取对应的 label
-      let statusLabel = "";
-      switch (item.hotPumpStatus) {
-        case 0:
-          statusLabel = "关机";
-          break;
-        case 2:
-          statusLabel = "制冷";
-          break;
-        case 3:
-          statusLabel = "制热";
-          break;
-        case 4:
-          statusLabel = "热水";
-          break;
-      }
       this.$confirm(
-        `确定要切换设备"${item.name}"的状态为:${statusLabel} 吗?"`,
+        `确定要切换设备"${item.name}"的状态为:${
+          item.switchStatus ? "开机" : "关机 吗?"
+        }`,
         "提示",
         {
           confirmButtonText: "确定",
@@ -961,11 +951,19 @@ export default {
         }
       )
         .then(() => {
-          this.hadleOperationConrol(item.switchStatusId, item.hotPumpStatus);
+          // 这里调用请求函数，示例中只是简单打印信息
+          console.log("请求后台", item.switchStatus);
+          let param = null;
+          if (item.switchStatus) {
+            param = 1;
+          } else {
+            param = 0;
+          }
+          this.hadleOperationConrol(item.switchStatusId, param);
         })
         .catch(() => {
-          // 用户取消操作，恢复状态
+          // 用户取消操作，恢复开关状态
-          item.hotPumpStatus = originalStatus;
+          item.switchStatus = !item.switchStatus;
         });
     },
     // 设置供水泵手自动状态