|
@@ -141,15 +141,16 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
|
|
|
}),
|
|
|
);
|
|
|
|
|
|
+ var lastBuildId2 = lastBuildId || sessionStorage.getItem('lastBuildId') || '';
|
|
|
var lastFilter = resData.filter((item) => {
|
|
|
- return item.id == lastBuildId;
|
|
|
+ return item.id == lastBuildId2;
|
|
|
});
|
|
|
|
|
|
var lastBuildIdTemp = '';
|
|
|
if (lastFilter.length > 0) {
|
|
|
- lastBuildIdTemp = lastBuildId;
|
|
|
+ lastBuildIdTemp = lastBuildId2;
|
|
|
}
|
|
|
-
|
|
|
+ //debugger;
|
|
|
setCurrentBuild(searchBuildId || lastBuildIdTemp || (resData[0] || {}).id); //设置第一个建筑值
|
|
|
//changeBuildId && changeBuildId(lastBuildId || (resData[0] || {}).id);
|
|
|
});
|
|
@@ -176,15 +177,16 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
|
|
|
return { label: item.localName, value: item.id };
|
|
|
}),
|
|
|
);
|
|
|
+ var lastFloorId2 = lastFloorId || sessionStorage.getItem('lastFloorId') || '';
|
|
|
|
|
|
//如果最后选中的
|
|
|
var lastFilter = resData.filter((item) => {
|
|
|
- return item.id == lastFloorId;
|
|
|
+ return item.id == lastFloorId2;
|
|
|
});
|
|
|
|
|
|
var lastFloorIdTemp = '';
|
|
|
if (lastFilter.length > 0) {
|
|
|
- lastFloorIdTemp = lastFloorId;
|
|
|
+ lastFloorIdTemp = lastFloorId2;
|
|
|
}
|
|
|
//debugger;
|
|
|
setCurrentFloor(searchFloorId || lastFloorIdTemp || (resData[0] || {}).id); //如果有搜索的楼层id 则用搜索的结果
|