|
@@ -502,9 +502,11 @@ export default {
|
|
|
// zoneObj.Outline.push([temp]);
|
|
|
// })
|
|
|
// let curISP = this.sourceIdToISP[key];
|
|
|
+ // if (curISP) {
|
|
|
// curISP && IspaceIdList.push(curISP.RoomID);
|
|
|
// zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
// }
|
|
|
+ // }
|
|
|
// 数据计算导致浏览器奔溃,临时注释
|
|
|
let zoneObj = { Outline: [], Height: 0 }, IspaceIdList = [];
|
|
|
let selectSpaces = this.scene.getSelectedSpaces();
|
|
@@ -512,8 +514,10 @@ export default {
|
|
|
zoneObj.Outline.push(t.data.OutLine);
|
|
|
let key = t.data.SourceId;
|
|
|
let curISP = this.sourceIdToISP[key];
|
|
|
- curISP && IspaceIdList.push(curISP.RoomID);
|
|
|
- zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
+ if (curISP) {
|
|
|
+ IspaceIdList.push(curISP.RoomID);
|
|
|
+ zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
+ }
|
|
|
})
|
|
|
// 如果有划分,求交集
|
|
|
if (this.scene.cutItem || this.scene.sceneMark) {
|
|
@@ -566,9 +570,11 @@ export default {
|
|
|
// zoneObj.Outline.push([temp]);
|
|
|
// })
|
|
|
// let curISP = this.sourceIdToISP[key];
|
|
|
+ // if(curISP){
|
|
|
// curISP && IspaceIdList.push(curISP.RoomID);
|
|
|
// zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
// }
|
|
|
+ // }
|
|
|
|
|
|
// 改回之前逻辑
|
|
|
zoneObj.Outline = [];
|
|
@@ -579,8 +585,10 @@ export default {
|
|
|
zoneObj.Outline.push(t.data.OutLine);
|
|
|
let key = t.data.SourceId;
|
|
|
let curISP = this.sourceIdToISP[key];
|
|
|
- curISP && IspaceIdList.push(curISP.RoomID);
|
|
|
- zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
+ if (curISP) {
|
|
|
+ curISP && IspaceIdList.push(curISP.RoomID);
|
|
|
+ zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
+ }
|
|
|
})
|
|
|
// 如果有划分,求交集
|
|
|
if (this.scene.cutItem || this.scene.sceneMark) {
|
|
@@ -712,14 +720,16 @@ export default {
|
|
|
// continue
|
|
|
// }
|
|
|
// let curISP = this.sourceIdToISP[key];
|
|
|
+ // if (curISP) {
|
|
|
// zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
|
|
|
// zoneObj.IspaceId = curISP.RoomID;
|
|
|
// zoneObj.RoomLocalName = curISP.RoomLocalName;
|
|
|
+ // }
|
|
|
// zoneObj.BuildingId = this.buildFloor[0];
|
|
|
// zoneObj.FloorId = this.buildFloor[1];
|
|
|
// createSpaces.push(zoneObj);
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
// 改回之前逻辑
|
|
|
let arr = this.scene.getSelectedSpaces();
|
|
|
let createSpaces = [];
|