|
@@ -32,39 +32,59 @@
|
|
<div v-for="(item, key) in versionData.createData" :key="'CL'+key">
|
|
<div v-for="(item, key) in versionData.createData" :key="'CL'+key">
|
|
<p>【{{ mapType[key] }}】</p>
|
|
<p>【{{ mapType[key] }}】</p>
|
|
<p v-for="(obj, i) in item" :key="obj.Id">
|
|
<p v-for="(obj, i) in item" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{ obj.LocalId || "无" }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{
|
|
|
|
+ obj.FloorName || "无"
|
|
|
|
+ }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{
|
|
|
|
+ obj.LocalId || "无"
|
|
|
|
+ }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
|
|
</div>
|
|
</div>
|
|
<!-- 删除设备 -->
|
|
<!-- 删除设备 -->
|
|
<el-divider v-if="Object.keys(versionData.deleteData).length">删除设备</el-divider>
|
|
<el-divider v-if="Object.keys(versionData.deleteData).length">删除设备</el-divider>
|
|
<div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
|
|
<div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
|
|
<p>【{{ mapType[key] }}】</p>
|
|
<p>【{{ mapType[key] }}】</p>
|
|
<p v-for="(obj, i) in item" :key="obj.Id">
|
|
<p v-for="(obj, i) in item" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{ obj.LocalId || "无" }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{
|
|
|
|
+ obj.FloorName || "无"
|
|
|
|
+ }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{
|
|
|
|
+ obj.LocalId || "无"
|
|
|
|
+ }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
|
|
</div>
|
|
</div>
|
|
<!-- 新增实体墙 -->
|
|
<!-- 新增实体墙 -->
|
|
<el-divider v-if="versionData.createWall.length">新增实体墙</el-divider>
|
|
<el-divider v-if="versionData.createWall.length">新增实体墙</el-divider>
|
|
<p v-for="(obj, i) in versionData.createWall" :key="obj.Id">
|
|
<p v-for="(obj, i) in versionData.createWall" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
|
|
|
|
+ obj.ObjId || "无"
|
|
|
|
+ }}】;</p>
|
|
<!-- 删除实体墙 -->
|
|
<!-- 删除实体墙 -->
|
|
<el-divider v-if="versionData.deleteWall.length">删除实体墙</el-divider>
|
|
<el-divider v-if="versionData.deleteWall.length">删除实体墙</el-divider>
|
|
<p v-for="(obj, i) in versionData.deleteWall" :key="obj.Id">
|
|
<p v-for="(obj, i) in versionData.deleteWall" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
|
|
|
|
+ obj.ObjId || "无"
|
|
|
|
+ }}】;</p>
|
|
<!-- 新增虚拟墙 -->
|
|
<!-- 新增虚拟墙 -->
|
|
<el-divider v-if="versionData.createVirtualWall.length">新增虚拟墙</el-divider>
|
|
<el-divider v-if="versionData.createVirtualWall.length">新增虚拟墙</el-divider>
|
|
<p v-for="(obj, i) in versionData.createVirtualWall" :key="obj.Id">
|
|
<p v-for="(obj, i) in versionData.createVirtualWall" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
|
|
|
|
+ obj.ObjId || "无"
|
|
|
|
+ }}】;</p>
|
|
<!-- 删除虚拟墙 -->
|
|
<!-- 删除虚拟墙 -->
|
|
<el-divider v-if="versionData.deleteVirtualWall.length">删除虚拟墙</el-divider>
|
|
<el-divider v-if="versionData.deleteVirtualWall.length">删除虚拟墙</el-divider>
|
|
<p v-for="(obj, i) in versionData.deleteVirtualWall" :key="obj.Id">
|
|
<p v-for="(obj, i) in versionData.deleteVirtualWall" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
|
|
|
|
+ obj.ObjId || "无"
|
|
|
|
+ }}】;</p>
|
|
<!-- 新增柱体 -->
|
|
<!-- 新增柱体 -->
|
|
<el-divider v-if="versionData.createColumn.length">新增柱体</el-divider>
|
|
<el-divider v-if="versionData.createColumn.length">新增柱体</el-divider>
|
|
<p v-for="(obj, i) in versionData.createColumn" :key="obj.Id">
|
|
<p v-for="(obj, i) in versionData.createColumn" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
|
|
|
|
+ obj.ObjId || "无"
|
|
|
|
+ }}】;</p>
|
|
<!-- 删除柱体 -->
|
|
<!-- 删除柱体 -->
|
|
<el-divider v-if="versionData.deleteColumn.length">删除柱体</el-divider>
|
|
<el-divider v-if="versionData.deleteColumn.length">删除柱体</el-divider>
|
|
<p v-for="(obj, i) in versionData.deleteColumn" :key="obj.Id">
|
|
<p v-for="(obj, i) in versionData.deleteColumn" :key="obj.Id">
|
|
- 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
|
|
|
|
|
|
+ 【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
|
|
|
|
+ obj.ObjId || "无"
|
|
|
|
+ }}】;</p>
|
|
</div>
|
|
</div>
|
|
<div v-else>
|
|
<div v-else>
|
|
<div
|
|
<div
|
|
@@ -86,6 +106,7 @@
|
|
import { mapGetters } from "vuex";
|
|
import { mapGetters } from "vuex";
|
|
import { querySyncLogCount } from "@/api/model/file.js";
|
|
import { querySyncLogCount } from "@/api/model/file.js";
|
|
import { getAllEqPaType } from "@/api/scan/request";
|
|
import { getAllEqPaType } from "@/api/scan/request";
|
|
|
|
+import { queryPhysicsAllType } from "@/api/dict";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
components: {},
|
|
components: {},
|
|
@@ -146,15 +167,18 @@ export default {
|
|
})
|
|
})
|
|
})
|
|
})
|
|
let promise2 = new Promise((resolve, reject) => {
|
|
let promise2 = new Promise((resolve, reject) => {
|
|
- getAllEqPaType({ PageNumber: 1, PageSize: 1000, }, res => {
|
|
|
|
|
|
+ // getAllEqPaType({ PageNumber: 1, PageSize: 1000, }, res => {
|
|
|
|
+ // resolve(res)
|
|
|
|
+ // })
|
|
|
|
+ queryPhysicsAllType({ type: 'equipmentAndComponent' }, res => {
|
|
resolve(res)
|
|
resolve(res)
|
|
})
|
|
})
|
|
})
|
|
})
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
- let typeList = values[1].Content;
|
|
|
|
this.logData = values[0].Content;
|
|
this.logData = values[0].Content;
|
|
|
|
+ let typeList = values[1].Content;
|
|
typeList.forEach(item => {
|
|
typeList.forEach(item => {
|
|
- this.mapType[item.Code] = item.Name;
|
|
|
|
|
|
+ this.mapType[item.code] = item.name;
|
|
});
|
|
});
|
|
console.log(this.mapType);
|
|
console.log(this.mapType);
|
|
if (values[0].Total / (values[0].PageSize * values[0].PageNumber) > 1) {
|
|
if (values[0].Total / (values[0].PageSize * values[0].PageNumber) > 1) {
|