Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

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

@@ -143,13 +143,13 @@
         </nz-form-item>
         <nz-form-item class="btn">
           <nz-form-control>
-            <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+            <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
           </nz-form-control>
         </nz-form-item>
 
         <nz-form-item class="btn">
           <nz-form-control>
-            <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+            <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                 [nzType]="'sync'"></i>重置</button>
           </nz-form-control>
         </nz-form-item>

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

@@ -455,7 +455,9 @@ export class CriminalRecordsAdminComponent implements OnInit {
   list: any = []
   totalCount: string
   tableSpin: boolean = false
+  isLoading = false
   getViolateRecordList() {
+    this.isLoading = true
     let ViolationIds = []
     // console.log(this.validateForm.value.event)
     if (this.validateForm.value.event) {
@@ -495,6 +497,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
       this.totalCount = data.result.totalCount
       console.log('违规记录列表', data)
       this.tableSpin = false
+      this.isLoading = false
     })
   }
 

src/app/pages/criminal-records/criminal-records.component.html

@@ -121,13 +121,13 @@
         </nz-form-item>
         <nz-form-item class="btn">
           <nz-form-control>
-            <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+            <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
           </nz-form-control>
         </nz-form-item>
 
         <nz-form-item class="btn">
           <nz-form-control>
-            <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+            <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                 [nzType]="'sync'"></i>重置</button>
           </nz-form-control>
         </nz-form-item>

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

@@ -436,7 +436,9 @@ export class CriminalRecordsComponent implements OnInit {
   list: any = []
   totalCount: string
   tableSpin: boolean = false
+  isLoading = false
   getViolateRecordList() {
+    this.isLoading = true
     let ViolationIds = []
     if (this.validateForm.value.event) {
       ViolationIds = this.validateForm.value.event
@@ -476,6 +478,7 @@ export class CriminalRecordsComponent implements OnInit {
       this.totalCount = data.result.totalCount
       console.log('违规记录列表', data)
       this.tableSpin = false
+      this.isLoading = false
     })
   }
   ngAfterViewInit(): void {

src/app/pages/misinformation-list/misinformation-list.component.html

@@ -94,13 +94,13 @@
 
                 <nz-form-item class="btn">
                     <nz-form-control>
-                        <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+                        <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
                     </nz-form-control>
                 </nz-form-item>
 
                 <nz-form-item class="btn">
                     <nz-form-control>
-                        <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+                        <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                                 [nzType]="'sync'"></i>重置</button>
                     </nz-form-control>
                 </nz-form-item>

src/app/pages/misinformation-list/misinformation-list.component.ts

@@ -458,7 +458,9 @@ export class MisinformationListComponent implements OnInit {
   list: any = []
   totalCount: string
   tableSpin: boolean = false
+  isLoading = false
   getViolateRecordList() {
+    this.isLoading = true
     let ViolationIds = []
     if (this.validateForm.value.event) {
       ViolationIds.push(this.validateForm.value.event)
@@ -497,7 +499,7 @@ export class MisinformationListComponent implements OnInit {
       this.totalCount = data.result.totalCount
       console.log('违规记录列表', data)
       this.tableSpin = false
-
+      this.isLoading = false
       console.log(this.list.length)
     })
   }

src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html

@@ -87,13 +87,13 @@
 
                 <nz-form-item class="btn">
                     <nz-form-control>
-                        <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+                        <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
                     </nz-form-control>
                 </nz-form-item>
 
                 <nz-form-item class="btn">
                     <nz-form-control>
-                        <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+                        <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                                 [nzType]="'sync'"></i>重置</button>
                     </nz-form-control>
                 </nz-form-item>

src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts

@@ -619,7 +619,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
   list: any = []
   totalCount: string
   tableSpin: boolean = false
+  isLoading = false
   getViolateRecordList() {
+    this.isLoading = true
     this.tableSpin = true
     let organizationUnitId
     if (this.router.url.indexOf('petrolStation') != -1) {
@@ -647,6 +649,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
       this.list = this.list.concat(data.result.items);
       this.list = [...this.list]
       this.totalCount = data.result.totalCount
+      this.isLoading = false
       console.log('获取卸油流程列表', data.result.items)
     })
   }

src/app/pages/plan-admin/file-license-list/file-license-list.component.html

@@ -29,12 +29,12 @@
             </nz-form-item>
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+                    <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
                 </nz-form-control>
             </nz-form-item>
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+                    <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                             [nzType]="'sync'"></i>重置</button>
                 </nz-form-control>
             </nz-form-item>

src/app/pages/plan-admin/file-license-list/file-license-list.component.ts

@@ -123,7 +123,9 @@ export class FileLicenseListComponent implements OnInit {
 
   orId
   list: any = []
+  isLoading = false
   async getStationLicenses() {
+    this.isLoading = true
     let params = {
       StationName: this.validateForm.value.name,
       OrganizationUnitId: this.validateForm.value.organization,
@@ -176,7 +178,7 @@ export class FileLicenseListComponent implements OnInit {
         this.list = [...this.list]
         console.log('证照表格', this.list)
         this.tableSpin = false
-
+        this.isLoading = false
         resolve(data)
       })
     })

src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html

@@ -11,13 +11,13 @@
             </nz-form-item>
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+                    <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
                 </nz-form-control>
             </nz-form-item>
 
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+                    <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                             [nzType]="'sync'"></i>重置</button>
                 </nz-form-control>
             </nz-form-item>

src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts

@@ -96,7 +96,9 @@ export class OilStationListComponent implements OnInit {
 
   orId
   list: any = []
+  isLoading = false
   async getGasStation() {
+    this.isLoading = true
     let params = {
       StationName: this.validateForm.value.name,
       OrganizationUnitId: String(sessionStorage.getItem('planAdminOrid')),
@@ -114,6 +116,7 @@ export class OilStationListComponent implements OnInit {
         this.list = this.list.concat(data.result.items);
         this.list = [...this.list]
         this.tableSpin = false
+        this.isLoading = false
         resolve(data)
       })
     })

src/app/pages/plan-admin/update-license-list/update-license-list.component.html

@@ -40,12 +40,12 @@
             </nz-form-item>
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+                    <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
                 </nz-form-control>
             </nz-form-item>
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+                    <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                             [nzType]="'sync'"></i>重置</button>
                 </nz-form-control>
             </nz-form-item>

src/app/pages/plan-admin/update-license-list/update-license-list.component.ts

@@ -121,7 +121,9 @@ export class UpdateLicenseListComponent implements OnInit {
   SkipCount: string = '0'
   MaxResultCount: string = '100'
   list: any = []
+  isLoading = false
   async getStationLicenses() {
+    this.isLoading = true
     let params = {
       StationName: this.validateForm.value.name,
       OrganizationUnitId: this.validateForm.value.organization,
@@ -175,6 +177,7 @@ export class UpdateLicenseListComponent implements OnInit {
         this.list = [...this.list]
         console.log('证照表格', this.list)
         this.tableSpin = false
+        this.isLoading = false
         resolve(data)
       })
     })

src/app/pages/today-warning-admin/today-warning-admin.component.html

@@ -93,13 +93,13 @@
 
       <nz-form-item class="btn">
         <nz-form-control>
-          <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+          <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="btn">
         <nz-form-control>
-          <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+          <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
               [nzType]="'sync'"></i>重置</button>
         </nz-form-control>
       </nz-form-item>

src/app/pages/today-warning-admin/today-warning-admin.component.ts

@@ -125,8 +125,10 @@ export class TodayWarningAdminComponent implements OnInit {
   //获得预警列表    
   list: any = [
   ]
-  totalCount: string //预警总数    
+  totalCount: string //预警总数   
+  isLoading = false 
   getEarlyWarningList() {
+    this.isLoading = true
     let ViolationIds = []
     if (this.validateForm.value.event) {
       ViolationIds.push(this.validateForm.value.event)
@@ -166,6 +168,7 @@ export class TodayWarningAdminComponent implements OnInit {
       this.totalCount = data.result.totalCount
       console.log('预警列表', this.list)
       this.isSpin = false
+      this.isLoading = false
       let obj = {
         name: '改变数量',
         num: this.totalCount

src/app/pages/today-warning/today-warning.component.html

@@ -65,13 +65,13 @@
 
       <nz-form-item class="btn">
         <nz-form-control>
-          <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+          <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="btn">
         <nz-form-control>
-          <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+          <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
               [nzType]="'sync'"></i>重置</button>
         </nz-form-control>
       </nz-form-item>

src/app/pages/today-warning/today-warning.component.ts

@@ -82,7 +82,9 @@ export class TodayWarningComponent implements OnInit {
   ]
   totalCount: string //预警总数    
   isSpin: boolean = false
+  isLoading = false
   getEarlyWarningList() {
+    this.isLoading = true
     let ViolationIds = []
     if (this.validateForm.value.type) {
       this.warningTypesDetails.forEach(item => {
@@ -118,6 +120,7 @@ export class TodayWarningComponent implements OnInit {
       this.totalCount = data.result.totalCount
       console.log('预警列表', this.list)
       this.isSpin = false
+      this.isLoading = false
       let obj = {
         name: '改变数量',
         num: this.totalCount

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

@@ -85,13 +85,13 @@
 
                 <nz-form-item class="btn">
                     <nz-form-control>
-                        <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+                        <button [nzLoading]="isLoading" nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
                     </nz-form-control>
                 </nz-form-item>
 
                 <nz-form-item class="btn">
                     <nz-form-control>
-                        <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+                        <button [nzLoading]="isLoading" nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
                                 [nzType]="'sync'"></i>重置</button>
                     </nz-form-control>
                 </nz-form-item>

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

@@ -542,8 +542,10 @@ export class WarningStatisticsListComponent implements OnInit {
   list: any = []
   totalCount: string
   tableSpin: boolean = false
+  isLoading = false
   //获得证照预警
   getLicenseList() {
+    this.isLoading = true
     for (const key in this.validateForm.controls) {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
@@ -583,6 +585,7 @@ export class WarningStatisticsListComponent implements OnInit {
       this.list = this.list.concat(data.result.items);
       this.list = [...this.list]
       this.totalCount = data.result.totalCount
+      this.isLoading = false
       console.log('证照预警列表', data.result.items)
     })
   }