|
@@ -403,7 +403,7 @@
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
let pa = {
|
|
let pa = {
|
|
cascader: [{name: 'spaceOutline'}],
|
|
cascader: [{name: 'spaceOutline'}],
|
|
- classCode: ObjectType,
|
|
|
|
|
|
+ zoneType: ObjectType,
|
|
filters: `not id isNull`,
|
|
filters: `not id isNull`,
|
|
orders: "createTime desc, id asc",
|
|
orders: "createTime desc, id asc",
|
|
pageSize: 10000
|
|
pageSize: 10000
|
|
@@ -744,11 +744,12 @@
|
|
editeSpaceDetail() {
|
|
editeSpaceDetail() {
|
|
let item = this.curZoneItem.data;
|
|
let item = this.curZoneItem.data;
|
|
let query = {
|
|
let query = {
|
|
- RoomID: item.id,
|
|
|
|
|
|
+ RoomID: item.RoomID,
|
|
zone: this.tab.code,
|
|
zone: this.tab.code,
|
|
isMyTab: 1,
|
|
isMyTab: 1,
|
|
buildFloorSelectd: this.buildFloor
|
|
buildFloorSelectd: this.buildFloor
|
|
}
|
|
}
|
|
|
|
+
|
|
this.$router.push({
|
|
this.$router.push({
|
|
path: "/ledger/spaceDetail",
|
|
path: "/ledger/spaceDetail",
|
|
query: query
|
|
query: query
|
|
@@ -777,8 +778,8 @@
|
|
ObjectType: ObjectType
|
|
ObjectType: ObjectType
|
|
}
|
|
}
|
|
let pa = {
|
|
let pa = {
|
|
- Content: [space],
|
|
|
|
- Projection: ['State']
|
|
|
|
|
|
+ content: [space],
|
|
|
|
+ projection: ['State']
|
|
}
|
|
}
|
|
zoneUpdate(pa, res => {
|
|
zoneUpdate(pa, res => {
|
|
this.curZoneItem.isInfected = false;
|
|
this.curZoneItem.isInfected = false;
|
|
@@ -799,9 +800,9 @@
|
|
let zoneObj = { outline: [], height: 0, state: this.confirmAndSaveFlag ? 0 : this.curZoneItem.isInfected ? 1 : 0 }, IspaceIdList = [];
|
|
let zoneObj = { outline: [], height: 0, state: this.confirmAndSaveFlag ? 0 : this.curZoneItem.isInfected ? 1 : 0 }, IspaceIdList = [];
|
|
// 空间
|
|
// 空间
|
|
selectSpace.map(t => {
|
|
selectSpace.map(t => {
|
|
- zoneObj.outline.push(t.data.outLine);
|
|
|
|
- if (this.BIMIDToSID[t.data.sourceId]) {
|
|
|
|
- IspaceIdList.push(this.BIMIDToSID[t.data.sourceId]);
|
|
|
|
|
|
+ zoneObj.outline.push(t.data.OutLine);
|
|
|
|
+ if (this.BIMIDToSID[t.data.SourceId]) {
|
|
|
|
+ IspaceIdList.push(this.BIMIDToSID[t.data.SourceId]);
|
|
}
|
|
}
|
|
|
|
|
|
// if (t.Height && (zoneObj.Height == 0 || t.Height < zoneObj.Height)) {
|
|
// if (t.Height && (zoneObj.Height == 0 || t.Height < zoneObj.Height)) {
|
|
@@ -842,7 +843,7 @@
|
|
if (!zoneObj.outline.length) {
|
|
if (!zoneObj.outline.length) {
|
|
zoneObj.outline = null;
|
|
zoneObj.outline = null;
|
|
}
|
|
}
|
|
- zoneObj.id = this.curZoneItem.data.id;
|
|
|
|
|
|
+ zoneObj.id = this.curZoneItem.data.RoomID;
|
|
this.updateBSPOutline(zoneObj, IspaceIdList)
|
|
this.updateBSPOutline(zoneObj, IspaceIdList)
|
|
},
|
|
},
|
|
// 根据图批量创建所选业务空间
|
|
// 根据图批量创建所选业务空间
|
|
@@ -1010,7 +1011,7 @@
|
|
if (Spaces.length) {
|
|
if (Spaces.length) {
|
|
let param = {
|
|
let param = {
|
|
data: {
|
|
data: {
|
|
- Content: Spaces
|
|
|
|
|
|
+ content: Spaces
|
|
},
|
|
},
|
|
type: ObjectType
|
|
type: ObjectType
|
|
}
|
|
}
|
|
@@ -1029,13 +1030,12 @@
|
|
groupCreateBSP(spaces) {
|
|
groupCreateBSP(spaces) {
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
spaces = spaces.map(t => {
|
|
spaces = spaces.map(t => {
|
|
- t.ObjectType = ObjectType;
|
|
|
|
- t.BIMLocation = this.getAverageVal(t.Outline);
|
|
|
|
-
|
|
|
|
|
|
+ t.classCode = ObjectType;
|
|
|
|
+ t.bimLocation = this.getAverageVal(t.outline);
|
|
return t;
|
|
return t;
|
|
})
|
|
})
|
|
let pa = {
|
|
let pa = {
|
|
- Content: spaces,
|
|
|
|
|
|
+ content: spaces,
|
|
}
|
|
}
|
|
zoneCreate(pa, res => {
|
|
zoneCreate(pa, res => {
|
|
res.entityList.map(t => {
|
|
res.entityList.map(t => {
|
|
@@ -1052,10 +1052,10 @@
|
|
// 单个创建
|
|
// 单个创建
|
|
createSingleBSP(space, IspaceIdList) {
|
|
createSingleBSP(space, IspaceIdList) {
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
- space.BIMLocation = space.outline ? this.getAverageVal(space.outline) : null;
|
|
|
|
- space.ObjectType = ObjectType;
|
|
|
|
|
|
+ space.bimLocation = space.outline ? this.getAverageVal(space.outline) : null;
|
|
|
|
+ space.classCode = ObjectType;
|
|
let pa = {
|
|
let pa = {
|
|
- Content: [space]
|
|
|
|
|
|
+ content: [space]
|
|
}
|
|
}
|
|
zoneCreate(pa, res => {
|
|
zoneCreate(pa, res => {
|
|
this.relationInBSPandISP(res.entityList[0].id, IspaceIdList)
|
|
this.relationInBSPandISP(res.entityList[0].id, IspaceIdList)
|
|
@@ -1064,13 +1064,13 @@
|
|
// 更新业务空间区域
|
|
// 更新业务空间区域
|
|
updateBSPOutline(zoneObj, IspaceIdList) {
|
|
updateBSPOutline(zoneObj, IspaceIdList) {
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
|
|
- zoneObj.BIMLocation = zoneObj.outline ? this.getAverageVal(zoneObj.outline) : null;
|
|
|
|
- zoneObj.ObjectType = ObjectType;
|
|
|
|
|
|
+ zoneObj.bimLocation = zoneObj.outline ? this.getAverageVal(zoneObj.outline) : null;
|
|
|
|
+ zoneObj.classCode = ObjectType;
|
|
zoneObj.buildingId = this.buildFloor[0];
|
|
zoneObj.buildingId = this.buildFloor[0];
|
|
zoneObj.floorId = this.buildFloor[1];
|
|
zoneObj.floorId = this.buildFloor[1];
|
|
let pa = {
|
|
let pa = {
|
|
- Content: [zoneObj],
|
|
|
|
- Projection: ['BIMLocation', 'ObjectType', 'Outline', 'Height', 'BuildingId', 'FloorId']
|
|
|
|
|
|
+ content: [zoneObj],
|
|
|
|
+ projection: ['bimLocation', 'classCode', 'outline', 'height', 'buildingId', 'floorId']
|
|
}
|
|
}
|
|
zoneUpdate(pa, res => {
|
|
zoneUpdate(pa, res => {
|
|
zoneUpdateOutline(pa, res => { console.log(res) })
|
|
zoneUpdateOutline(pa, res => { console.log(res) })
|
|
@@ -1085,7 +1085,7 @@
|
|
id: zoneObj.floorId,
|
|
id: zoneObj.floorId,
|
|
}]
|
|
}]
|
|
handleZoneUpdateBd(pa, res => {
|
|
handleZoneUpdateBd(pa, res => {
|
|
- this.relationInBSPandISP(zoneObj.id, ispaceIdList)
|
|
|
|
|
|
+ this.relationInBSPandISP(zoneObj.id, IspaceIdList)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 查询未关联平面图的业务空间(项目下+当前分区)
|
|
// 查询未关联平面图的业务空间(项目下+当前分区)
|