|
@@ -43,9 +43,9 @@ const TopNavRight: React.FC<topNavRightProps> = ({
|
|
|
onOk() {
|
|
|
console.log('mapListmapList', mapList);
|
|
|
//筛选 没有开启的空间
|
|
|
- // var filterSpaceArr = mapList.filter((item) => {
|
|
|
- // return item[selNavObj.id] !== 1;
|
|
|
- // });
|
|
|
+ var filterSpaceArr = mapList.filter((item) => {
|
|
|
+ return item[selNavObj.id] !== 1;
|
|
|
+ });
|
|
|
var filterSpaceArr2 = mapList.filter((item) => {
|
|
|
return item.localName == '上格云3' || item.localName == '上格云休闲区';
|
|
|
});
|
|
@@ -65,15 +65,15 @@ const TopNavRight: React.FC<topNavRightProps> = ({
|
|
|
// });
|
|
|
}
|
|
|
//如果是空调
|
|
|
- //if (filterSpaceArr.length == 0) return;
|
|
|
+ if (filterSpaceArr.length == 0) return;
|
|
|
if (selNavObj.id == 'airConditioner') {
|
|
|
- changeAllAir(mapList, getDeviceStatus, '打开', projectId);
|
|
|
+ changeAllAir(filterSpaceArr, getDeviceStatus, '打开', projectId);
|
|
|
}
|
|
|
if (selNavObj.id == 'light') {
|
|
|
- changeLight('all', mapList, getDeviceStatus, '打开');
|
|
|
+ changeLight('all', filterSpaceArr, getDeviceStatus, '打开');
|
|
|
}
|
|
|
if (selNavObj.id == 'curtain') {
|
|
|
- changeCurtain('all', mapList, getDeviceStatus, '打开'); // '关闭' : '打开';
|
|
|
+ changeCurtain('all', filterSpaceArr, getDeviceStatus, '打开'); // '关闭' : '打开';
|
|
|
}
|
|
|
},
|
|
|
onCancel() {
|
|
@@ -92,9 +92,9 @@ const TopNavRight: React.FC<topNavRightProps> = ({
|
|
|
okText: '确认',
|
|
|
cancelText: '取消',
|
|
|
onOk() {
|
|
|
- // var filterSpaceArr = mapList.filter((item) => {
|
|
|
- // return item[selNavObj.id] !== 0;
|
|
|
- // });
|
|
|
+ var filterSpaceArr = mapList.filter((item) => {
|
|
|
+ return item[selNavObj.id] !== 0;
|
|
|
+ });
|
|
|
var filterSpaceArr2 = mapList.filter((item) => {
|
|
|
return item.localName == '上格云3' || item.localName == '上格云休闲区';
|
|
|
});
|
|
@@ -116,13 +116,13 @@ const TopNavRight: React.FC<topNavRightProps> = ({
|
|
|
|
|
|
//如果是空调
|
|
|
if (selNavObj.id == 'airConditioner') {
|
|
|
- changeAllAir(mapList, getDeviceStatus, '关闭', projectId);
|
|
|
+ changeAllAir(filterSpaceArr, getDeviceStatus, '关闭', projectId);
|
|
|
}
|
|
|
if (selNavObj.id == 'light') {
|
|
|
- changeLight('all', mapList, getDeviceStatus, '关闭');
|
|
|
+ changeLight('all', filterSpaceArr, getDeviceStatus, '关闭');
|
|
|
}
|
|
|
if (selNavObj.id == 'curtain') {
|
|
|
- changeCurtain('all', mapList, getDeviceStatus, '关闭');
|
|
|
+ changeCurtain('all', filterSpaceArr, getDeviceStatus, '关闭');
|
|
|
}
|
|
|
},
|
|
|
onCancel() {
|