Browse Source

去掉debugger

zhaojijng 2 years ago
parent
commit
5023d8258c

+ 0 - 1
src/components/SearchInput/index.tsx

@@ -57,7 +57,6 @@ const SearchInput: React.FC<SearchInputProps> = ({ callbackSearch, mapList }) =>
 
   //这是搜索的下拉列表的点击
   const handleChange = (sel: string) => {
-    debugger;
     setValue(null); //清空输入的值
     setMatchData([]); //清空搜索匹配列表
     var filterItem = matchData.filter((item) => {

+ 12 - 14
src/components/map/index.tsx

@@ -80,7 +80,6 @@ const Map: React.FC<MapProps> = ({ type, searchText, selFloorId, render, mapList
       let left: any = 0,
         top: any = 0;
 
-      debugger;
       //   mapList.map((item, index) => {
       //     if (item.localName == (searchText && searchText.text)) {
       //       left = -(item.left || 0);
@@ -102,20 +101,19 @@ const Map: React.FC<MapProps> = ({ type, searchText, selFloorId, render, mapList
     }
   }, [searchText, mapList]);
 
-  useEffect(() => {
-    //debugger;
-  }, [mapList]);
+  useEffect(() => {}, [mapList]);
 
-  //   useEffect(() => {// todo 要不要用呢
-  //     document.querySelector('#root').addEventListener(
-  //       'mouseup',
-  //       function () {
-  //         console.log('mouseUpEvent');
-  //         setCanMove(false);
-  //       },
-  //       true,
-  //     );
-  //   }, []);
+  useEffect(() => {
+    // todo 要不要用呢
+    document.querySelector('#root').addEventListener(
+      'mouseup',
+      function () {
+        console.log('mouseUpEvent');
+        setCanMove(false);
+      },
+      true,
+    );
+  }, []);
 
   return (
     <div

+ 13 - 20
src/components/topNavigator/index.tsx

@@ -50,12 +50,10 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
       if (searchBuildId !== currentBuild) {
         //如果buildId 改变
         setCurrentBuild(searchBuildId);
-        debugger;
       } else {
         //显示
         setCurrentFloor(searchFloorId);
         //父亲的floorId
-        debugger;
         //这块 其实只想楼层id改变时调用 建筑id 改变时不调用
         changeFloorId && changeFloorId(searchFloorId);
       }
@@ -86,22 +84,22 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
       },
     }).then((res) => {
       var resData = res.content || [];
-      //   setBuildList(
-      //     (resData || []).map((item) => {
-      //       return { label: item.localName, value: item.id };
-      //     }),
-      //   );
-      var resData2 = [];
-      resData2.push(JSON.parse(JSON.stringify(resData[0])));
-      resData2.push(JSON.parse(JSON.stringify(resData[0])));
-      resData2[1].id = 'sdfsd';
-      resData2[1].localName = 'boruiÎ';
       setBuildList(
-        (resData2 || []).map((item) => {
+        (resData || []).map((item) => {
+          return { label: item.localName, value: item.id };
+        }),
+      );
+      //   var resData2 = [];
+      //   resData2.push(JSON.parse(JSON.stringify(resData[0])));
+      //   resData2.push(JSON.parse(JSON.stringify(resData[0])));
+      //   resData2[1].id = 'sdfsd';
+      //   resData2[1].localName = 'boruiÎ';
+      setBuildList(
+        (resData || []).map((item) => {
           return { label: item.localName, value: item.id };
         }),
       );
-      debugger;
+
       setCurrentBuild((resData[0] || {}).id); //设置第一个建筑值
       changeBuildId && changeBuildId((resData[0] || {}).id);
     });
@@ -109,7 +107,6 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
 
   //请求楼层列表的接口
   useEffect(() => {
-    debugger;
     async function asyncFunction() {
       var res = await getFloorList({
         criteria: {
@@ -124,7 +121,6 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
         }),
       );
 
-      debugger;
       setCurrentFloor(searchFloorId || (resData[0] || {}).id); //如果有搜索的楼层id 则用搜索的结果
       changeFloorId && changeFloorId(searchFloorId || (resData[0] || {}).id); //改变父组件的floorId的值
     }
@@ -146,7 +142,6 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
     //       }),
     //     );
 
-    //     debugger;
     //     setCurrentFloor(searchFloorId || (resData[0] || {}).id); //如果有搜索的楼层id 则用搜索的结果
     //     changeFloorId && changeFloorId(searchFloorId || (resData[0] || {}).id); //改变父组件的floorId的值
     //   });
@@ -155,7 +150,7 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
 
   const changBuildHandle = useCallback((val) => {
     //console.log('select-onChange', val);
-    debugger;
+
     //changeSearchFloorId('');
     //setShishi('fsdf');
     //显示的建筑改变
@@ -164,7 +159,6 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
     changeBuildId && changeBuildId(val);
   }, []);
   const changFloorHandle = useCallback((val) => {
-    //debugger;
     setCurrentFloor(val);
 
     changeFloorId && changeFloorId(val);
@@ -173,7 +167,6 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
   //当前切换导航条时
   const itemClick = (item: navigatorItem) => {
     //console.log('itemclick', item);
-    //debugger;
     navigatorChange && navigatorChange(item);
   };
 

+ 0 - 1
src/hooks/useMapList.ts

@@ -11,7 +11,6 @@ function useMapList(selFloorId: string) {
   //当selFloorId 改变时调用
   useEffect(() => {
     if (selFloorId) {
-      //debugger;
       //   getMapList({ floorId: selFloorId, projectId: '' }).then((res) => {
       //     var data: API.MapInfo[] = (res.data || {}).spaceList || [];
       //     mapListData = data;

+ 0 - 1
src/layouts/index.jsx

@@ -23,7 +23,6 @@ export default (props) => {
   };
 
   const openNotification = () => {
-    //debugger;
     notifyList.map((item, index) => {
       notification.open({
         key: item.id,

+ 2 - 3
src/models/spaceFunc.ts

@@ -39,13 +39,12 @@ export default function () {
     for (var key in allFunc) {
       var codeArr = allFunc[key];
       if (codeArr.indexOf(spaceCode) > -1) {
-        //debugger;
         return key;
       }
     }
   }, []);
-  const projectId = 'Pj1101080259';
-  //const projectId = 'Pj3301100002';
+  //const projectId = 'Pj1101080259';
+  const projectId = 'Pj3301100002';
   return {
     getSpaceFunc,
     projectId,

+ 0 - 6
src/pages/Environment/index.tsx

@@ -101,16 +101,13 @@ const Environment: React.FC = () => {
   const { getSpaceFunc } = useModel('spaceFunc');
 
   const changeFloorId = (data: string) => {
-    //debugger;
     setSelFloorId(data);
   };
   const changeBuildId = (data: string) => {
-    //debugger;
     setSelBuildId(data);
   };
   //导航切换时
   const navigatorChange = (item: navigatorItem) => {
-    debugger;
     setSelNav(item);
     setSelNavId(item.id);
   };
@@ -156,7 +153,6 @@ const Environment: React.FC = () => {
           setLoading(false);
         });
     } else {
-      debugger;
       setMapList([]);
     }
   }, [selFloorId]);
@@ -176,7 +172,6 @@ const Environment: React.FC = () => {
         param: selNavId,
       })
         .then((res) => {
-          //debugger;
           //setLoading(false);
           var avgValues = (res.data || {}).avgValues;
           avgValues = avgValues ? avgValues.toFixed(selNav.fixed) : avgValues;
@@ -209,7 +204,6 @@ const Environment: React.FC = () => {
   const showChartModal = (item) => {
     setShowChart(true);
     setShowSpace(item);
-    debugger;
   };
   return (
     <>

+ 1 - 1
src/pages/Equipment/components/topNavRight/index.tsx

@@ -57,7 +57,7 @@ const TopNavRight: React.FC<topNavRightProps> = ({
           setTimeout(() => {
             console.log('setTimeout');
             clearInterval(interval);
-          }, 60000);
+          }, 30000);
         }
         //如果是空调
         if (selNavObj.id == 'airConditioner') {

+ 135 - 78
src/pages/Equipment/equipmentControl.js

@@ -1,100 +1,157 @@
 import { FormattedMessage, useModel } from 'umi';
 
 import {
-  changeAllAirHttp,
-  changeAirHttp,
-  setEquipeHttp,
-  setallLampHttp,
-  getStatusHttp,
+    changeAllAirHttp,
+    changeAirHttp,
+    setEquipeHttp,
+    setallLampHttp,
+    getStatusHttp,
+    getLampHttp,
+    getFeedbackDocumentsHttp
 } from '@/services/ant-design-pro/equipment';
 
 import { Spin, Modal, message } from 'antd';
 import { setallLamps } from '@/pages/Equipment/checLampStatus.js';
 
-export const changeLight = (type, itemarr, callback, status) => {
-  const setType = status === '打开' ? true : false; // 10关闭 12开启
-  var paramsArr = [];
-  debugger;
-  itemarr.forEach((citem) => {
-    citem.equipList.forEach((item) => {
-      if (item.equipType == 'light') {
-        paramsArr.push({
-          id: item.id,
-          switch: setType,
+//开关 单个或者全部灯
+export const changeLight = (type, itemarr, getDeviceStatus, status) => {
+    const setType = status === '打开' ? true : false; // 10关闭 12开启
+    var paramsArr = [];
+    itemarr.forEach((citem) => {
+        citem.equipList.forEach((item) => {
+            if (item.equipType == 'light') {
+                paramsArr.push({
+                    id: item.id,
+                    switch: setType,
+                });
+            }
         });
-      }
     });
-  });
 
-  setallLamps(paramsArr, callback);
+    setallLamps(paramsArr, getDeviceStatus);
 };
 
-//窗帘的调节      0是关闭 1 是开启  2 是部分开启
-export const changeCurtain = (type, itemarr, callback, status) => {
-  debugger;
-  const setType = status === '打开' ? 'EquipOnSet' : 'EquipOffSet';
-  var paramsArr = [];
-  itemarr.forEach((citem) => {
-    citem.equipList.forEach((item) => {
-      if (item.equipType == 'curtain') {
-        paramsArr.push({
-          equipmentCategory: 'CFSSES',
-          infoCode: setType,
-          value: 1,
-          objectId: item.id,
+//开关 单个或者全部窗帘      0是关闭 1 是开启  2 是部分开启
+export const changeCurtain = (type, itemarr, getDeviceStatus, status) => {
+    const setType = status === '打开' ? 'EquipOnSet' : 'EquipOffSet';
+    var paramsArr = [];
+    itemarr.forEach((citem) => {
+        citem.equipList.forEach((item) => {
+            if (item.equipType == 'curtain') {
+                paramsArr.push({
+                    equipmentCategory: 'CFSSES',
+                    infoCode: setType,
+                    value: 1,
+                    objectId: item.id,
+                });
+            }
         });
-      }
     });
-  });
 
-  //发送指令
-  setEquipeHttp(paramsArr);
-  //这是在手动改变状态
-  callback();
+    //发送指令
+    setEquipeHttp(paramsArr);
+    message.success('指令下发成功');
+    //这是在手动改变状态
+    getDeviceStatus();
 };
 
-//空调的调节      0是关闭 1 是开启  2 是部分开启
-export const changeAir = (sitem, index, callback) => {
-  const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
-  const paramsObj = {
-    objectId: sitem.id, // 空间id
-    valueType: 1, // 固定为1 1
-    itemId: itemId,
-  };
-  changeAirHttp(paramsObj).then((res) => {
-    if (res.result == 'success') {
-      message.success('指令下发成功');
-      // // sitem.airConditioner = res.isClose ? 0 : 1; //改变某空间空调的状态
-      // //mapCombineList[index]['airConditioner'] = res.isClose ? 0 : 1;
-      // var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
-      // mapCopy[index]['airConditioner'] = res.isClose ? 0 : 1;
-      // setMapCombineList(mapCopy);
-      callback();
-    } else {
-      message.error('操作失败,请重试');
-    }
-  });
+//开关单个空调      0是关闭 1 是开启  2 是部分开启
+export const changeAir = (sitem, index, getDeviceStatus) => {
+    const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
+    const paramsObj = {
+        objectId: sitem.id, // 空间id
+        valueType: 1, // 固定为1 1
+        itemId: itemId,
+    };
+    changeAirHttp(paramsObj).then((res) => {
+        if (res.result == 'success') {
+            message.success('指令下发成功');
+            // // sitem.airConditioner = res.isClose ? 0 : 1; //改变某空间空调的状态
+            // //mapCombineList[index]['airConditioner'] = res.isClose ? 0 : 1;
+            // var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
+            // mapCopy[index]['airConditioner'] = res.isClose ? 0 : 1;
+            // setMapCombineList(mapCopy);
+            getDeviceStatus();
+        } else {
+            message.error('操作失败,请重试');
+        }
+    });
 };
-export const changeAllAir = (itemarr, callback, status, projectId) => {
-  let paramsArr = [];
-  debugger;
-  itemarr.forEach((sitem) => {
-    const itemId = status === '打开' ? 12 : 10; // 10关闭 12开启
-    paramsArr.push({
-      projectId: projectId,
-      objectId: sitem.id, // 空间id
-      valueType: 1, // 固定为1 1
-      itemId: itemId,
+
+//开关全部空调 
+export const changeAllAir = (itemarr, getDeviceStatus, status, projectId) => {
+    let paramsArr = [];
+    itemarr.forEach((sitem) => {
+        const itemId = status === '打开' ? 12 : 10; // 10关闭 12开启
+        paramsArr.push({
+            projectId: projectId,
+            objectId: sitem.id, // 空间id
+            valueType: 1, // 固定为1 1
+            itemId: itemId,
+        });
     });
-  });
 
-  changeAllAirHttp(paramsArr).then((res) => {
-    debugger;
-    if (res.result == 'success') {
-      message.success('指令下发成功');
-      callback();
-    } else {
-      message.error('操作失败,请重试');
-    }
-  });
+    changeAllAirHttp(paramsArr).then((res) => {
+        if (res.result == 'success') {
+            message.success('指令下发成功');
+            getDeviceStatus();
+        } else {
+            message.error('操作失败,请重试');
+        }
+    });
+};
+//查询 单个灯的状态
+export const getLamp = (sitem, callback, num) => {
+    num = num - 1;
+    getLampHttp(sitem.id).then((res) => {
+
+        if (res.result != 'success') return;
+        const arr = res.content || [];
+        //1开 0 关
+        let totalIsOpen = 0;
+        arr.forEach((item) => {
+            if (item.runStatus) {
+                totalIsOpen = 1;
+            }
+
+        });
+        //说明状态改变
+        if (sitem.light !== totalIsOpen) {
+            callback(totalIsOpen);
+            debugger;
+            return;
+        } else if (num == 0) {
+            return;
+        }
+        debugger;
+        getLamp(sitem, callback, num);
+
+
+
+    });
 };
+//查询 单个空调的状态
+export const getAirInfo = (sitem, callback, num, projectId) => {
+    debugger;
+    num = num - 1;
+    const paramsObj = {
+        objectId: sitem.id,
+        projectId: projectId,
+    };
+    getFeedbackDocumentsHttp(paramsObj).then((res) => {
+        //1开 0 关
+        const totalIsOpen = res.icon == 7 ? 0 : 1;
+
+        //说明状态改变
+        if (sitem.airConditioner !== totalIsOpen) {
+            callback(totalIsOpen);
+            debugger;
+            return;
+        } else if (num == 0) {
+            return;
+        }
+        debugger;
+        getAirInfo(sitem, callback, num, projectId);
+
+    });
+};

+ 33 - 20
src/pages/Equipment/index.tsx

@@ -23,7 +23,13 @@ import {
   queryDeviceTimeManage,
 } from '@/services/ant-design-pro/environment';
 
-import { changeCurtain, changeAir, changeLight } from '@/pages/Equipment/equipmentControl';
+import {
+  changeCurtain,
+  changeAir,
+  changeLight,
+  getLamp,
+  getAirInfo,
+} from '@/pages/Equipment/equipmentControl';
 
 //设备状态
 type equipStatus = {
@@ -94,7 +100,6 @@ const Environment: React.FC = () => {
   };
   //导航条切换
   const navigatorChange = (item: navigatorItem) => {
-    //debugger;
     setSelNav(item);
   };
   const showModalClick = (item) => {
@@ -106,7 +111,6 @@ const Environment: React.FC = () => {
   //当前设备的状态 all全部开启 part部分开启 close全都关闭  还有类型type 包括airConditioner light curtain
   //根据设备状态返回不同的 颜色
   const getColorOpacity = (value: number, type?: string): string => {
-    //debugger;
     let colorStr = '';
     if (selNav.id == 'all') {
       //全部设备时 colorStr赋值
@@ -136,7 +140,7 @@ const Environment: React.FC = () => {
     if (selNav.id == 'all' || !item.roomFuncType) return;
     //没有设备时
     //if (item[selNav.id] == 'not') return;
-    debugger;
+
     if (item[selNav.id] === 2) {
       confirm({
         title: '请确认',
@@ -145,7 +149,6 @@ const Environment: React.FC = () => {
         okText: '确认',
         cancelText: '取消',
         onOk() {
-          debugger;
           showModalClick(item);
         },
         onCancel() {
@@ -162,26 +165,40 @@ const Environment: React.FC = () => {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        function getDeviceStatus() {
-          var interval = setInterval(() => {
-            queryDeviceManage();
-          }, 1000);
-          setTimeout(() => {
-            console.log('setTimeout');
-            clearInterval(interval);
-          }, 60000);
+        // function getDeviceStatus() {
+        //   var interval = setInterval(() => {
+        //     queryDeviceManage();
+        //   }, 1000);
+        //   setTimeout(() => {
+        //     console.log('setTimeout');
+        //     clearInterval(interval);
+        //   }, 60000);
+        // }
+        function callback() {
+          //这是在手动改变状态
+          var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
+          mapCopy[index][selNav.id] = item[selNav.id] === 1 ? 0 : 1;
+          setMapCombineList(mapCopy);
         }
+
         //如果是空调
         if (selNav.id == 'airConditioner') {
+          function getDeviceStatus() {
+            //执行查询函数
+            getAirInfo(item, callback, 10, projectId);
+          }
           changeAir(item, index, getDeviceStatus);
         }
         if (selNav.id == 'light') {
+          function getDeviceStatus() {
+            //请求状态 10是指循环调10次
+            getLamp(item, callback, 10);
+          }
           changeLight('one', [item], getDeviceStatus, status);
         }
         if (selNav.id == 'curtain') {
-          changeCurtain('one', [item], getDeviceStatus, status);
+          changeCurtain('one', [item], callback, status);
         }
-        debugger;
       },
       onCancel() {
         //console.log('Cancel');
@@ -192,7 +209,6 @@ const Environment: React.FC = () => {
   useEffect(() => {
     //changeSearchFloorId('');
     if (selFloorId) {
-      debugger;
       setLoading(true);
 
       getMapList({
@@ -200,7 +216,6 @@ const Environment: React.FC = () => {
         floorId: selFloorId,
       })
         .then((res) => {
-          debugger;
           setLoading(false);
           var data: API.MapInfo[] = (res.data || {}).spaceList || [];
 
@@ -222,7 +237,6 @@ const Environment: React.FC = () => {
       projectId: projectId,
     })
       .then((res) => {
-        debugger;
         // setLoading(false);
         var statistics = res.data.statistics || [];
         //赋值 运行中的设备数量
@@ -297,7 +311,6 @@ const Environment: React.FC = () => {
 
       combineList.push(combine);
     });
-    //debugger;
     setMapCombineList(combineList);
     console.log('combine');
   }, [equipMapList, mapList, timeMapList]);
@@ -313,7 +326,7 @@ const Environment: React.FC = () => {
             mapList={mapList}
             callbackSearch={(s) => {
               //触发了搜索 如果楼层改变 重新更新地图
-              debugger;
+
               //setSelFloorId(s.floorId); //一个建筑 搜索其他楼层
               setSearchText({ text: s.localName });
             }}

+ 0 - 3
src/pages/Runtime/index.tsx

@@ -35,7 +35,6 @@ const Runtime: React.FC = () => {
 
   //楼层切换的回调
   const changeFloorId = (data: string) => {
-    //debugger;
     setSelFloorId(data);
   };
   const checkRecord = () => {
@@ -44,7 +43,6 @@ const Runtime: React.FC = () => {
   };
   //时间切换的回调
   const changeTime = (time) => {
-    //debugger;
     var timeStr = time.format('YYYYMMDD');
     setSelTime(timeStr);
   };
@@ -58,7 +56,6 @@ const Runtime: React.FC = () => {
         projectId: '',
       })
         .then((res) => {
-          //debugger;
           setLoading(false);
           var data: API.MapInfo[] = (res.data || {}).spaceList || [];
           setMapList(data);