|
@@ -406,10 +406,18 @@ export default {
|
|
|
pa.Filters += `;RoomLocalName contain "${this.form.ObjectLocalName}"`;
|
|
|
}
|
|
|
if (this.form.locationVal.length > 0) {
|
|
|
- pa.Filters += `;BuildingId="${this.form.locationVal[0]}"`;
|
|
|
+ if (this.form.locationVal[0] == "unknowBuild") {
|
|
|
+ pa.BuildingId = 'isnull';
|
|
|
+ } else {
|
|
|
+ pa.BuildingId = this.form.locationVal[0];
|
|
|
+ }
|
|
|
}
|
|
|
if (this.form.locationVal.length > 1) {
|
|
|
- pa.Filters += `;FloorId="${this.form.locationVal[1]}"`;
|
|
|
+ if (this.form.locationVal[1] == "unknowFloor") {
|
|
|
+ pa.FloorId = 'isnull';
|
|
|
+ } else {
|
|
|
+ pa.FloorId = this.form.locationVal[1];
|
|
|
+ }
|
|
|
}
|
|
|
let pa2 = {
|
|
|
Filters: `TypeName='${this.typeName}'`
|