|
@@ -51,7 +51,7 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div style="position: absolute;right: 0;">
|
|
<div style="position: absolute;right: 0;">
|
|
- <el-button type="text" @click="lookUnrelatBSpace(false)">未关联平面图的业务空间 {{num}} 条</el-button>
|
|
|
|
|
|
+ <el-button type="text" @click="lookUnrelatBSpace(false)">未关联平面图的业务空间 {{BSPUnrelaISPList.length}} 条</el-button>
|
|
</div>
|
|
</div>
|
|
</el-row>
|
|
</el-row>
|
|
<!-- 底部操作按钮 -->
|
|
<!-- 底部操作按钮 -->
|
|
@@ -92,7 +92,7 @@ import { FloorView } from "@saga-web/cad-engine/lib/FloorView";
|
|
import unRelateBSP from "./unRelateBSP";
|
|
import unRelateBSP from "./unRelateBSP";
|
|
import createBSP from "./createBSP";
|
|
import createBSP from "./createBSP";
|
|
import {
|
|
import {
|
|
- countZone,
|
|
|
|
|
|
+ buildingQuery,
|
|
queryZone,
|
|
queryZone,
|
|
updateZone,
|
|
updateZone,
|
|
createZone,
|
|
createZone,
|
|
@@ -125,7 +125,6 @@ export default {
|
|
canvasHeight: 600,
|
|
canvasHeight: 600,
|
|
type: 1, // 默认操作模式
|
|
type: 1, // 默认操作模式
|
|
search: '',//搜索
|
|
search: '',//搜索
|
|
- num: 0, // 未关联空间的业务空间条数
|
|
|
|
buildFloor: ['', ''],
|
|
buildFloor: ['', ''],
|
|
FloorObj: {}, //楼层对象
|
|
FloorObj: {}, //楼层对象
|
|
FloorMap: '', //楼层底图
|
|
FloorMap: '', //楼层底图
|
|
@@ -178,12 +177,12 @@ export default {
|
|
// 业务空间
|
|
// 业务空间
|
|
this.getBusinessSpace();
|
|
this.getBusinessSpace();
|
|
}
|
|
}
|
|
- // 获取未关联平面图的业务空间统计
|
|
|
|
- this.getUnrelateCount();
|
|
|
|
// 获取当前楼层的元空间
|
|
// 获取当前楼层的元空间
|
|
this.getFloorISpace();
|
|
this.getFloorISpace();
|
|
// 查询未关联业务空间的元空间
|
|
// 查询未关联业务空间的元空间
|
|
- this.getISPSPUnrelaBSP()
|
|
|
|
|
|
+ this.getISPSPUnrelaBSP();
|
|
|
|
+ // 查询未关联平面图的业务空间
|
|
|
|
+ this.getBSPunrelaISP();
|
|
},
|
|
},
|
|
// 获取当前楼层的元空间
|
|
// 获取当前楼层的元空间
|
|
getFloorISpace() {
|
|
getFloorISpace() {
|
|
@@ -239,18 +238,6 @@ export default {
|
|
console.log(arguments)
|
|
console.log(arguments)
|
|
this.init(initType);
|
|
this.init(initType);
|
|
},
|
|
},
|
|
- // 获取未关联平面图的业务空间统计
|
|
|
|
- getUnrelateCount() {
|
|
|
|
- let pa = {
|
|
|
|
- data: {
|
|
|
|
- Filters: `BuildingId='${this.buildFloor[0]}';FloorId='${this.buildFloor[1]}';Outline isNull`
|
|
|
|
- },
|
|
|
|
- zone: this.tab.code
|
|
|
|
- }
|
|
|
|
- countZone(pa, res => {
|
|
|
|
- this.num = res.Count
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
// 获取未绑定业务空间的元空间
|
|
// 获取未绑定业务空间的元空间
|
|
getISPSPUnrelaBSP() {
|
|
getISPSPUnrelaBSP() {
|
|
let pa = {
|
|
let pa = {
|
|
@@ -320,15 +307,11 @@ export default {
|
|
queryZone(pa, res => {
|
|
queryZone(pa, res => {
|
|
// 所有业务空间
|
|
// 所有业务空间
|
|
this.businessSpaceList = res.Content;
|
|
this.businessSpaceList = res.Content;
|
|
- // 未关联元空间的业务空间
|
|
|
|
- this.BSPUnrelaISPList = [];
|
|
|
|
// 已关联元空间的业务空间
|
|
// 已关联元空间的业务空间
|
|
this.BSPRelaISPList = [];
|
|
this.BSPRelaISPList = [];
|
|
res.Content.map(t => {
|
|
res.Content.map(t => {
|
|
if (t.Outline && t.Outline.length) {
|
|
if (t.Outline && t.Outline.length) {
|
|
this.BSPRelaISPList.push(t)
|
|
this.BSPRelaISPList.push(t)
|
|
- } else {
|
|
|
|
- this.BSPUnrelaISPList.push(t)
|
|
|
|
}
|
|
}
|
|
})
|
|
})
|
|
// 绘制业务空间
|
|
// 绘制业务空间
|
|
@@ -393,7 +376,7 @@ export default {
|
|
if (this.groupCreateType == 1) {
|
|
if (this.groupCreateType == 1) {
|
|
this.groupCreateBSpace()
|
|
this.groupCreateBSpace()
|
|
} else if (this.groupCreateType == 2) {
|
|
} else if (this.groupCreateType == 2) {
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 批量创建业务空间
|
|
// 批量创建业务空间
|
|
@@ -583,6 +566,47 @@ export default {
|
|
this.init(2);
|
|
this.init(2);
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 查询未关联平面图的业务空间(项目下+当前分区)
|
|
|
|
+ getBSPunrelaISP() {
|
|
|
|
+ let pa1 = {
|
|
|
|
+ Cascade: [{ name: 'floor', Orders: 'SequenceId desc' }],
|
|
|
|
+ Orders: "BuildLocalName asc",
|
|
|
|
+ }
|
|
|
|
+ let p1 = new Promise((resolve, reject) => {
|
|
|
|
+ buildingQuery(pa1, res => {
|
|
|
|
+ resolve(res);
|
|
|
|
+ })
|
|
|
|
+ })
|
|
|
|
+ let pa2 = {
|
|
|
|
+ zone: this.tab.code,
|
|
|
|
+ data: {
|
|
|
|
+ Filters: `Outline isNull`,
|
|
|
|
+ Orders: "createTime desc, RoomID asc",
|
|
|
|
+ PageSize: 1000
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ let p2 = new Promise((resolve, reject) => {
|
|
|
|
+ queryZone(pa2, res => {
|
|
|
|
+ resolve(res);
|
|
|
|
+ })
|
|
|
|
+ })
|
|
|
|
+ Promise.all([p1, p2]).then(val => {
|
|
|
|
+ let bfData = {}
|
|
|
|
+ val[0].Content.map(t => {
|
|
|
|
+ bfData[t.BuildID] = t.BuildLocalName || t.BuildName;
|
|
|
|
+ if (t.Floor) {
|
|
|
|
+ t.Floor.map(item => {
|
|
|
|
+ bfData[item.FloorID] = item.FloorLocalName || item.FloorName;
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ this.BSPUnrelaISPList = val[1].Content.map(t => {
|
|
|
|
+ t.BuildingName = bfData[t.BuildingId];
|
|
|
|
+ t.FloorName = bfData[t.FloorId];
|
|
|
|
+ return t;
|
|
|
|
+ });
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// canvas 获取焦点
|
|
// canvas 获取焦点
|
|
focus() {
|
|
focus() {
|
|
document.getElementById(`floorCanvas`).focus()
|
|
document.getElementById(`floorCanvas`).focus()
|