|
@@ -35,10 +35,14 @@ type statistics = {
|
|
runCount: number;
|
|
runCount: number;
|
|
};
|
|
};
|
|
const Environment: React.FC = () => {
|
|
const Environment: React.FC = () => {
|
|
- const { getSpaceFunc } = useModel('spaceFunc');
|
|
|
|
|
|
+ const { getSpaceFunc, projectId } = useModel('spaceFunc');
|
|
|
|
+ const { changeSearchFloorId } = useModel('buildFloor');
|
|
const { envir_all, equip_air, equip_lamp, envir_curtain } = equipImageMap;
|
|
const { envir_all, equip_air, equip_lamp, envir_curtain } = equipImageMap;
|
|
|
|
|
|
const [searchText, setSearchText] = useState<{ text: any }>();
|
|
const [searchText, setSearchText] = useState<{ text: any }>();
|
|
|
|
+ //const [searchSpace, setSearchSpace] = useState<{}>();
|
|
|
|
+ // const [searchFloorId, setSearchFloorId] = useState<{}>();
|
|
|
|
+ // const [searchBuildId, setSearchBuildId] = useState<{}>();
|
|
const [showModal, setShowModal] = useState<boolean>(false);
|
|
const [showModal, setShowModal] = useState<boolean>(false);
|
|
const [showSpace, setShowSpace] = useState<API.MapInfo>({}); //当前弹框选中的空间
|
|
const [showSpace, setShowSpace] = useState<API.MapInfo>({}); //当前弹框选中的空间
|
|
const [navigatorList, setNavigatorList] = useState<navigatorItem[]>([
|
|
const [navigatorList, setNavigatorList] = useState<navigatorItem[]>([
|
|
@@ -81,7 +85,7 @@ const Environment: React.FC = () => {
|
|
const [selNav, setSelNav] = useState<navigatorItem>(navigatorList[0]);
|
|
const [selNav, setSelNav] = useState<navigatorItem>(navigatorList[0]);
|
|
const [selFloorId, setSelFloorId] = useState<string>();
|
|
const [selFloorId, setSelFloorId] = useState<string>();
|
|
const [mapCombineList, setMapCombineList] = useState<any[]>([]);
|
|
const [mapCombineList, setMapCombineList] = useState<any[]>([]);
|
|
- const [loading, setLoading] = useState<boolean>(true);
|
|
|
|
|
|
+ const [loading, setLoading] = useState<boolean>(false);
|
|
|
|
|
|
const changeFloorId = (data: string) => {
|
|
const changeFloorId = (data: string) => {
|
|
//debugger;
|
|
//debugger;
|
|
@@ -175,7 +179,9 @@ const Environment: React.FC = () => {
|
|
};
|
|
};
|
|
//获取地图 mapList
|
|
//获取地图 mapList
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
|
|
+ //changeSearchFloorId('');
|
|
if (selFloorId) {
|
|
if (selFloorId) {
|
|
|
|
+ debugger;
|
|
setLoading(true);
|
|
setLoading(true);
|
|
getMapList({
|
|
getMapList({
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
@@ -190,6 +196,8 @@ const Environment: React.FC = () => {
|
|
.catch(() => {
|
|
.catch(() => {
|
|
setLoading(false);
|
|
setLoading(false);
|
|
});
|
|
});
|
|
|
|
+ } else {
|
|
|
|
+ setMapList([]);
|
|
}
|
|
}
|
|
}, [selFloorId]);
|
|
}, [selFloorId]);
|
|
//获取设备状态 设备种类
|
|
//获取设备状态 设备种类
|
|
@@ -199,10 +207,10 @@ const Environment: React.FC = () => {
|
|
queryEquipStatistics({
|
|
queryEquipStatistics({
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
floorId: selFloorId,
|
|
floorId: selFloorId,
|
|
- projectId: 'Pj1101080259',
|
|
|
|
|
|
+ projectId: projectId,
|
|
})
|
|
})
|
|
.then((res) => {
|
|
.then((res) => {
|
|
- //debugger;
|
|
|
|
|
|
+ debugger;
|
|
// setLoading(false);
|
|
// setLoading(false);
|
|
var statistics = res.data.statistics || [];
|
|
var statistics = res.data.statistics || [];
|
|
//赋值 运行中的设备数量
|
|
//赋值 运行中的设备数量
|
|
@@ -218,10 +226,13 @@ const Environment: React.FC = () => {
|
|
//设备空间信息
|
|
//设备空间信息
|
|
var spaceList = res.data.spaceList || [];
|
|
var spaceList = res.data.spaceList || [];
|
|
spaceList.forEach((item: any) => {
|
|
spaceList.forEach((item: any) => {
|
|
- item.equipStatusList.forEach((eItem: equipStatus) => {
|
|
|
|
|
|
+ //debugger;
|
|
|
|
+ (item.equipStatusList || []).forEach((eItem: equipStatus) => {
|
|
|
|
+ //debugger;
|
|
item[eItem.equipType] = eItem.status;
|
|
item[eItem.equipType] = eItem.status;
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
+
|
|
setEquipMapList(spaceList);
|
|
setEquipMapList(spaceList);
|
|
})
|
|
})
|
|
.catch(() => {
|
|
.catch(() => {
|
|
@@ -269,6 +280,7 @@ const Environment: React.FC = () => {
|
|
setMapCombineList(combineList);
|
|
setMapCombineList(combineList);
|
|
console.log('combine');
|
|
console.log('combine');
|
|
}, [equipMapList, mapList, timeMapList]);
|
|
}, [equipMapList, mapList, timeMapList]);
|
|
|
|
+
|
|
let firtTime: number = 0;
|
|
let firtTime: number = 0;
|
|
let lastTime: number = 0;
|
|
let lastTime: number = 0;
|
|
return (
|
|
return (
|
|
@@ -278,9 +290,11 @@ const Environment: React.FC = () => {
|
|
action={
|
|
action={
|
|
<SearchInput
|
|
<SearchInput
|
|
mapList={mapList}
|
|
mapList={mapList}
|
|
- onSearch={(s) => {
|
|
|
|
- //触发了搜索
|
|
|
|
- setSearchText({ text: s });
|
|
|
|
|
|
+ callbackSearch={(s) => {
|
|
|
|
+ //触发了搜索 如果楼层改变 重新更新地图
|
|
|
|
+ debugger;
|
|
|
|
+ //setSelFloorId(s.floorId); //一个建筑 搜索其他楼层
|
|
|
|
+ setSearchText({ text: s.localName });
|
|
}}
|
|
}}
|
|
/>
|
|
/>
|
|
}
|
|
}
|