|
@@ -32,7 +32,7 @@ const Runtime: React.FC = () => {
|
|
|
|
|
|
//楼层切换的回调
|
|
|
const changeFloorId = (data: string) => {
|
|
|
- debugger;
|
|
|
+ //debugger;
|
|
|
setSelFloorId(data);
|
|
|
};
|
|
|
const checkRecord = () => {
|
|
@@ -41,7 +41,7 @@ const Runtime: React.FC = () => {
|
|
|
};
|
|
|
//时间切换的回调
|
|
|
const changeTime = (time) => {
|
|
|
- debugger;
|
|
|
+ //debugger;
|
|
|
var timeStr = time.format('YYYYMMDD');
|
|
|
setSelTime(timeStr);
|
|
|
};
|
|
@@ -50,7 +50,7 @@ const Runtime: React.FC = () => {
|
|
|
if (selFloorId) {
|
|
|
getMapList({ floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454', projectId: '' }).then(
|
|
|
(res) => {
|
|
|
- debugger;
|
|
|
+ //debugger;
|
|
|
var data: API.MapInfo[] = (res.data || {}).spaceList || [];
|
|
|
setMapList(data);
|
|
|
},
|
|
@@ -106,21 +106,20 @@ const Runtime: React.FC = () => {
|
|
|
|
|
|
useEffect(() => {
|
|
|
//mapList,spaceTimeList 这两个数据的结合
|
|
|
- debugger;
|
|
|
console.log('dfsd-------', mapList, spaceTimeList);
|
|
|
- if (mapList && mapList.length > 0 && spaceTimeList && spaceTimeList.length > 0) {
|
|
|
- var combineList = [];
|
|
|
- mapList.map(function (mitem) {
|
|
|
- var spaceId = mitem.spaceId;
|
|
|
- var filterSpace = spaceTimeList.filter((ele) => {
|
|
|
- return ele.id == spaceId;
|
|
|
- });
|
|
|
-
|
|
|
- var combine = Object.assign({}, mitem, filterSpace[0]);
|
|
|
- combineList.push(combine);
|
|
|
+ // if (mapList && mapList.length > 0 && spaceTimeList && spaceTimeList.length > 0) {
|
|
|
+ var combineList = [];
|
|
|
+ mapList.map(function (mitem) {
|
|
|
+ var spaceId = mitem.spaceId;
|
|
|
+ var filterSpace = spaceTimeList.filter((ele) => {
|
|
|
+ return ele.id == spaceId;
|
|
|
});
|
|
|
- setMapCombineList(combineList);
|
|
|
- }
|
|
|
+
|
|
|
+ var combine = Object.assign({}, mitem, filterSpace[0]);
|
|
|
+ combineList.push(combine);
|
|
|
+ });
|
|
|
+ setMapCombineList(combineList);
|
|
|
+ // }
|
|
|
}, [mapList, spaceTimeList]);
|
|
|
|
|
|
return (
|