|
@@ -374,13 +374,15 @@ export default class spaceIndex extends Vue {
|
|
|
pageNumber: 1,
|
|
|
pageSize: 1000,
|
|
|
};
|
|
|
+ let zoneTypeValue = this.zoneTypeValue[this.zoneTypeValue.length - 1]
|
|
|
let param2 = {
|
|
|
// 级联查建筑楼层信息
|
|
|
cascade: [
|
|
|
{name: "building"},
|
|
|
{name: "floor", orders: "floorSequenceId desc"},
|
|
|
],
|
|
|
- classCode: this.zoneTypeValue[this.zoneTypeValue.length - 1],
|
|
|
+ // classCode: this.zoneTypeValue[this.zoneTypeValue.length - 1],
|
|
|
+ // filters: `classCode='${this.zoneTypeValue[this.zoneTypeValue.length - 1]}'`,
|
|
|
pageNumber: this.paginationList.page,
|
|
|
pageSize: this.paginationList.size,
|
|
|
orders: "createTime desc, localName asc, localId desc, id asc",
|
|
@@ -390,27 +392,29 @@ export default class spaceIndex extends Vue {
|
|
|
param2.filters = "";
|
|
|
switch (this.building[0]) {
|
|
|
case "noKnow":
|
|
|
- param2.filters = `buildingId='isnull'${search}`;
|
|
|
+ param2.filters = `buildingId='isnull'${search};classCode='${zoneTypeValue}'`;
|
|
|
break;
|
|
|
case "all":
|
|
|
if (this.inputSearch) {
|
|
|
- param2.filters = `localName contain '${this.inputSearch}' or localId contain '${this.inputSearch}'`
|
|
|
+ param2.filters = `localName contain '${this.inputSearch}' or localId contain '${this.inputSearch}';classCode='${zoneTypeValue}'`
|
|
|
} else {
|
|
|
- delete param2.filters;
|
|
|
+ param2.filters = `classCode='${zoneTypeValue}'`;
|
|
|
+
|
|
|
+ // delete param2.filters;
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
} else if (this.building.length === 2) {
|
|
|
switch (this.building[1]) {
|
|
|
case "noKnow":
|
|
|
- param2.filters = `buildingId='${this.building[0]}';floorId='isnull'${search}`;
|
|
|
+ param2.filters = `buildingId='${this.building[0]}';floorId='isnull'${search};classCode='${zoneTypeValue}'`;
|
|
|
|
|
|
break;
|
|
|
case "all":
|
|
|
- param2.filters = `buildingId='${this.building[0]}'${search}`;
|
|
|
+ param2.filters = `buildingId='${this.building[0]}'${search};classCode='${zoneTypeValue}'`;
|
|
|
break;
|
|
|
default:
|
|
|
- param2.filters = `buildingId='${this.building[0]}';floorId='${this.building[1]}'${search}`;
|
|
|
+ param2.filters = `buildingId='${this.building[0]}';floorId='${this.building[1]}'${search};classCode='${zoneTypeValue}'`;
|
|
|
}
|
|
|
}
|
|
|
|