zhaojijng 2 سال پیش
والد
کامیت
fbac9c9b9a

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

@@ -29,6 +29,7 @@ export type navigatorItem = {
   [key: string]: any;
 };
 const Environment: React.FC = () => {
+  const { changeLastFloorId } = useModel('buildFloor');
   const { searchSpace } = useModel('searchInfo');
   const { envir_temperature, envir_wet, envir_co2, envir_pm25, envir_jiaquan } = equipImageMap;
 
@@ -132,6 +133,7 @@ const Environment: React.FC = () => {
   //获取地图 mapList
   useEffect(() => {
     if (selFloorId) {
+      changeLastFloorId(selFloorId);
       setLoading(true);
       getMapList({
         //floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',

+ 2 - 0
src/pages/Equipment/index.tsx

@@ -44,6 +44,7 @@ type statistics = {
   runCount: number;
 };
 const Environment: React.FC = () => {
+  const { changeLastFloorId } = useModel('buildFloor');
   const { searchSpace } = useModel('searchInfo');
   const { getSpaceFunc } = useModel('spaceFunc');
   const { envir_all, equip_air, equip_lamp, envir_curtain } = equipImageMap;
@@ -219,6 +220,7 @@ const Environment: React.FC = () => {
   //获取地图 mapList
   useEffect(() => {
     if (selFloorId) {
+      changeLastFloorId(selFloorId);
       setLoading(true);
 
       getMapList({

+ 4 - 2
src/pages/Runtime/index.tsx

@@ -23,6 +23,7 @@ type runtimeNavType = {
 
 const Runtime: React.FC = () => {
   // const { maptemp6 } = equipImageMap;
+  const { changeLastFloorId } = useModel('buildFloor');
   const { searchSpace } = useModel('searchInfo');
   const { getSpaceFunc } = useModel('spaceFunc');
   const [loading, setLoading] = useState<boolean>(false);
@@ -50,6 +51,7 @@ const Runtime: React.FC = () => {
   //获取地图 mapList
   useEffect(() => {
     if (selFloorId) {
+      changeLastFloorId(selFloorId);
       setLoading(true);
       getMapList({
         floorId: selFloorId,
@@ -127,7 +129,7 @@ const Runtime: React.FC = () => {
         //setLoading(false);
       });
   };
-  let setTimer = useRef({});
+  let setTimer = useRef<Timer>(null);
   //获取时间列表 spaceTimeList
   useEffect(() => {
     if (selFloorId && selTime) {
@@ -152,7 +154,7 @@ const Runtime: React.FC = () => {
 
   useEffect(() => {
     //mapList,spaceTimeList 这两个数据的结合
-    console.log('dfsd-------');
+    //console.log('dfsd-------');
     // if (mapList && mapList.length > 0 && spaceTimeList && spaceTimeList.length > 0) {
 
     var combineList: any = [];

+ 2 - 2
src/sgcomponents/map/index.tsx

@@ -151,7 +151,7 @@ const Map: React.FC<MapProps> = ({ type, selFloorId, render, mapList, mapSize })
       setTranslateY(0);
     }
     currentFloorId.current = selFloorId;
-    console.log('selectSpace2');
+    //console.log('selectSpace2');
   }, [mapList]);
 
   //搜索信息改变时的搜索
@@ -188,7 +188,7 @@ const Map: React.FC<MapProps> = ({ type, selFloorId, render, mapList, mapSize })
     document.querySelector('#root').addEventListener(
       'mouseup',
       function () {
-        console.log('mouseUpEvent');
+        //console.log('mouseUpEvent');
         setCanMove(false);
       },
       true,

+ 7 - 24
src/sgcomponents/topNavigator/index.tsx

@@ -42,19 +42,16 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
   const [floorList, setFloorList] = useState<floorItem[]>([]);
   const [currentFloor, setCurrentFloor] = useState<string>();
 
-  //const [shishi, setShishi] = useState<string>('22');
   //则监听searchBuildId的改变    如果buildingId改变 请求楼层列表
   useEffect(() => {
     if (searchBuildId && searchFloorId) {
       if (searchBuildId !== currentBuild) {
         //如果搜索的buildId 改变
         setCurrentBuild(searchBuildId);
-        //changeLastBuildId(searchBuildId);
       } else {
         //如果搜索的buildId 没改变 floorId 改变了
         //为了 显示楼层选择
         setCurrentFloor(searchFloorId);
-        changeLastFloorId(searchFloorId);
         //父亲的floorId
         //这块 其实只有楼层id改变时调用  建筑id 改变时不调用
         changeFloorId && changeFloorId(searchFloorId);
@@ -83,15 +80,8 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
             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Î';
-
         setCurrentBuild(lastBuildId || (resData[0] || {}).id); //设置第一个建筑值
-        //!lastBuildId && changeLastBuildId((resData[0] || {}).id);
-        changeBuildId && changeBuildId(lastBuildId || (resData[0] || {}).id);
+        //changeBuildId && changeBuildId(lastBuildId || (resData[0] || {}).id);
       });
     }
   }, []);
@@ -126,14 +116,17 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
         lastFloorIdTemp = lastFloorId;
       }
       setCurrentFloor(searchFloorId || lastFloorIdTemp || (resData[0] || {}).id); //如果有搜索的楼层id 则用搜索的结果
-      changeLastFloorId(searchFloorId || lastFloorIdTemp || (resData[0] || {}).id);
-
       changeFloorId && changeFloorId(searchFloorId || lastFloorIdTemp || (resData[0] || {}).id); //改变父组件的floorId的值
     }
+
     if (currentBuild) {
       changeLastBuildId(currentBuild);
       asyncFunction();
     }
+    //console.log('currentBuild22', currentBuild);
+    return () => {
+      //console.log('currentBuild111', currentBuild);
+    };
   }, [currentBuild]);
 
   //   useEffect(() => {
@@ -141,29 +134,19 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
   //     if (floorList.length > 0) {
   //       debugger;
   //       setCurrentFloor(searchFloorId || lastFloorId || (floorList[0] || {}).value); //如果有搜索的楼层id 则用搜索的结果
-  //       changeLastFloorId(searchFloorId || lastFloorId || (floorList[0] || {}).value);
-
   //       changeFloorId && changeFloorId(searchFloorId || lastFloorId || (floorList[0] || {}).value); //改变父组件的floorId的值
   //     }
   //   }, [floorList]);
 
   const changBuildHandle = useCallback((val) => {
-    //console.log('select-onChange', val);
-
-    //changeSearchFloorId('');
-    changeLastFloorId('');
-
     //显示的建筑改变
     setCurrentBuild(val);
-    //changeLastBuildId(val);
-
     //父亲的buildId改变
-    changeBuildId && changeBuildId(val);
+    //changeBuildId && changeBuildId(val);
   }, []);
 
   const changFloorHandle = useCallback((val) => {
     setCurrentFloor(val);
-    changeLastFloorId(val);
     changeFloorId && changeFloorId(val);
   }, []);