|
@@ -36,7 +36,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="Datasource" label="平面图">
|
|
<el-table-column prop="Datasource" label="平面图">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <p v-if="scope.row.type==1">
|
|
|
|
|
|
+ <p v-if="scope.row.StructureInfo&&scope.row.StructureInfo.FloorMap">
|
|
<i class="iconfont icon-floorplan"></i>
|
|
<i class="iconfont icon-floorplan"></i>
|
|
查看平面图
|
|
查看平面图
|
|
</p>
|
|
</p>
|
|
@@ -54,7 +54,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="SubTypeName" label="楼层贯通关系">
|
|
<el-table-column prop="SubTypeName" label="楼层贯通关系">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span style="margin-right:20px">{{scope.row.EquipmentMark}}</span>
|
|
|
|
|
|
+ <span style="margin-right:20px">{{scope.row.FloorThroughList?scope.row.FloorThroughList.length:0}}</span>
|
|
<el-button size="mini" @click="changeConnection(scope.row)" plain icon="el-icon-edit-outline"></el-button>
|
|
<el-button size="mini" @click="changeConnection(scope.row)" plain icon="el-icon-edit-outline"></el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -84,7 +84,7 @@
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
<!-- 添加贯通关系弹窗 -->
|
|
<!-- 添加贯通关系弹窗 -->
|
|
- <addConnectivity ref="addConnectivity"></addConnectivity>
|
|
|
|
|
|
+ <addConnectivity ref="addConnectivity" @refresh="refresh"></addConnectivity>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -184,6 +184,7 @@ export default {
|
|
// 获取列表
|
|
// 获取列表
|
|
getFloorTableData() {
|
|
getFloorTableData() {
|
|
let floorParam = {
|
|
let floorParam = {
|
|
|
|
+ Cascade: [{ Name: 'floorThroughList' }],
|
|
Orders: "FloorSequenceID desc",
|
|
Orders: "FloorSequenceID desc",
|
|
PageNumber: this.page.pageNumber,
|
|
PageNumber: this.page.pageNumber,
|
|
PageSize: this.page.pageSize,
|
|
PageSize: this.page.pageSize,
|
|
@@ -194,8 +195,8 @@ export default {
|
|
this.page.total = res.Total
|
|
this.page.total = res.Total
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- // 创建楼层成功
|
|
|
|
- refresh(){
|
|
|
|
|
|
+ // 创建楼层成功-修改关系成功
|
|
|
|
+ refresh() {
|
|
this.getFloorTableData()
|
|
this.getFloorTableData()
|
|
},
|
|
},
|
|
// 确认删除(删除建筑-楼层公用)
|
|
// 确认删除(删除建筑-楼层公用)
|
|
@@ -210,15 +211,14 @@ export default {
|
|
} else {
|
|
} else {
|
|
//todo
|
|
//todo
|
|
}
|
|
}
|
|
-
|
|
|
|
},
|
|
},
|
|
// 修改楼层信息
|
|
// 修改楼层信息
|
|
- editFloorData(floor){
|
|
|
|
|
|
+ editFloorData(floor) {
|
|
this.curFloorId = floor.FloorID;
|
|
this.curFloorId = floor.FloorID;
|
|
this.$refs.addFloorDialog.showDialog(floor)
|
|
this.$refs.addFloorDialog.showDialog(floor)
|
|
},
|
|
},
|
|
// 修改楼层贯通关系
|
|
// 修改楼层贯通关系
|
|
- changeConnection(row){
|
|
|
|
|
|
+ changeConnection(row) {
|
|
this.$refs.addConnectivity.showDialog()
|
|
this.$refs.addConnectivity.showDialog()
|
|
this.$refs.addConnectivity.floor = row
|
|
this.$refs.addConnectivity.floor = row
|
|
}
|
|
}
|