合并

src/pages/Equipment/checLampStatus.js

@@ -31,13 +31,13 @@ export const judgeChangeResponeseSuccess = (response, paramsArr, fn) => {
                 resultArr.splice(item, 1);
             }
         });
-    if (resFlag) {
-        setTimeout(() => {
-            checkChangeLightStatusSuccess(paramsArr, resultArr, fn);
-        }, 500);
-    } else {
-        fn && fn(); // 查询灯设备
-    }
+    // if (resFlag) {
+    //     setTimeout(() => {
+    //         checkChangeLightStatusSuccess(paramsArr, resultArr, fn);
+    //     }, 500);
+    // } else {
+    fn && fn(); // 查询灯设备
+    // }
     /*
     if (result.result === 'success') {
       if (!resFlag && result.state === 200 && result.exeResult === 'success') {

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

@@ -14,7 +14,7 @@ export type topNavRightProps = {
   selNavObj: navigatorItem;
   navigatorList: navigatorItem[];
   mapList: API.MapInfo[];
-  queryDeviceManage: () => void;
+  queryDeviceManage: () => Promise<any>;
 };
 
 const TopNavRight: React.FC<topNavRightProps> = ({
@@ -43,32 +43,36 @@ const TopNavRight: React.FC<topNavRightProps> = ({
       onOk() {
         console.log('mapListmapList', mapList);
         //筛选 没有开启的空间
-        var filterSpaceArr = mapList.filter((item) => {
-          return item[selNavObj.id] !== 1;
-        });
-        // var filterSpaceArr2 = filterSpaceArr.filter((item) => {
-        //   return item.localName == '图书休闲区' || item.localName == '上格云3';
+        // var filterSpaceArr = mapList.filter((item) => {
+        //   return item[selNavObj.id] !== 1;
         // });
-        console.log('开启filterSpaceArr', filterSpaceArr);
+        var filterSpaceArr2 = mapList.filter((item) => {
+          return item.localName == '火卫一' || item.localName == '火卫二';
+        });
+        console.log('开启filterSpaceArr', filterSpaceArr2);
+        var flag = 1;
         function getDeviceStatus() {
-          var interval = setInterval(() => {
-            queryDeviceManage();
-          }, 1000);
-          setTimeout(() => {
-            console.log('setTimeout');
-            clearInterval(interval);
-          }, 10000);
+          flag = flag + 1;
+          queryDeviceManage().then((res) => {
+            if (flag < 13) {
+              setTimeout(() => {
+                getDeviceStatus();
+              }, 800);
+            } else {
+              flag = 1;
+            }
+          });
         }
         //如果是空调
-        if (filterSpaceArr.length == 0) return;
+        //if (filterSpaceArr.length == 0) return;
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(filterSpaceArr, getDeviceStatus, '打开', projectId);
+          changeAllAir(mapList, getDeviceStatus, '打开', projectId);
         }
         if (selNavObj.id == 'light') {
-          changeLight('all', filterSpaceArr, getDeviceStatus, '打开');
+          changeLight('all', mapList, getDeviceStatus, '打开');
         }
         if (selNavObj.id == 'curtain') {
-          changeCurtain('all', filterSpaceArr, getDeviceStatus, '打开'); // '关闭' : '打开';
+          changeCurtain('all', mapList, getDeviceStatus, '打开'); // '关闭' : '打开';
         }
       },
       onCancel() {
@@ -87,32 +91,43 @@ const TopNavRight: React.FC<topNavRightProps> = ({
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        var filterSpaceArr = mapList.filter((item) => {
-          return item[selNavObj.id] !== 0;
-        });
-        // var filterSpaceArr2 = filterSpaceArr.filter((item) => {
-        //   return item.localName == '图书休闲区' || item.localName == '上格云3';
+        // var filterSpaceArr = mapList.filter((item) => {
+        //   return item[selNavObj.id] !== 0;
         // });
-        console.log('关闭filterSpaceArr', filterSpaceArr);
+        var filterSpaceArr2 = mapList.filter((item) => {
+          return item.localName == '火卫一' || item.localName == '火卫二';
+        });
+        console.log('关闭filterSpaceArr', filterSpaceArr2);
         //return;
+        var flag = 1;
+
         function getDeviceStatus() {
-          var interval = setInterval(() => {
-            queryDeviceManage();
-          }, 1000);
-          setTimeout(() => {
-            console.log('setTimeout');
-            clearInterval(interval);
-          }, 60000);
+          flag = flag + 1;
+          queryDeviceManage().then((res) => {
+            if (flag < 13) {
+              setTimeout(() => {
+                getDeviceStatus();
+              }, 800);
+            } else {
+              flag = 1;
+            }
+          });
+
+          //   setTimeout(() => {
+          //     console.log('setTimeout');
+          //     clearInterval(interval);
+          //   }, 60000);
         }
+
         //如果是空调
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(filterSpaceArr, getDeviceStatus, '关闭', projectId);
+          changeAllAir(mapList, getDeviceStatus, '关闭', projectId);
         }
         if (selNavObj.id == 'light') {
-          changeLight('all', filterSpaceArr, getDeviceStatus, '关闭');
+          changeLight('all', mapList, getDeviceStatus, '关闭');
         }
         if (selNavObj.id == 'curtain') {
-          changeCurtain('all', filterSpaceArr, getDeviceStatus, '关闭');
+          changeCurtain('all', mapList, getDeviceStatus, '关闭');
         }
       },
       onCancel() {

src/pages/Equipment/index.tsx

@@ -242,7 +242,7 @@ const Environment: React.FC = () => {
 
   const queryDeviceManage = () => {
     //setLoading(true);
-    queryEquipStatistics({
+    return queryEquipStatistics({
       floorId: selFloorId,
       projectId: projectId,
     })
@@ -280,7 +280,9 @@ const Environment: React.FC = () => {
           });
         });
         //console.log('spaceList', spaceList);
+        //debugger;
         setEquipMapList(spaceList);
+        return 'next';
       })
       .catch(() => {
         // setLoading(false);

src/pages/Runtime/index.tsx

@@ -229,7 +229,9 @@ const Runtime: React.FC = () => {
                             <div>
                               {item.showTimeList[0][0]}-{item.showTimeList[0][1]}
                             </div>
-                            <div className={styles.popTitle}>会议时间:</div>
+                            <div className={styles.popTitle}>
+                              {item.runTimeStatus == 'overtimeWork' ? '加班时间' : '会议时间'}:
+                            </div>
                             {(item.showTimeList || []).map((timeItem, index) => {
                               if (index > 0) {
                                 return (