|
@@ -88,10 +88,14 @@ const Environment: React.FC = () => {
|
|
|
},
|
|
|
]);
|
|
|
const [mapList, setMapList] = useState<API.MapInfo[]>([]);
|
|
|
+ const [mapListFloorId, setMapListFloorId] = useState<string>();
|
|
|
const [mapSize, setMapSize] = useState<any>({});
|
|
|
|
|
|
const [equipMapList, setEquipMapList] = useState<any[]>([]);
|
|
|
+ const [equipMapListFloorId, setEquipMapListFloorId] = useState<string>();
|
|
|
const [timeMapList, setTimeMapList] = useState<any[]>([]);
|
|
|
+ const [timeMapListFloorId, setTimeMapListFloorId] = useState<string>();
|
|
|
+
|
|
|
const [selNav, setSelNav] = useState<navigatorItem>(navigatorList[0]);
|
|
|
const [selFloorId, setSelFloorId] = useState<string>();
|
|
|
const [mapCombineList, setMapCombineList] = useState<any[]>([]);
|
|
@@ -227,6 +231,7 @@ const Environment: React.FC = () => {
|
|
|
};
|
|
|
setMapSize(mapSize);
|
|
|
setMapList(data);
|
|
|
+
|
|
|
//setSelNav(navigatorList[0]); //每当重新请求地图时 让选中导航的默认是第一个
|
|
|
})
|
|
|
.catch(() => {
|
|
@@ -261,11 +266,19 @@ const Environment: React.FC = () => {
|
|
|
spaceList.forEach((item: any) => {
|
|
|
var allType = ['airConditioner', 'light', 'curtain'];
|
|
|
allType.forEach((etype) => {
|
|
|
- var filterRes = (item.equipStatusList || []).filter((eItem: equipStatus) => {
|
|
|
+ var filterEquip = (item.equipList || []).filter((eItem: any) => {
|
|
|
return eItem.equipType == etype;
|
|
|
});
|
|
|
- //不存时 赋值not 如果没有设备状态 则说明没有设备
|
|
|
- filterRes.length > 0 ? (item[etype] = filterRes[0].status) : (item[etype] = 'not');
|
|
|
+ //有当前设备
|
|
|
+ if (filterEquip.length > 0) {
|
|
|
+ var filterRes = (item.equipStatusList || []).filter((eItem: equipStatus) => {
|
|
|
+ return eItem.equipType == etype;
|
|
|
+ });
|
|
|
+ //不存时 赋值not 如果没有设备状态 则说明没有设备 1 是开启 0是关闭
|
|
|
+ filterRes.length > 0 ? (item[etype] = filterRes[0].status) : (item[etype] = 0);
|
|
|
+ } else {
|
|
|
+ item[etype] = 'not';
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
//console.log('spaceList', spaceList);
|
|
@@ -326,10 +339,7 @@ const Environment: React.FC = () => {
|
|
|
let lastTime: number = 0;
|
|
|
return (
|
|
|
<>
|
|
|
- <PageHeader
|
|
|
- title={<FormattedMessage id="menu.equipment" />}
|
|
|
- action={<SearchInput mapList={mapList} />}
|
|
|
- />
|
|
|
+ <PageHeader title={<FormattedMessage id="menu.equipment" />} action={<SearchInput />} />
|
|
|
<TopNavigator
|
|
|
navigatorList={navigatorList}
|
|
|
type={'equipment'}
|
|
@@ -378,6 +388,7 @@ const Environment: React.FC = () => {
|
|
|
mapList={mapCombineList}
|
|
|
mapSize={mapSize}
|
|
|
type={'equipment'}
|
|
|
+ selFloorId={selFloorId}
|
|
|
render={(item, index) => {
|
|
|
return (
|
|
|
<div
|