|
@@ -137,7 +137,7 @@ export default {
|
|
let promise1 = new Promise((resolve, reject) => {
|
|
let promise1 = new Promise((resolve, reject) => {
|
|
let params = {
|
|
let params = {
|
|
data: {
|
|
data: {
|
|
- filters: `not id isNull;objectType = '${this.space}';buildingId = '${this.buildingData[0]}';floorId = '${this.buildingData[1]}'`,
|
|
|
|
|
|
+ filters: `not id isNull;classCode='${this.space}';buildingId='${this.buildingData[0]}';floorId='${this.buildingData[1]}'`,
|
|
Orders: "localName desc"
|
|
Orders: "localName desc"
|
|
},
|
|
},
|
|
ShaftId: this.$route.query.ShaftId
|
|
ShaftId: this.$route.query.ShaftId
|
|
@@ -162,28 +162,28 @@ export default {
|
|
})
|
|
})
|
|
})
|
|
})
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
- let relatedZone = values[0].Content;
|
|
|
|
- let zoneData = values[1].Content;
|
|
|
|
|
|
+ let relatedZone = values[0].content;
|
|
|
|
+ let zoneData = values[1].content;
|
|
this.relatedSpaceIdList = [];
|
|
this.relatedSpaceIdList = [];
|
|
relatedZone.map(item => {
|
|
relatedZone.map(item => {
|
|
- this.relatedSpaceIdList.push(item.RoomID);
|
|
|
|
|
|
+ this.relatedSpaceIdList.push(item.id);
|
|
})
|
|
})
|
|
// 所有业务空间
|
|
// 所有业务空间
|
|
this.businessSpaceList = zoneData;
|
|
this.businessSpaceList = zoneData;
|
|
// 已关联元空间的业务空间
|
|
// 已关联元空间的业务空间
|
|
this.BSPRelaISPList = [];
|
|
this.BSPRelaISPList = [];
|
|
zoneData.map(t => {
|
|
zoneData.map(t => {
|
|
- if (t.Outline && t.Outline.length) {
|
|
|
|
|
|
+ if (t.outline && t.outline.length) {
|
|
this.BSPRelaISPList.push(t)
|
|
this.BSPRelaISPList.push(t)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
// 绘制业务空间
|
|
// 绘制业务空间
|
|
let tempArr = this.BSPRelaISPList.map((t, i) => {
|
|
let tempArr = this.BSPRelaISPList.map((t, i) => {
|
|
- if (t.FloorId == this.buildingData[1] && t.ObjectType == this.space) {
|
|
|
|
|
|
+ if (t.floorId == this.buildingData[1] && t.classCode == this.space) {
|
|
return {
|
|
return {
|
|
- RoomLocalName: t.RoomLocalName,
|
|
|
|
- OutLine: t.Outline,
|
|
|
|
- RoomID: t.RoomID,
|
|
|
|
|
|
+ RoomLocalName: t.localName,
|
|
|
|
+ OutLine: t.outline,
|
|
|
|
+ RoomID: t.id,
|
|
Color: colorArr[i % colorArr.length],
|
|
Color: colorArr[i % colorArr.length],
|
|
HighLightFlag: relatedZone.findIndex((item) => (item.RoomID == t.RoomID)) > -1,
|
|
HighLightFlag: relatedZone.findIndex((item) => (item.RoomID == t.RoomID)) > -1,
|
|
Transparency: relatedZone.findIndex((item) => (item.RoomID == t.RoomID)) > -1 ? 20 : 1
|
|
Transparency: relatedZone.findIndex((item) => (item.RoomID == t.RoomID)) > -1 ? 20 : 1
|
|
@@ -239,15 +239,15 @@ export default {
|
|
saveEdit() {
|
|
saveEdit() {
|
|
let arr = this.scene.getSelectedZone();
|
|
let arr = this.scene.getSelectedZone();
|
|
let param = {
|
|
let param = {
|
|
- BuildingId: this.buildingData[0],
|
|
|
|
- FloorId: this.buildingData[1],
|
|
|
|
- Type: this.space,
|
|
|
|
|
|
+ buildingId: this.buildingData[0],
|
|
|
|
+ floorId: this.buildingData[1],
|
|
|
|
+ type: this.space,
|
|
data: {
|
|
data: {
|
|
- ShaftId: this.$route.query.ShaftId,
|
|
|
|
- SpaceIdList: []
|
|
|
|
|
|
+ shaftId: this.$route.query.ShaftId,
|
|
|
|
+ spaceIdList: []
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- param.data.SpaceIdList = arr.map(t => {
|
|
|
|
|
|
+ param.data.spaceIdList = arr.map(t => {
|
|
return t.data.RoomID;
|
|
return t.data.RoomID;
|
|
})
|
|
})
|
|
shaftZoneLinkReplace(param, res => {
|
|
shaftZoneLinkReplace(param, res => {
|