From 425aff51c0e6a05505541b3d9225ab960507bf93 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 15 Aug 2022 09:55:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=BE=85=E5=8A=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5;=E8=AF=81=E7=85=A7=E8=AE=B0=E5=BD=95=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../audit/audit-ing/audit-ing.component.html  |  6 +++--
 .../audit-record/audit-record.component.html  |  6 +++--
 .../audit-record/audit-record.component.ts    | 24 +++++++++++++++++++
 .../criminal-records-admin.component.html     |  2 +-
 .../criminal-records.component.html           |  2 +-
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.html b/src/app/pages/audit/audit-ing/audit-ing.component.html
index 7da6832..e3fb3ac 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.html
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.html
@@ -11,7 +11,8 @@
                     <th *ngIf="level != 1 ">油站名称</th>
                     <th [nzWidth]="'16%'" *ngIf="level != 1 ">区域名称</th>
                     <th>公司名称</th>
-                    <!-- <th>提交时间</th> -->
+                    <th>申请人</th>
+                    <th>提交时间</th>
                     <th>审批状态</th>
                     <th>审批</th>
                 </tr>
@@ -38,7 +39,8 @@
                             <label>{{item.organization ? item.organization.displayName : null}}</label>
                         </ng-template>
                     </td>
-                    <!-- <td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }}</td> -->
+                    <td><span *ngIf="item.creatorUser">{{item.creatorUser.name || ''}}</span></td>
+                    <td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }}</td>
                     <td>{{item.auditStatusDesc}}</td>
                     <td class="operation">
                         <span class="blueColor" (click)="dispose(item)">审批</span>
diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html
index c203f21..fe3732c 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -10,6 +10,7 @@
                         <nz-option *ngIf="!level" nzValue="2" nzLabel="经营类证照"></nz-option>
                         <nz-option *ngIf="!level" nzValue="3" nzLabel="资产类证照"></nz-option>
                         <nz-option *ngIf="level" nzValue="4" nzLabel="用户信息"></nz-option>
+                        <nz-option *ngIf="level" nzValue="5" nzLabel="预警申诉"></nz-option>
                     </nz-select>
                 </nz-form-control>
             </nz-form-item>
@@ -17,8 +18,9 @@
             <nz-form-item class="searchParams searchParamsLong">
                 <nz-form-control>
                     <nz-select nzAllowClear formControlName="type" nzPlaceHolder="审批类型" [nzLoading]="typeLoading">
-                        <nz-option *ngFor="let item of typeList" [nzValue]="item.licenseName"
-                            [nzLabel]="item.licenseName"></nz-option>
+                        <nz-option *ngFor="let item of typeList"
+                            [nzValue]="item.licenseName ? item.licenseName : item.eventSystemName"
+                            [nzLabel]="item.licenseName ? item.licenseName : item.eventSystemName"></nz-option>
                     </nz-select>
                 </nz-form-control>
             </nz-form-item>
diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts
index 5d40445..8bb2b8c 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -61,6 +61,9 @@ export class AuditRecordComponent implements OnInit {
     this.getTypeList()
     await this.getAllOrganization()
     this.getRecordList()
+
+
+    this.warningType()
   }
 
   ngOnDestroy(): void {
@@ -165,6 +168,25 @@ export class AuditRecordComponent implements OnInit {
 
     })
   }
+
+  warningTypesDetails
+  warningTypesDetailsCopy
+  //获得所有预警事件
+  warningType() {
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+
+      data.result = data.result.filter((item) => {
+        return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
+      })
+
+      this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
+      this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
+      // console.log('所有预警事件', this.warningTypesDetailsCopy)
+    })
+  }
+
+
+
   infoChange(e) {
     if (e == '0') {
       this.typeList = this.typeListOfStationData
@@ -176,6 +198,8 @@ export class AuditRecordComponent implements OnInit {
       this.typeList = this.typeListOfFile
     } else if (e == '4') {
       this.typeList = this.typeListOfUsers
+    } else if (e == '5') {
+      this.typeList = [...this.warningTypesDetailsCopy]
     } else {
       this.typeList = [...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile]
     }
diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
index 9755e64..9a4be5f 100644
--- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
@@ -120,7 +120,7 @@
           </nz-form-control>
         </nz-form-item>
 
-        <nz-form-item class="searchParams">
+        <nz-form-item class="searchParams" [hidden]="!isMisinformation">
           <nz-form-control>
             <nz-select nzAllowClear formControlName="appealState" nzPlaceHolder="申诉状态">
               <nz-option nzValue="0" nzLabel="未申诉"></nz-option>
diff --git a/src/app/pages/records/criminal-records/criminal-records.component.html b/src/app/pages/records/criminal-records/criminal-records.component.html
index a203298..b103908 100644
--- a/src/app/pages/records/criminal-records/criminal-records.component.html
+++ b/src/app/pages/records/criminal-records/criminal-records.component.html
@@ -96,7 +96,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-        <nz-form-item class="searchParams">
+        <nz-form-item class="searchParams" [hidden]="!isMisinformation">
           <nz-form-control>
             <nz-select nzAllowClear formControlName="appealState" nzPlaceHolder="申诉状态">
               <nz-option nzValue="0" nzLabel="未申诉"></nz-option>