fix:全关筛选有spaceId的空间

src/pages/Equipment/components/topNavRight/index.tsx

@@ -37,15 +37,19 @@ const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, map
       onOk() {
         //console.log('mapListmapList', mapList,selNavObj);
         //筛选 没有开启的空间
-        var filterSpaceArr = mapList.filter((item) => {
-          return item[selNavObj.id] == 0 || item[selNavObj.id] == 2;
-        });
-        var filterSpaceArr2 = mapList.filter((item) => {
-          return item.localName == '上格云3' || item.localName == '上格云休闲区';
-        });
-
+        if(selNavObj.id == 'light'){
+          var filterSpaceArr = mapList.filter((item) => {
+            return (item[selNavObj.id] == 0 || item[selNavObj.id] == 2) && item.spaceId;
+          });
+        }else{
+          var filterSpaceArr = mapList.filter((item) => {
+            return  item.spaceId;
+          });
+        }
+     
+ 
         var flag = 1;
-        //现在加上循环调用 所以把查询关了
+        //现在加上循环调用 所以把查询关了F
         function getDeviceStatus() {
           //   flag = flag + 1;
           //   queryDeviceManage().then((res) => {
@@ -61,7 +65,7 @@ const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, map
         //如果是空调
         if (filterSpaceArr.length == 0) return;
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(mapList, getDeviceStatus, '打开', projectObj.projectId);
+          changeAllAir(filterSpaceArr, getDeviceStatus, '打开', projectObj.projectId);
         }
         if (selNavObj.id == 'light') {
           changeLight('all', filterSpaceArr, getDeviceStatus, '打开');
@@ -86,15 +90,17 @@ const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, map
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        var filterSpaceArr = mapList.filter((item) => {
-          return item[selNavObj.id] == 1 || item[selNavObj.id] == 2;
-        });
-        var filterSpaceArr2 = mapList.filter((item) => {
-          return item.localName == '上格云3' || item.localName == '上格云休闲区';
-        });
-        console.log('关闭filterSpaceArr', filterSpaceArr);
+        if(selNavObj.id == 'light'){
+          var filterSpaceArr = mapList.filter((item) => {
+            return (item[selNavObj.id] == 1 || item[selNavObj.id] == 2) && item.spaceId;
+          });
+        }else{
+          var filterSpaceArr = mapList.filter((item) => {
+            return item.spaceId;
+          });
+        }
+       
         var flag = 1;
-
         function getDeviceStatus() {
           //   flag = flag + 1;
           //   queryDeviceManage().then((res) => {
@@ -110,7 +116,7 @@ const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, map
 
         //如果是空调
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(mapList, getDeviceStatus, '关闭', projectObj.projectId);
+          changeAllAir(filterSpaceArr, getDeviceStatus, '关闭', projectObj.projectId);
         }
         if (selNavObj.id == 'light') {
           changeLight('all', filterSpaceArr, getDeviceStatus, '关闭');

src/pages/Equipment/equipmentControl.js

@@ -76,7 +76,9 @@ export const changeAir = (sitem, index, getDeviceStatus) => {
             getDeviceStatus && getDeviceStatus();
         } else {
             message.error('操作失败，请重试');
-        }
+        }  
+    }).catch((err)=>{
+
     });
 };
 
@@ -87,7 +89,7 @@ export const changeAllAir = (itemarr, getDeviceStatus, status, projectId) => {
         const itemId = status === '打开' ? 12 : 10; // 10关闭 12开启
         paramsArr.push({
             projectId: projectId,
-            objectId: sitem.id, // 空间id
+            objectId: sitem.spaceId, // 空间id
             valueType: 1, // 固定为1 1
             itemId: itemId,
         });
@@ -100,7 +102,10 @@ export const changeAllAir = (itemarr, getDeviceStatus, status, projectId) => {
         } else {
             message.error('操作失败，请重试');
         }
-    });
+    }).catch((err)=>{
+        debugger;
+        console.log('err',err);
+    });;
 };
 //查询 单个灯的状态
 export const getLamp = (sitem, callback, num) => {

src/services/sagacare_service/equipment.js

@@ -52,7 +52,6 @@ export const getObjectDataEqpGroupHttp = (params) => {
 // 灯的状态
 export const getLampHttp = (params) => {
     return request(`/sgadmin/duoduo-service/duoduoenv-service/light/status/query?${commonParams()}&spaceId=${params}`, {
-        timeout:1000, 
         skipErrorHandler:true,
         method: 'GET',
         headers: {
@@ -131,6 +130,7 @@ export const getSpaceAdjustList = (params) => {
 export const changeAllAirHttp = (body) => {
     return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2Batch?${commonParams()}`, {
         method: 'POST',
+        //timeout:100000,
         isNotShowErrorToast: true,
         errorSave: true,
         data: body,