[完善]完善证照预警页面

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts

@@ -632,7 +632,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
       data.result = data.result.filter((item) => {
         return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
       })
-      console.log(7894,data.result)
+
       this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
       this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
       this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html

@@ -40,16 +40,25 @@
         </div>
         <div class="search">
             <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
+                <nz-form-item class="searchParams">
+                    <nz-form-control>
+                        <nz-select (ngModelChange)="typeChange1($event)" nzAllowClear formControlName="type"
+                            nzPlaceHolder="请选择类型">
+                            <nz-option nzValue="证照" nzLabel="证照"></nz-option>
+                            <nz-option nzValue="设备" nzLabel="设备"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
                 <nz-form-item class="searchParams searchParamsLong">
                     <nz-form-control>
-                        <nz-select (ngModelChange)="typeChange($event)" nzAllowClear nzAllowClear
-                            formControlName="eventSystemName" nzPlaceHolder="请选择状态">
+                        <nz-select nzAllowClear formControlName="eventSystemName"
+                            nzPlaceHolder="请选择状态">
                             <nz-option *ngFor="let item of eventSystemNameOption" [nzValue]="item.id"
                                 [nzLabel]="item.name"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
-                <nz-form-item class="searchParams searchParamsLongLong eventInput" *ngIf="isListOfData">
+                <nz-form-item class="searchParams searchParamsLong2 eventInput" *ngIf="isListOfData">
                     <nz-form-control>
                         <nz-select [nzMaxTagCount]="1" nzMode="multitagsple" nzAllowClear formControlName="licenseType"
                             nzPlaceHolder="请选择证照类型">

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss

@@ -29,6 +29,10 @@
 
     }
 
+    .searchParamsLong2 {
+      width: 200px;
+    }
+
     .searchParamsLong {
       width: 250px;
     }

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts

@@ -5,13 +5,12 @@ import * as echarts from 'echarts';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import * as moment from 'moment';
 import { fromEvent } from 'rxjs';
-import { debounceTime } from 'rxjs/operators';
+import { debounceTime, filter } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { TreeService } from 'src/app/service/tree.service';
 import { DisposeequipmentComponent } from './disposeequipment/disposeequipment.component';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { GetOutOfLineDetailsComponent } from '../../today-warning/get-out-of-line-details/get-out-of-line-details.component';
-
 @Component({
   selector: 'app-warning-statistics-list',
   templateUrl: './warning-statistics-list.component.html',
@@ -79,6 +78,7 @@ export class WarningStatisticsListComponent implements OnInit {
     let lastD = lw.getDate();
     this.startdate = JSON.parse(JSON.stringify(lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD)));//三十天之前日期
     this.validateForm = this.fb.group({
+      type: null,
       eventSystemName: null,
       organization: [null],
       licenseType: [null],
@@ -127,7 +127,28 @@ export class WarningStatisticsListComponent implements OnInit {
   }
 
   isListOfData = false
-  typeChange(e) {
+  typeChange1(e) {
+    if (e) {
+      if (e == '证照') {
+        this.isListOfData = true
+        this.eventSystemNameOption = [...this.eventSystemNameOptionOfLicense]
+      } else if (e == '设备') {
+        this.isListOfData = false
+        this.validateForm.patchValue({
+          licenseType: []
+        });
+        this.eventSystemNameOption = [...this.eventSystemNameOptionOfEquipment]
+      }
+    } else {
+      this.isListOfData = false
+      this.validateForm.patchValue({
+        licenseType: []
+      });
+      this.eventSystemNameOption = [...this.eventSystemNameOptionOfEquipment, ...this.eventSystemNameOptionOfLicense]
+    }
+  }
+
+  typeChange2(e) {
     if (e) {
       let obj
       this.eventSystemNameOption.forEach(item => {
@@ -135,7 +156,7 @@ export class WarningStatisticsListComponent implements OnInit {
           obj = item
         }
       })
-      if (obj.name == '证照预警') {
+      if (obj.name.indexOf('证照') != -1) {
         this.isListOfData = true
       } else {
         this.isListOfData = false
@@ -380,7 +401,11 @@ export class WarningStatisticsListComponent implements OnInit {
   defaultOrId: string
   //获取所有组织机构
   nodes: any = []
-  eventSystemNameOption = []
+  eventSystemNameOption = [] //最终展示的预警类型
+  eventSystemNameOptionOfEquipment = [] //最终展示的预警类型
+  eventSystemNameOptionOfLicense = [] //最终展示的预警类型
+
+  warningTypes = []//预警类型
   getAllOrganization() {
     let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
     let params = {
@@ -404,16 +429,19 @@ export class WarningStatisticsListComponent implements OnInit {
         datePicker: [this.startdate, this.enddate]
       });
       this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
-        console.log('预警事件', data.result)
-
         data.result.forEach(element => {
-          if (element.violationType == '设备监测' || element.violationType == '证照资质') {
-            this.eventSystemNameOption.push(
+          if (element.violationType == '设备监测') {
+            this.eventSystemNameOptionOfEquipment.push(
+              { id: element.id, name: element.eventSystemName }
+            )
+          }
+          if (element.violationType == '证照资质') {
+            this.eventSystemNameOptionOfLicense.push(
               { id: element.id, name: element.eventSystemName }
             )
           }
         });
-
+        this.eventSystemNameOption = [...this.eventSystemNameOptionOfEquipment, ...this.eventSystemNameOptionOfLicense]
         this.list = []
         this.SkipCount = '0'
         this.getLicenseList()
@@ -433,11 +461,12 @@ export class WarningStatisticsListComponent implements OnInit {
   //获得证照预警
   getLicenseList() {
     this.isLoading = true
+    this.tableSpin = true
     for (const key in this.validateForm.controls) {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
     }
-    this.tableSpin = true
+
     let organizationUnitId
     if (this.router.url.indexOf('petrolStation') != -1) {
       organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id
@@ -448,10 +477,26 @@ export class WarningStatisticsListComponent implements OnInit {
     let ViolationIds = []
     if (this.validateForm.value.eventSystemName) {
       ViolationIds.push(this.validateForm.value.eventSystemName)
-    } else {
-      this.eventSystemNameOption.forEach(element => {
-        ViolationIds.push(element.id)
-      });
+    }
+    if (this.validateForm.value.type && !this.validateForm.value.eventSystemName) {
+      if (this.validateForm.value.type == '证照') {
+        this.eventSystemNameOptionOfLicense.forEach(i => {
+          ViolationIds.push(i.id)
+        })
+      }
+      if (this.validateForm.value.type == '设备') {
+        this.eventSystemNameOptionOfEquipment.forEach(i => {
+          ViolationIds.push(i.id)
+        })
+      }
+    }
+    if (!this.validateForm.value.type && !this.validateForm.value.eventSystemName) {
+      this.eventSystemNameOptionOfLicense.forEach(i => {
+        ViolationIds.push(i.id)
+      })
+      this.eventSystemNameOptionOfEquipment.forEach(i => {
+        ViolationIds.push(i.id)
+      })
     }
     let params = {
       ViolationIds: ViolationIds,
@@ -539,8 +584,8 @@ export class WarningStatisticsListComponent implements OnInit {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
     }
-    // console.log('赋值日期', [this.startdate, this.enddate])
     this.validateForm.patchValue({
+      type: null,
       datePicker: [this.startdate, this.enddate],
       eventSystemName: null,
       licenseType: [],