|
@@ -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);
|
|
|
}, []);
|
|
|
|