Browse Source

fix:空调接口优化

chenzhen2 1 year ago
parent
commit
047f3368ab

+ 21 - 14
src/views/envmonitor/components/Air/index.vue

@@ -227,6 +227,7 @@ export default defineComponent({
       userIsControl: props.userIsControl,
       forceOverTimeFlag: props.forceOverTimeFlag,
       firstLoadingAir: true,
+      spaceId: props.spaceId,
       domAirOpeen: domAirOpeen,
       feedbackTimer: feedbackTimer,
       parseImgUrl: parseImgUrl,
@@ -264,7 +265,7 @@ export default defineComponent({
       // 获取设备类型(ACATVI)
       getEquipmentListHttp() {
         let params = {
-          spaceId: props.spaceId,
+          spaceId: proxyData.spaceId,
         };
         proxyData.showAirVolumeBtn = false;
         let flag: any = true;
@@ -323,7 +324,7 @@ export default defineComponent({
       ) {
         let paramObj: any = {
           projectId: propsVal.projectId, // 项目id
-          objectId: propsVal.spaceId, // 空间id
+          objectId: proxyData.spaceId, // 空间id
         };
 
         if (type === "feedback") {
@@ -489,7 +490,7 @@ export default defineComponent({
         proxyData.airSetText.remark = [];
         const paramObj = {
           projectId: propsVal.projectId, // 项目id
-          objectId: propsVal.spaceId, // 空间id
+          objectId: proxyData.spaceId, // 空间id
           valueType: 1, // 固定为1
           itemId: itemId, //    12 开启 10关闭  4 调低温  2 调高温 5 调小风量 6 调大风量
         };
@@ -524,18 +525,24 @@ export default defineComponent({
           });
       },
     });
-    watch(props, (newProps: any) => {
-      if (newProps.spaceId) {
-        // 空间id改变的重新获取值调用接口
-        // 定时调空间信息
-        proxyData.getAirInfoToTimer(0);
-        // proxyData.getAirInfo()
-        // proxyData.getEquipmentListHttp();
+    watch(
+      [() => props, () => props.spaceId],
+      (newProps: any, oldProps: any) => {
+        if (newProps[1] && newProps[1] != oldProps[1]) {
+          // 空间id改变的重新获取值调用接口
+          // 定时调空间信息
+          proxyData.spaceId = newProps[1];
+          proxyData.getAirInfoToTimer(0);
+          // proxyData.getAirInfo()
+          // proxyData.getEquipmentListHttp();
+        }
+        if (newProps[0]) {
+          proxyData.temperature = props.temperature;
+          proxyData.userIsControl = newProps.userIsControl;
+          proxyData.forceOverTimeFlag = newProps.forceOverTimeFlag;
+        }
       }
-      proxyData.temperature = props.temperature;
-      proxyData.userIsControl = newProps.userIsControl;
-      proxyData.forceOverTimeFlag = newProps.forceOverTimeFlag;
-    });
+    );
     onBeforeUnmount(() => {
       if (proxyData.airTimer) {
         clearTimeout(proxyData.airTimer);

+ 1 - 1
src/views/envmonitor/components/Air/manualIndex.vue

@@ -968,7 +968,7 @@ export default defineComponent({
           proxyData.seviceEquipmentList = props.seviceEquipmentList;
         }
         if (newProps[1] && newProps[1] != oldProps[1]) {
-          proxyData.spaceId = newProps.spaceId;
+          proxyData.spaceId = newProps[1];
           proxyData.getAirInfoToTimer(0);
         }
       }