|
@@ -126,18 +126,16 @@ const Environment: React.FC = () => {
|
|
const { confirm } = Modal;
|
|
const { confirm } = Modal;
|
|
//空调的调节 0是关闭 1 是开启 2 是部分开启
|
|
//空调的调节 0是关闭 1 是开启 2 是部分开启
|
|
//这是存在疑惑 部分开启怎么办
|
|
//这是存在疑惑 部分开启怎么办
|
|
- const changeAir = (sitem, index) => {
|
|
|
|
|
|
+ const changeAir = (sitem, index: number) => {
|
|
const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
|
|
const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
|
|
const paramsObj = {
|
|
const paramsObj = {
|
|
objectId: sitem.id, // 空间id
|
|
objectId: sitem.id, // 空间id
|
|
- valueType: 1, // 固定为1
|
|
|
|
|
|
+ valueType: 1, // 固定为1 1
|
|
itemId: itemId,
|
|
itemId: itemId,
|
|
};
|
|
};
|
|
changeAirHttp(paramsObj).then((res) => {
|
|
changeAirHttp(paramsObj).then((res) => {
|
|
if (res.result == 'success') {
|
|
if (res.result == 'success') {
|
|
message.success('指令下发成功');
|
|
message.success('指令下发成功');
|
|
- //这是没有部分开启一说吧
|
|
|
|
- debugger;
|
|
|
|
// sitem.airConditioner = res.isClose ? 0 : 1; //改变某空间空调的状态
|
|
// sitem.airConditioner = res.isClose ? 0 : 1; //改变某空间空调的状态
|
|
//mapCombineList[index]['airConditioner'] = res.isClose ? 0 : 1;
|
|
//mapCombineList[index]['airConditioner'] = res.isClose ? 0 : 1;
|
|
var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
|
|
var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
|
|
@@ -148,12 +146,13 @@ const Environment: React.FC = () => {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
};
|
|
};
|
|
|
|
+
|
|
//单个空间的点击事情
|
|
//单个空间的点击事情
|
|
const spaceControl = (item, index: number) => {
|
|
const spaceControl = (item, index: number) => {
|
|
if (selNav.id == 'all' || !item.roomFuncType) return;
|
|
if (selNav.id == 'all' || !item.roomFuncType) return;
|
|
var status = item[selNav.id] === 0 ? '打开' : '关闭';
|
|
var status = item[selNav.id] === 0 ? '打开' : '关闭';
|
|
confirm({
|
|
confirm({
|
|
- title: '确认',
|
|
|
|
|
|
+ title: '请确认',
|
|
icon: <ExclamationCircleOutlined />,
|
|
icon: <ExclamationCircleOutlined />,
|
|
content: `确认${status}该${selNav.name}吗?`,
|
|
content: `确认${status}该${selNav.name}吗?`,
|
|
okText: '确认',
|
|
okText: '确认',
|
|
@@ -167,6 +166,7 @@ const Environment: React.FC = () => {
|
|
}
|
|
}
|
|
if (selNav.id == 'curtain') {
|
|
if (selNav.id == 'curtain') {
|
|
}
|
|
}
|
|
|
|
+ debugger;
|
|
},
|
|
},
|
|
onCancel() {
|
|
onCancel() {
|
|
//console.log('Cancel');
|
|
//console.log('Cancel');
|
|
@@ -176,20 +176,26 @@ const Environment: React.FC = () => {
|
|
//获取地图 mapList
|
|
//获取地图 mapList
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
if (selFloorId) {
|
|
if (selFloorId) {
|
|
|
|
+ setLoading(true);
|
|
getMapList({
|
|
getMapList({
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
floorId: selFloorId,
|
|
floorId: selFloorId,
|
|
- }).then((res) => {
|
|
|
|
- //debugger;
|
|
|
|
- var data: API.MapInfo[] = (res.data || {}).spaceList || [];
|
|
|
|
- setMapList(data);
|
|
|
|
- });
|
|
|
|
|
|
+ })
|
|
|
|
+ .then((res) => {
|
|
|
|
+ //debugger;
|
|
|
|
+ setLoading(false);
|
|
|
|
+ var data: API.MapInfo[] = (res.data || {}).spaceList || [];
|
|
|
|
+ setMapList(data);
|
|
|
|
+ })
|
|
|
|
+ .catch(() => {
|
|
|
|
+ setLoading(false);
|
|
|
|
+ });
|
|
}
|
|
}
|
|
}, [selFloorId]);
|
|
}, [selFloorId]);
|
|
//获取设备状态 设备种类
|
|
//获取设备状态 设备种类
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
if (selFloorId) {
|
|
if (selFloorId) {
|
|
- setLoading(true);
|
|
|
|
|
|
+ //setLoading(true);
|
|
queryEquipStatistics({
|
|
queryEquipStatistics({
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
floorId: selFloorId,
|
|
floorId: selFloorId,
|
|
@@ -197,7 +203,7 @@ const Environment: React.FC = () => {
|
|
})
|
|
})
|
|
.then((res) => {
|
|
.then((res) => {
|
|
//debugger;
|
|
//debugger;
|
|
- setLoading(false);
|
|
|
|
|
|
+ // setLoading(false);
|
|
var statistics = res.data.statistics || [];
|
|
var statistics = res.data.statistics || [];
|
|
//赋值 运行中的设备数量
|
|
//赋值 运行中的设备数量
|
|
navigatorList.forEach(function (nItem) {
|
|
navigatorList.forEach(function (nItem) {
|
|
@@ -219,7 +225,7 @@ const Environment: React.FC = () => {
|
|
setEquipMapList(spaceList);
|
|
setEquipMapList(spaceList);
|
|
})
|
|
})
|
|
.catch(() => {
|
|
.catch(() => {
|
|
- setLoading(false);
|
|
|
|
|
|
+ // setLoading(false);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}, [selFloorId]);
|
|
}, [selFloorId]);
|
|
@@ -227,19 +233,19 @@ const Environment: React.FC = () => {
|
|
//获取时间列表 spaceTimeList
|
|
//获取时间列表 spaceTimeList
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
if (selFloorId) {
|
|
if (selFloorId) {
|
|
- setLoading(true);
|
|
|
|
|
|
+ //setLoading(true);
|
|
queryDeviceTimeManage({
|
|
queryDeviceTimeManage({
|
|
floorId: selFloorId,
|
|
floorId: selFloorId,
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
//floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
|
|
date: moment().format('YYYYMMDD'),
|
|
date: moment().format('YYYYMMDD'),
|
|
})
|
|
})
|
|
.then(function (res) {
|
|
.then(function (res) {
|
|
- setLoading(false);
|
|
|
|
|
|
+ // setLoading(false);
|
|
var resList = res.content || [];
|
|
var resList = res.content || [];
|
|
setTimeMapList(resList);
|
|
setTimeMapList(resList);
|
|
})
|
|
})
|
|
.catch(() => {
|
|
.catch(() => {
|
|
- setLoading(false);
|
|
|
|
|
|
+ // setLoading(false);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}, [selFloorId]);
|
|
}, [selFloorId]);
|
|
@@ -261,7 +267,7 @@ const Environment: React.FC = () => {
|
|
});
|
|
});
|
|
//debugger;
|
|
//debugger;
|
|
setMapCombineList(combineList);
|
|
setMapCombineList(combineList);
|
|
- debugger;
|
|
|
|
|
|
+ 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;
|
|
@@ -273,6 +279,7 @@ const Environment: React.FC = () => {
|
|
<SearchInput
|
|
<SearchInput
|
|
mapList={mapList}
|
|
mapList={mapList}
|
|
onSearch={(s) => {
|
|
onSearch={(s) => {
|
|
|
|
+ //触发了搜索
|
|
setSearchText({ text: s });
|
|
setSearchText({ text: s });
|
|
}}
|
|
}}
|
|
/>
|
|
/>
|
|
@@ -282,7 +289,13 @@ const Environment: React.FC = () => {
|
|
navigatorList={navigatorList}
|
|
navigatorList={navigatorList}
|
|
type={'equipment'}
|
|
type={'equipment'}
|
|
navigatorChange={navigatorChange}
|
|
navigatorChange={navigatorChange}
|
|
- action={<TopNavRight selNavObj={selNav} navigatorList={navigatorList}></TopNavRight>}
|
|
|
|
|
|
+ action={
|
|
|
|
+ <TopNavRight
|
|
|
|
+ selNavObj={selNav}
|
|
|
|
+ navigatorList={navigatorList}
|
|
|
|
+ mapList={mapCombineList}
|
|
|
|
+ ></TopNavRight>
|
|
|
|
+ }
|
|
changeFloorId={changeFloorId}
|
|
changeFloorId={changeFloorId}
|
|
selParamObj={selNav}
|
|
selParamObj={selNav}
|
|
></TopNavigator>
|
|
></TopNavigator>
|
|
@@ -342,12 +355,10 @@ const Environment: React.FC = () => {
|
|
}
|
|
}
|
|
}}
|
|
}}
|
|
onMouseDown={(event) => {
|
|
onMouseDown={(event) => {
|
|
- console.log(1);
|
|
|
|
//event.stopPropagation();
|
|
//event.stopPropagation();
|
|
firtTime = new Date().getTime();
|
|
firtTime = new Date().getTime();
|
|
}}
|
|
}}
|
|
onMouseUp={(event) => {
|
|
onMouseUp={(event) => {
|
|
- console.log(2);
|
|
|
|
//event.stopPropagation();
|
|
//event.stopPropagation();
|
|
lastTime = new Date().getTime();
|
|
lastTime = new Date().getTime();
|
|
}}
|
|
}}
|
|
@@ -379,7 +390,17 @@ const Environment: React.FC = () => {
|
|
className={mapstyles.showModal}
|
|
className={mapstyles.showModal}
|
|
onClick={(event) => {
|
|
onClick={(event) => {
|
|
event.stopPropagation();
|
|
event.stopPropagation();
|
|
- showModalClick(item);
|
|
|
|
|
|
+ if (lastTime - firtTime < 300) {
|
|
|
|
+ showModalClick(item);
|
|
|
|
+ }
|
|
|
|
+ }}
|
|
|
|
+ onMouseDown={(event) => {
|
|
|
|
+ //event.stopPropagation();
|
|
|
|
+ firtTime = new Date().getTime();
|
|
|
|
+ }}
|
|
|
|
+ onMouseUp={(event) => {
|
|
|
|
+ //event.stopPropagation();
|
|
|
|
+ lastTime = new Date().getTime();
|
|
}}
|
|
}}
|
|
>
|
|
>
|
|
<Icon className="" type="hover"></Icon>
|
|
<Icon className="" type="hover"></Icon>
|