|
@@ -21,18 +21,18 @@
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
<el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.RoomLocalName||scope.row.RoomName||''}}
|
|
|
+ {{scope.row.localName||scope.row.name||''}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop :label="`所属建筑楼层`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.BuildingId && floorType[scope.row.BuildingId]? ((floorType[scope.row.BuildingId] || '') + (scope.row.FloorId && floorType[scope.row.FloorId] ? (' - ' + floorType[scope.row.FloorId] || '') : '')) : ''}}
|
|
|
+ {{ scope.row.buildingId && floorType[scope.row.buildingId]? ((floorType[scope.row.buildingId] || '') + (scope.row.floorId && floorType[scope.row.floorId] ? (' - ' + floorType[scope.row.floorId] || '') : '')) : ''}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="ObjectType" :label="`空间类型`" show-overflow-tooltip min-width="100">
|
|
|
+ <el-table-column prop="classCode" :label="`空间类型`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- {{spaceType[scope.row.ObjectType] || ''}}
|
|
|
+ {{spaceType[scope.row.classCode] || ''}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
@@ -77,7 +77,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- title: "添加系统所在业务空间",
|
|
|
+ title: "添加竖井所在业务空间",
|
|
|
keycode: "", //输入查询条件
|
|
|
inSpaceType: "业务空间",
|
|
|
Buildfloor: ["all"], // 选中的建筑楼层
|
|
@@ -125,32 +125,32 @@ export default {
|
|
|
getTableData() {
|
|
|
let params = {
|
|
|
data: {
|
|
|
- Filters: "not RoomID isNull",
|
|
|
- Orders: "localName desc",
|
|
|
- PageNumber: this.page.pageNumber,
|
|
|
- PageSize: this.page.pageSize
|
|
|
+ filters: "not id isNull",
|
|
|
+ orders: "localName desc",
|
|
|
+ pageNumber: this.page.pageNumber,
|
|
|
+ pageSize: this.page.pageSize
|
|
|
},
|
|
|
ShaftId: this.$route.query.ShaftId
|
|
|
};
|
|
|
if (this.Buildfloor[0] == "noKnow") {
|
|
|
- params.data.Filters += `;buildingId isNull`;
|
|
|
+ params.data.filters += `;buildingId isNull`;
|
|
|
} else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
|
|
|
- params.data.Filters += `;buildingId='${this.Buildfloor[0]}'`;
|
|
|
+ params.data.filters += `;buildingId='${this.Buildfloor[0]}'`;
|
|
|
}
|
|
|
if (this.Buildfloor[1] == "noKnow") {
|
|
|
- params.data.Filters += `;floorId isNull`;
|
|
|
+ params.data.filters += `;floorId isNull`;
|
|
|
} else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
|
|
|
- params.data.Filters += `;floorId='${this.Buildfloor[1]}'`;
|
|
|
+ params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
|
|
|
}
|
|
|
if (this.Spacecategory) {
|
|
|
- params.data.Filters += `;ObjectType='${this.Spacecategory}'`;
|
|
|
+ params.data.filters += `;classCode='${this.Spacecategory}'`;
|
|
|
}
|
|
|
if (this.keycode != "") {
|
|
|
- params.data.Filters += `;RoomName contain '${this.keycode}' or RoomLocalName contain '${this.keycode}'`;
|
|
|
+ params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}'`;
|
|
|
}
|
|
|
shaftUnlinkSpaceQuery(params, res => {
|
|
|
- this.tableData = res.Content;
|
|
|
- this.page.total = res.Total;
|
|
|
+ this.tableData = res.content;
|
|
|
+ this.page.total = res.total;
|
|
|
});
|
|
|
},
|
|
|
handleClose() {
|
|
@@ -165,9 +165,9 @@ export default {
|
|
|
let params = {
|
|
|
Content: this.selections.map(item => {
|
|
|
return {
|
|
|
- SpaceID: item.RoomID,
|
|
|
- ShaftId: this.$route.query.ShaftId,
|
|
|
- ObjectType: item.ObjectType
|
|
|
+ spaceID: item.id,
|
|
|
+ shaftId: this.$route.query.ShaftId,
|
|
|
+ objectType: item.classCode
|
|
|
};
|
|
|
})
|
|
|
};
|