|
@@ -396,11 +396,12 @@ export default {
|
|
|
PageNumber: this.rPage.pageNumber,
|
|
|
PageSize: this.rPage.pageSize,
|
|
|
Cascade: [{ Name: 'building' }, { Name: 'floor' }, { Name: 'zoneName' }],
|
|
|
- Filters: 'not RoomID isNull'
|
|
|
+ Filters: 'not RoomID isNull',
|
|
|
+ ZoneTypeList: []
|
|
|
};
|
|
|
//处理查询条件
|
|
|
if (this.form.SubTypeName.length) {
|
|
|
- pa.Filters += `;ObjectType in ${JSON.stringify(this.form.SubTypeName)}`
|
|
|
+ pa.ZoneTypeList = this.form.SubTypeName
|
|
|
}
|
|
|
if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
|
|
|
pa.Filters += `;RoomLocalName contain "${this.form.ObjectLocalName}"`;
|