|
@@ -377,7 +377,7 @@ const Environment: React.FC = () => {
|
|
|
setNavigatorList(navigatorList);
|
|
|
}
|
|
|
});
|
|
|
- console.log(navigatorList, '-----navigatorList');
|
|
|
+ // console.log(navigatorList, '-----navigatorList');
|
|
|
});
|
|
|
}
|
|
|
function getSpaceHasPerson(sfId: any) {
|
|
@@ -451,14 +451,13 @@ const Environment: React.FC = () => {
|
|
|
return ele.id == spaceId;
|
|
|
});
|
|
|
var filterSpace3 = hasPersonList.filter((ele) => {
|
|
|
- return ele.id == spaceId;
|
|
|
+ return ele.spaceId == spaceId;
|
|
|
});
|
|
|
var combine = Object.assign({}, filterSpace3[0], filterSpace1[0], filterSpace2[0], mitem);
|
|
|
|
|
|
combineList.push(combine);
|
|
|
});
|
|
|
setMapCombineList(combineList);
|
|
|
- console.log('combine');
|
|
|
}, [equipMapList, mapList, timeMapList, hasPersonList]);
|
|
|
|
|
|
let firtTime: number = 0;
|
|
@@ -635,7 +634,7 @@ const Environment: React.FC = () => {
|
|
|
</div>
|
|
|
)}
|
|
|
{(selNav.id == 'airConditioner' || selNav.id == 'light') &&
|
|
|
- item.isPassengerPass &&
|
|
|
+ item.runStatus === 1 &&
|
|
|
item.canClick && (
|
|
|
<div
|
|
|
className={mapstyles.hasPerson}
|
|
@@ -656,7 +655,7 @@ const Environment: React.FC = () => {
|
|
|
</div>
|
|
|
)}
|
|
|
{(selNav.id == 'airConditioner' || selNav.id == 'light') &&
|
|
|
- item.isPassengerPass == false &&
|
|
|
+ item.runStatus === 0 &&
|
|
|
item.canClick && (
|
|
|
<div
|
|
|
className={mapstyles.hasPerson}
|