|
@@ -15,7 +15,7 @@
|
|
|
<el-row style="margin-top:30px;" v-show="spaceShow">
|
|
|
<span class="condition-title">分区类型:</span>
|
|
|
<el-select v-model="zone" filterable size="small" @change="handleChangeZone" style="width:350px;">
|
|
|
- <el-option v-for="item in zoneList" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
|
|
|
+ <el-option v-for="item in zoneList" :key="item.code" :label="item.name" :value="item.code"></el-option>
|
|
|
</el-select>
|
|
|
</el-row>
|
|
|
<el-row style="margin-top:30px;" v-show="spaceShow && zone != 'all' && zone != 'noKnow'">
|
|
@@ -86,7 +86,7 @@ export default {
|
|
|
//获取未关联资产的设备或部件类型
|
|
|
getPartsDieType() {
|
|
|
let _this = this
|
|
|
- TypePartsDie(res => {
|
|
|
+ TypePartsDie(res => {
|
|
|
_this.deviceTypeList = res.content
|
|
|
})
|
|
|
},
|
|
@@ -204,7 +204,7 @@ export default {
|
|
|
//判断是否显示空间分区选择
|
|
|
zoneListIsShow() {
|
|
|
let lastVal = this.buildFloor.slice(-1)[0]
|
|
|
- if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 4) {
|
|
|
+ if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 6) {
|
|
|
this.spaceShow = false
|
|
|
} else {
|
|
|
this.spaceShow = true
|
|
@@ -224,27 +224,27 @@ export default {
|
|
|
let recursionGetData = (pageNum, zone) => {
|
|
|
pageNum = pageNum ? pageNum : 1
|
|
|
let params = {
|
|
|
- Orders: "CreateTime desc, id asc",
|
|
|
- PageNumber: pageNum,
|
|
|
- PageSize: 1000,
|
|
|
- Projection: ["id", "RoomName", "RoomLocalName", "CreateTime"],
|
|
|
- ZoneType: zone
|
|
|
+ orders: "createTime desc, id asc",
|
|
|
+ pageNumber: pageNum,
|
|
|
+ pageSize: 1000,
|
|
|
+ projection: ["id", "name", "localName", "createTime"],
|
|
|
+ zoneType: zone
|
|
|
}
|
|
|
if (this.spaceShow) {
|
|
|
if (this.buildFloor.length == 2 && this.buildFloor[1] != 'all') {
|
|
|
- pa.BuildingId = this.buildFloor[0];
|
|
|
- pa.FloorId = this.buildFloor[1];
|
|
|
+ params.buildingId = this.buildFloor[0];
|
|
|
+ params.floorId = this.buildFloor[1];
|
|
|
} else {
|
|
|
- pa.BuildingId = this.buildFloor[0];
|
|
|
+ params.buildingId = this.buildFloor[0];
|
|
|
}
|
|
|
}
|
|
|
zoneQuery(params, res => {
|
|
|
- nodes = nodes.concat(res.Content.map(item => ({
|
|
|
- value: item.RoomID,
|
|
|
- label: item.RoomLocalName ? item.RoomLocalName : item.RoomName
|
|
|
+ nodes = nodes.concat(res.content.map(item => ({
|
|
|
+ value: item.id,
|
|
|
+ label: item.localName ? item.localName : item.name
|
|
|
})))
|
|
|
- if (res.Total / (res.PageSize * res.PageNumber) > 1) {
|
|
|
- recursionGetData(res.PageNumber + 1, zone)
|
|
|
+ if (res.total / (res.pageSize * res.pageNumber) > 1) {
|
|
|
+ recursionGetData(res.pageNumber + 1, zone)
|
|
|
} else {
|
|
|
this.spaceList = nodes
|
|
|
}
|