From 051470a5aa30dd0ef68c068416dccc2675a4d0b0 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 10 Jan 2022 09:39:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]select=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=E5=A2=9E=E5=8A=A0clear=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../criminal-records-admin.component.html        | 14 +++++++-------
 .../criminal-records.component.html              | 12 ++++++------
 .../oil-unloading-process-list.component.html    |  6 +++---
 .../today-warning-admin.component.html           | 16 ++++++++--------
 .../today-warning/today-warning.component.html   | 12 ++++++------
 src/theme.less                                   |  4 ++++
 6 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
index b318ba9..f09873d 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
@@ -19,7 +19,7 @@
       <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select id="level" formControlName="level" nzPlaceHolder="请选择预警级别">
+            <nz-select nzAllowClear id="level" formControlName="level" nzPlaceHolder="请选择预警级别">
               <nz-option nzValue="1" nzLabel="一级"></nz-option>
               <nz-option nzValue="2" nzLabel="二级"></nz-option>
               <nz-option nzValue="3" nzLabel="三级"></nz-option>
@@ -30,7 +30,7 @@
 
         <nz-form-item class="searchParams searchParamsLong">
           <nz-form-control>
-            <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId"
+            <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId"
               formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
             </nz-tree-select>
           </nz-form-control>
@@ -38,14 +38,14 @@
 
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select id="type" (ngModelChange)="typeChange($event)" formControlName="type" nzPlaceHolder="请选择预警类型">
+            <nz-select nzAllowClear id="type" (ngModelChange)="typeChange($event)" formControlName="type" nzPlaceHolder="请选择预警类型">
               <nz-option *ngFor="let item of warningTypes" [nzValue]="item.key" [nzLabel]="item.key"></nz-option>
             </nz-select>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="event" nzPlaceHolder="请选择预警事件">
+            <nz-select nzAllowClear formControlName="event" nzPlaceHolder="请选择预警事件">
               <nz-option *ngFor="let item of warningTypesDetails" [nzValue]="item.id" [nzLabel]="item.eventSystemName">
               </nz-option>
             </nz-select>
@@ -53,7 +53,7 @@
         </nz-form-item>
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select id="site" formControlName="site" nzPlaceHolder="请选择区域">
+            <nz-select nzAllowClear id="site" formControlName="site" nzPlaceHolder="请选择区域">
               <nz-option nzValue="出入口" nzLabel="出入口"></nz-option>
               <nz-option nzValue="加油区" nzLabel="加油区"></nz-option>
               <nz-option nzValue="油罐区" nzLabel="油罐区"></nz-option>
@@ -65,7 +65,7 @@
         </nz-form-item>
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="disposalState" nzPlaceHolder="请选择处置状态">
+            <nz-select nzAllowClear formControlName="disposalState" nzPlaceHolder="请选择处置状态">
               <nz-option nzValue="0" nzLabel="已处置"></nz-option>
               <nz-option nzValue="1" nzLabel="未处置"></nz-option>
             </nz-select>
@@ -73,7 +73,7 @@
         </nz-form-item>
         <nz-form-item class="searchParams searchParams2">
           <nz-form-control>
-            <nz-range-picker formControlName="datePicker"></nz-range-picker>
+            <nz-range-picker [nzAllowClear]="false" formControlName="datePicker"></nz-range-picker>
             <br />
           </nz-form-control>
         </nz-form-item>
diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html
index 3e33a39..5d22141 100644
--- a/src/app/pages/criminal-records/criminal-records.component.html
+++ b/src/app/pages/criminal-records/criminal-records.component.html
@@ -17,7 +17,7 @@
       <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="level" nzPlaceHolder="请选择预警级别">
+            <nz-select nzAllowClear formControlName="level" nzPlaceHolder="请选择预警级别">
               <nz-option nzValue="1" nzLabel="一级"></nz-option>
               <nz-option nzValue="2" nzLabel="二级"></nz-option>
               <nz-option nzValue="3" nzLabel="三级"></nz-option>
@@ -28,7 +28,7 @@
 
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="type" (ngModelChange)="typeChange($event)" nzPlaceHolder="请选择预警类型">
+            <nz-select nzAllowClear formControlName="type" (ngModelChange)="typeChange($event)" nzPlaceHolder="请选择预警类型">
               <nz-option *ngFor="let item of warningTypes" [nzValue]="item.key" [nzLabel]="item.key"></nz-option>
             </nz-select>
           </nz-form-control>
@@ -36,7 +36,7 @@
 
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="event" nzPlaceHolder="请选择预警事件">
+            <nz-select nzAllowClear formControlName="event" nzPlaceHolder="请选择预警事件">
               <nz-option *ngFor="let item of warningTypesDetails" [nzValue]="item.id" [nzLabel]="item.eventSystemName">
               </nz-option>
             </nz-select>
@@ -44,7 +44,7 @@
         </nz-form-item>
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="site" nzPlaceHolder="请选择站内发生区域">
+            <nz-select nzAllowClear formControlName="site" nzPlaceHolder="请选择站内发生区域">
               <nz-option nzValue="出入口" nzLabel="出入口"></nz-option>
               <nz-option nzValue="加油区" nzLabel="加油区"></nz-option>
               <nz-option nzValue="油罐区" nzLabel="油罐区"></nz-option>
@@ -56,7 +56,7 @@
         </nz-form-item>
         <nz-form-item class="searchParams">
           <nz-form-control>
-            <nz-select formControlName="disposalState" nzPlaceHolder="请选择处置状态">
+            <nz-select nzAllowClear formControlName="disposalState" nzPlaceHolder="请选择处置状态">
               <nz-option nzValue="0" nzLabel="已处置"></nz-option>
               <nz-option nzValue="1" nzLabel="未处置"></nz-option>
             </nz-select>
@@ -64,7 +64,7 @@
         </nz-form-item>
         <nz-form-item class="searchParams searchParams2">
           <nz-form-control>
-            <nz-range-picker formControlName="datePicker"></nz-range-picker>
+            <nz-range-picker [nzAllowClear]="false" formControlName="datePicker"></nz-range-picker>
             <br />
           </nz-form-control>
         </nz-form-item>
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
index 13ac9d0..1bdbbf4 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
@@ -49,7 +49,7 @@
             <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
                 <nz-form-item class="searchParams">
                     <nz-form-control>
-                        <nz-select formControlName="state" nzPlaceHolder="请选择状态">
+                        <nz-select nzAllowClear formControlName="state" nzPlaceHolder="请选择状态">
                             <nz-option nzValue="0" nzLabel="预警"></nz-option>
                             <nz-option nzValue="1" nzLabel="合规"></nz-option>
                         </nz-select>
@@ -57,7 +57,7 @@
                 </nz-form-item>
                 <nz-form-item class="searchParams searchParamsLong" *ngIf="isOrShow">
                     <nz-form-control>
-                        <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch
+                        <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch
                             [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes"
                             nzPlaceHolder="请选择所属机构">
                         </nz-tree-select>
@@ -85,7 +85,7 @@
 
                 <nz-form-item class="searchParams searchParams2">
                     <nz-form-control>
-                        <nz-range-picker formControlName="datePicker"></nz-range-picker>
+                        <nz-range-picker [nzAllowClear]="false" formControlName="datePicker"></nz-range-picker>
                         <br />
                     </nz-form-control>
                 </nz-form-item>
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html
index 2d05ddb..797d4d3 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.html
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html
@@ -11,7 +11,7 @@
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="level" formControlName="level" nzPlaceHolder="请选择级别">
+          <nz-select id="level" nzAllowClear formControlName="level" nzPlaceHolder="请选择级别">
             <nz-option nzValue="1" nzLabel="一级"></nz-option>
             <nz-option nzValue="2" nzLabel="二级"></nz-option>
             <nz-option nzValue="3" nzLabel="三级"></nz-option>
@@ -22,7 +22,7 @@
 
       <nz-form-item class="searchParams searchParamsLong">
         <nz-form-control>
-          <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId"
+          <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId"
             formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
           </nz-tree-select>
         </nz-form-control>
@@ -30,7 +30,7 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select formControlName="type" (ngModelChange)="typeChange($event)" nzPlaceHolder="请选择预警类型">
+          <nz-select nzAllowClear formControlName="type" (ngModelChange)="typeChange($event)" nzPlaceHolder="请选择预警类型">
             <nz-option *ngFor="let item of warningTypes" [nzValue]="item.key" [nzLabel]="item.key"></nz-option>
           </nz-select>
         </nz-form-control>
@@ -38,7 +38,7 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select formControlName="event" nzPlaceHolder="请选择预警事件">
+          <nz-select nzAllowClear formControlName="event" nzPlaceHolder="请选择预警事件">
             <nz-option *ngFor="let item of warningTypesDetails" [nzValue]="item.id" [nzLabel]="item.eventSystemName">
             </nz-option>
           </nz-select>
@@ -47,7 +47,7 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="area" formControlName="area" nzPlaceHolder="请选择区域">
+          <nz-select nzAllowClear id="area" formControlName="area" nzPlaceHolder="请选择区域">
             <nz-option nzValue="出入口" nzLabel="出入口"></nz-option>
             <nz-option nzValue="加油区" nzLabel="加油区"></nz-option>
             <nz-option nzValue="油罐区" nzLabel="油罐区"></nz-option>
@@ -61,7 +61,7 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select formControlName="disposalState" nzPlaceHolder="请选择处置状态">
+          <nz-select nzAllowClear formControlName="disposalState" nzPlaceHolder="请选择处置状态">
             <nz-option nzValue="0" nzLabel="已处置"></nz-option>
             <nz-option nzValue="1" nzLabel="未处置"></nz-option>
           </nz-select>
@@ -69,13 +69,13 @@
       </nz-form-item>
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-time-picker nzPlaceHolder="请选择开始时间" formControlName="datePickerStart" nzFormat="HH:mm"></nz-time-picker>
+          <nz-time-picker [nzAllowEmpty]="false" nzPlaceHolder="请选择开始时间" formControlName="datePickerStart" nzFormat="HH:mm"></nz-time-picker>
         </nz-form-control>
       </nz-form-item>
       <i style="display: flex;align-items: center;color: #fff;" nz-icon nzType="swap-right" nzTheme="outline"></i>
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-time-picker nzPlaceHolder="请选择结束时间" formControlName="datePickerEnd" nzFormat="HH:mm"></nz-time-picker>
+          <nz-time-picker [nzAllowEmpty]="false" nzPlaceHolder="请选择结束时间" formControlName="datePickerEnd" nzFormat="HH:mm"></nz-time-picker>
         </nz-form-control>
       </nz-form-item>
 
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index 244f83e..217800e 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -11,7 +11,7 @@
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="level" formControlName="level" nzPlaceHolder="请选择预警级别">
+          <nz-select nzAllowClear id="level" formControlName="level" nzPlaceHolder="请选择预警级别">
             <nz-option nzValue="1" nzLabel="一级"></nz-option>
             <nz-option nzValue="2" nzLabel="二级"></nz-option>
             <nz-option nzValue="3" nzLabel="三级"></nz-option>
@@ -22,7 +22,7 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="type" (ngModelChange)="typeChange($event)" formControlName="type" nzPlaceHolder="请选择预警类型">
+          <nz-select nzAllowClear id="type" (ngModelChange)="typeChange($event)" formControlName="type" nzPlaceHolder="请选择预警类型">
             <nz-option *ngFor="let item of warningTypes" [nzValue]="item.key" [nzLabel]="item.key"></nz-option>
           </nz-select>
         </nz-form-control>
@@ -30,7 +30,7 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select formControlName="area" nzPlaceHolder="请选择区域">
+          <nz-select nzAllowClear formControlName="area" nzPlaceHolder="请选择区域">
             <nz-option nzValue="出入口" nzLabel="出入口"></nz-option>
             <nz-option nzValue="加油区" nzLabel="加油区"></nz-option>
             <nz-option nzValue="油罐区" nzLabel="油罐区"></nz-option>
@@ -42,7 +42,7 @@
       </nz-form-item>
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select formControlName="disposalState" nzPlaceHolder="请选择处置状态">
+          <nz-select nzAllowClear formControlName="disposalState" nzPlaceHolder="请选择处置状态">
             <nz-option nzValue="0" nzLabel="已处置"></nz-option>
             <nz-option nzValue="1" nzLabel="未处置"></nz-option>
           </nz-select>
@@ -50,13 +50,13 @@
       </nz-form-item>
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-time-picker nzPlaceHolder="请选择开始时间" formControlName="datePickerStart" nzFormat="HH:mm"></nz-time-picker>
+          <nz-time-picker [nzAllowEmpty]="false" nzPlaceHolder="请选择开始时间" formControlName="datePickerStart" nzFormat="HH:mm"></nz-time-picker>
         </nz-form-control>
       </nz-form-item>
       <i style="display: flex;align-items: center;color: #fff;" nz-icon nzType="swap-right" nzTheme="outline"></i>
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-time-picker nzPlaceHolder="请选择结束时间" formControlName="datePickerEnd" nzFormat="HH:mm"></nz-time-picker>
+          <nz-time-picker [nzAllowEmpty]="false" nzPlaceHolder="请选择结束时间" formControlName="datePickerEnd" nzFormat="HH:mm"></nz-time-picker>
         </nz-form-control>
       </nz-form-item>
 
diff --git a/src/theme.less b/src/theme.less
index ef84883..c5e88dc 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -406,3 +406,7 @@
 .vertical-center-modal .ant-modal {
   top: 0;
 }
+
+.ant-select-clear,.ant-select-close-icon{
+  color: white;
+}
\ No newline at end of file