Bladeren bron

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

zhangyu 4 jaren geleden
bovenliggende
commit
744ba427a4
1 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 3 2
      src/views/point/dynamicdata/addRelation/spaceRela/index.vue

+ 3 - 2
src/views/point/dynamicdata/addRelation/spaceRela/index.vue

@@ -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}"`;