fix:pad的bug修改

src/views/envmonitor/components/Air/index.vue

@@ -532,15 +532,19 @@ export default defineComponent({
           // 空间id改变的重新获取值调用接口
           // 定时调空间信息
           proxyData.spaceId = newProps[1];
-          proxyData.getAirInfoToTimer(0);
-          // proxyData.getAirInfo()
+          // proxyData.getAirInfoToTimer(0);
+          proxyData.getAirInfo()
           // proxyData.getEquipmentListHttp();
         }
         if (newProps[0]) {
-          proxyData.temperature = props.temperature;
-          proxyData.userIsControl = newProps.userIsControl;
-          proxyData.forceOverTimeFlag = newProps.forceOverTimeFlag;
+          proxyData.temperature = newProps[0].temperature;
+          proxyData.userIsControl = newProps[0].userIsControl;
+          proxyData.forceOverTimeFlag = newProps[0].forceOverTimeFlag;
         }
+      },
+      {
+        deep: false,
+        immediate: true,
       }
     );
     onBeforeUnmount(() => {

src/views/envmonitor/components/Air/manualIndex.vue

@@ -329,11 +329,11 @@ export default defineComponent({
       type: Number,
       default: () => 0,
     },
-    hasAir: {
-      // 有无空调
-      type: Boolean,
-      default: () => false,
-    },
+    // hasAir: {
+    //   // 有无空调
+    //   type: Boolean,
+    //   default: () => false,
+    // },
     airVolumes: {
       // 风量信息
       type: Array,
@@ -754,6 +754,7 @@ export default defineComponent({
           .catch(() => {
             // proxyData.setLoadingNumber();
             proxyData.loadinngEnd();
+            Toast("连接异常,请检查网络！");
           });
       },
       // 改变空调状态
@@ -962,15 +963,21 @@ export default defineComponent({
       [() => props, () => props.spaceId],
       (newProps: any, oldProps: any) => {
         if (newProps[0]) {
-          proxyData.temperature = props.temperature;
-          proxyData.userIsControl = newProps.userIsControl;
-          proxyData.forceOverTimeFlag = newProps.forceOverTimeFlag;
-          proxyData.seviceEquipmentList = props.seviceEquipmentList;
+          proxyData.temperature = newProps[0].temperature;
+          proxyData.userIsControl = newProps[0].userIsControl;
+          proxyData.forceOverTimeFlag = newProps[0].forceOverTimeFlag;
+          proxyData.seviceEquipmentList = newProps[0].seviceEquipmentList;
+          console.log("=== proxyData.seviceEquipmentList")
+          console.log(proxyData.seviceEquipmentList);
         }
         if (newProps[1] && newProps[1] != oldProps[1]) {
           proxyData.spaceId = newProps[1];
           proxyData.getAirInfoToTimer(0);
         }
+      },
+      {
+        deep: false,
+        immediate: true,
       }
     );
     onBeforeUnmount(() => {

src/views/envmonitor/components/Light/index.vue

@@ -58,6 +58,7 @@
               active-color="$elActiveColor"
               :disabled="!userIsControl"
               v-model="item.switch"
+              :loading="item.loading"
               size="14px"
               @click.stop="eqChange('main', item, index)"
               inactive-color="rgba(196, 196, 196, 0.2)"
@@ -158,6 +159,7 @@ export default defineComponent({
       lightIcon: "arrow-down",
       showFlag: false,
       loadingLight: false,
+      loading: false,
       initData: initData,
       lampList: lampList,
       lightsStatusTimer: lightsStatusTimer,
@@ -291,9 +293,8 @@ export default defineComponent({
             }
             //  总开关按钮所有灯
             //  当前要执行的灯的操作
+            proxyData.loading = true;
             proxyData.loadingLight = true;
-            // const statusFlag = !proxyData.lampSw
-            // console.log('proxyData.lampSw==')
             proxyData.lightImg = proxyData.lampSw
               ? parseImgUrl("page-officehome", "lamp_open.png")
               : parseImgUrl("page-officehome", "lamp_close.png");
@@ -318,14 +319,20 @@ export default defineComponent({
             let id = item.id;
             proxyData.setStatus = true;
             proxyData.updateLampStatus(item, statusFlag);
-            proxyData.setLamp(type, id, statusFlag, index); // 调接口
+            proxyData.setLamp(type, id, statusFlag, index, item); // 调接口
           }
         } else {
           Toast("您没有当前空间的控制权限！");
         }
       },
       //  控制灯的接口
-      setLamp(type: string, id: any, statusFlag: any, index: any) {
+      setLamp(
+        type: string,
+        id: any,
+        statusFlag: any,
+        index: any,
+        item: any = null
+      ) {
         let params: any = [];
         if (type === "allLamp") {
           for (let i = 0; i < proxyData.initData.length; i++) {
@@ -349,6 +356,10 @@ export default defineComponent({
             setTimeout(() => {
               proxyData.setStatus = false;
             }, 1000);
+
+            if (item) {
+              item.loading = false;
+            }
             if (resData.result === "success") {
               // const checkData: any = proxyData.judgeChangeResponeseSuccess(resData)
               // proxyData.getTimeLampStatus(checkData, type, id, statusFlag, index)
@@ -356,10 +367,15 @@ export default defineComponent({
               proxyData.initLampLoading();
             }
           })
-          .catch(() => {
+          .catch((error: any) => {
             setTimeout(() => {
               proxyData.setStatus = false;
             }, 1000);
+            if (item) {
+              item.loading = false;
+            }
+            // console.log(error)
+            Toast("连接异常,请检查网络！");
           });
       },
       // 报错后关闭灯的loading
@@ -525,7 +541,7 @@ export default defineComponent({
         }, timerLen);
       },
     });
-    const isShowChildLight:any = computed(() => {
+    const isShowChildLight: any = computed(() => {
       return proxyData.lampList.length && proxyData.lampList.length > 1;
     });
     // onDeactivated(()=>{
@@ -534,6 +550,7 @@ export default defineComponent({
     watch(
       [() => props, () => props.spaceId],
       (newProps: any, oldProps: any) => {
+        // debugger
         if (newProps[0]) {
           proxyData.userIsControl = newProps[0].userIsControl;
           proxyData.controlMode = newProps[0].controlMode;

src/views/envmonitor/components/Scenario/ScenarioConfig.vue

@@ -131,7 +131,7 @@ export default defineComponent({
         proxyData.scenarioArr = newProps.scenarioArr;
         proxyData.spaceId = newProps.spaceId;
         proxyData.formatScenarioImg();
-        console.log("会议室场景变化了--");
+        // console.log("会议室场景变化了--");
       },
       {
         deep: false,

src/views/envmonitor/index.vue

@@ -172,12 +172,11 @@
       <!--加班end-->
       <!--空调手动控制 start-->
       <manual-index
-        v-if="controlMode === 1"
+        v-if="controlMode == 1 && spaceExistenceDevice.airConditioner"
         @triggerWork="triggerWork"
         :seviceEquipmentList="seviceEquipmentList"
         :forceOverTimeFlag="forceOverTimeFlag"
         @updateAirTemp="updateAirTemp"
-        :hasAir="spaceExistenceDevice.airConditioner"
         :airVolumes="officeData.airVolumes"
         :temperature="officeData.temperature"
         :spaceId="spaceInfo.spaceId"
@@ -188,10 +187,7 @@
       <!--空调手动控制 end-->
       <!--空调自动控制 start-->
       <Air
-        v-if="
-          controlMode != 1 &&
-          (officeData.temperature || spaceExistenceDevice.airConditioner)
-        "
+        v-if="controlMode != 1 && spaceExistenceDevice.airConditioner"
         id="airId"
         @triggerWork="triggerWork"
         :forceOverTimeFlag="forceOverTimeFlag"
@@ -1829,6 +1825,7 @@ export default defineComponent({
         proxyData.roomType = "";
         proxyData.officeData.temperature = "";
         proxyData.spaceExistenceDevice = spaceExistenceDevice;
+        proxyData.seviceEquipmentList =[]
         proxyData.workkArr = [];
         //  切换空间的时候把加班按钮平板
         proxyData.setForceOverTimeFlag(false);