优化

src/app/views/inspection-address/inspection-address.component.ts

@@ -376,7 +376,7 @@ export class InspectionAddressComponent implements OnInit {
 
       if(this.deptDto && this.deptDto.floor){
         this.noChangeBuilding = true;
-        this.getFloors('add', '', this.deptDto.building.id);
+        this.getFloors('add', '', this.deptDto.building.id, false, true);
       }
     }
   }
@@ -394,7 +394,8 @@ export class InspectionAddressComponent implements OnInit {
 
   // 获取楼层
   floorList: any = [];
-  getFloors(type, keyword, buildId, init = false) {
+  getFloors(type, keyword, buildId, init = false, isNoChangeBuilding = false) {
+    console.log(isNoChangeBuilding)
     if(!buildId){
       this.floorList = [];
       return;
@@ -421,7 +422,7 @@ export class InspectionAddressComponent implements OnInit {
             this.floorList.unshift(this.coopData.floorDTO)
           }
           this.validateForm.controls.floorId.setValue(this.coopData.floorDTO.id);
-        } else if (this.deptDto && this.deptDto.floor){
+        } else if (isNoChangeBuilding && this.deptDto && this.deptDto.floor){
           let floorId = this.deptDto.floor.id;
           let flag = this.floorList.some(v => v.id == floorId);
           if(!flag){
@@ -578,7 +579,7 @@ export class InspectionAddressComponent implements OnInit {
 
     if(data.floorId){
       this.noChangeBuilding = true;
-      this.getFloors('add', '', data.buildId, true);
+      this.getFloors('add', '', data.buildId, true, true);
     }
   }
 

src/app/views/inspection-execute/inspection-execute.component.html

@@ -41,6 +41,17 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">是否异常</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择" [(ngModel)]="searchDto.exceptionId">
+            <ng-container *ngFor="let option of exceptionList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzLg="8" class="list-template__btns">
         <button nz-button *ngIf="coopBtns.del" [disabled]="!checkedDepIds.length" class="btn default" (click)="showDelModal(data,'您确认要删除选中的巡检任务吗？','删除','delList')">批量删除</button>

src/app/views/inspection-execute/inspection-execute.component.ts

@@ -172,6 +172,7 @@ export class InspectionExecuteComponent implements OnInit {
         inspectionId: this.searchDto.inspectionId || undefined,
         batchId: this.searchDto.batchId || undefined,
         status: this.searchDto.statusId ? { id: this.searchDto.statusId } : undefined,
+        exception: this.searchDto.exceptionId === undefined ? undefined : this.searchDto.exceptionId,
       },
     };
     this.mapOfCheckedId = {};
@@ -254,6 +255,12 @@ export class InspectionExecuteComponent implements OnInit {
     });
   }
 
+  // 是否异常
+  exceptionList:any[] = [
+    { id: 0, name: "否" },
+    { id: 1, name: "是" },
+  ];
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;