From 4d49539fa1bf2c43fcc4da43be00abb6b9638584 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 29 Jun 2022 16:42:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=AF=81=E7=85=A7=E9=A2=84=E8=AD=A6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../criminal-records-admin.component.ts       |  2 +-
 .../warning-statistics-list.component.html    | 15 +++-
 .../warning-statistics-list.component.scss    |  4 +
 .../warning-statistics-list.component.ts      | 77 +++++++++++++++----
 4 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts
index 7c3eba7..c6359d7 100644
--- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts
+++ b/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 });
diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
index f85b07e..ad98472 100644
--- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
+++ b/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="请选择证照类型">
diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss
index 74c776c..f9a75ae 100644
--- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss
+++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss
@@ -29,6 +29,10 @@
 
     }
 
+    .searchParamsLong2 {
+      width: 200px;
+    }
+
     .searchParamsLong {
       width: 250px;
     }
diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts
index ea02a9d..260db48 100644
--- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts
+++ b/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: [],

From 09b6934b93c0e472792499dfe0569ee81cc922f9 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 30 Jun 2022 15:44:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E8=AF=AF=E6=8A=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../audit-dispose.component.html              | 41 ++++++++++---------
 .../update-category.component.scss            |  1 +
 .../update-category.component.ts              |  1 +
 .../criminal-records.component.ts             | 16 +++++---
 .../disposeequipment.component.html           |  5 ++-
 .../disposeequipment.component.ts             | 13 ++++--
 .../warning-statistics-list.component.html    |  8 +++-
 .../get-out-of-line-details.component.ts      |  6 +--
 8 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
index 02b58bd..03ffd02 100644
--- a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
+++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
@@ -30,14 +30,15 @@
             <div class="cutoffrule"></div>
             <p *ngIf="data.getData.licenseType.isYearlyCheck">年检时间: {{data.getData.yearlyCheckDate | date:"MM/dd"}}</p>
             <div *ngIf="data.getData.licenseType.isYearlyCheck" class="cutoffrule"></div>
-            <p>修改说明:  &nbsp;&nbsp;{{data.getData.remark}}</p>
+            <p>修改说明: &nbsp;&nbsp;{{data.getData.remark}}</p>
         </div>
         <div *ngIf="data.auditType == 2">
             <p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
             <div class="cutoffrule"></div>
             <p>证照编号: &nbsp;&nbsp;{{data.getData.licenseCode || ''}}</p>
             <div class="cutoffrule"></div>
-            <p>证照效期: &nbsp;&nbsp;{{data.getData.isLongTerm ? '长期证照' : (data.getData.validityEndTime | date:"yyyy/MM/dd")}}</p>
+            <p>证照效期: &nbsp;&nbsp;{{data.getData.isLongTerm ? '长期证照' : (data.getData.validityEndTime |
+                date:"yyyy/MM/dd")}}</p>
             <div class="cutoffrule"></div>
             <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.getData.handleTypesDefault)}}</p>
             <div class="cutoffrule"></div>
@@ -50,33 +51,35 @@
                 </ng-template>
             </p>
             <div class="cutoffrule"></div>
-            <p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck">是</span><span *ngIf="!data.getData.isYearlyCheck">否</span></p>
+            <p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck">是</span><span
+                    *ngIf="!data.getData.isYearlyCheck">否</span></p>
         </div>
         <div *ngIf="data.auditType == 3">
             <p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
             <div class="cutoffrule"></div>
             <p>有无证照: &nbsp;&nbsp;
-                <span *ngIf="data.getData.validatyType == 0">不适用</span><span *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span>
+                <span *ngIf="data.getData.validatyType == 0">不适用</span><span
+                    *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span>
             </p>
             <div class="cutoffrule"></div>
-            <p>说明:  &nbsp;&nbsp;{{data.getData.remark}}</p>
+            <p>说明: &nbsp;&nbsp;{{data.getData.remark}}</p>
         </div>
         <div class="cutoffrule"></div>
-        <p [hidden]="data.getData.imageUrl === undefined">附件: &nbsp;&nbsp;
-            <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'"
-                [src]="data.getData.imageUrl" (click)="viewImg(data.getData.imageUrl)">
-            <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)">
-            <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)">
+        <p [hidden]="data.getData.imageUrl === undefined">附件: &nbsp;&nbsp;</p>
+        <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'" [src]="data.getData.imageUrl"
+            (click)="viewImg(data.getData.imageUrl)">
+        <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'"
+            src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)">
+        <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'"
+            src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)">
         <div class="cutoffrule" [hidden]="data.getData.imageUrl === undefined"></div>
-        <p *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment">附件副本: &nbsp;&nbsp;
-            <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'img'"
-                [src]="data.getData.attachment" (click)="viewImg(data.getData.attachment)">
-            <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.attachment)">
-            <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.attachment)">
+        <p *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment">附件副本: &nbsp;&nbsp;</p>
+        <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'img'"
+            [src]="data.getData.attachment" (click)="viewImg(data.getData.attachment)">
+        <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'word'"
+            src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.attachment)">
+        <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'pdf'"
+            src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.attachment)">
         <div class="cutoffrule" *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment"></div>
         <p>审批意见: </p>
         <textarea style="background: #173350;height: 100px;width: 100%;border-radius: 0;border: 0;color: white;"
diff --git a/src/app/pages/license/update-category/update-category.component.scss b/src/app/pages/license/update-category/update-category.component.scss
index 87b68c8..357b3ef 100644
--- a/src/app/pages/license/update-category/update-category.component.scss
+++ b/src/app/pages/license/update-category/update-category.component.scss
@@ -1,6 +1,7 @@
 .box{
     width: 100%;
     height: 100%;
+    overflow: hidden;
 }
 .tablebox{
     width: 100%;
diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts
index c4dea10..9140905 100644
--- a/src/app/pages/license/update-category/update-category.component.ts
+++ b/src/app/pages/license/update-category/update-category.component.ts
@@ -148,6 +148,7 @@ export class UpdateCategoryComponent implements OnInit {
           let body = instance.data2
           if (body.isLongTerm) {
             body.validityStartTime = instance.isLongTermTime || new Date()
+            body.validityEndTime = '9999-01-01'
           } else {
             body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
             body.validityEndTime = instance.isNoLongTermTime[1] || new Date()
diff --git a/src/app/pages/records/criminal-records/criminal-records.component.ts b/src/app/pages/records/criminal-records/criminal-records.component.ts
index 508c22c..546d839 100644
--- a/src/app/pages/records/criminal-records/criminal-records.component.ts
+++ b/src/app/pages/records/criminal-records/criminal-records.component.ts
@@ -304,7 +304,7 @@ export class CriminalRecordsComponent implements OnInit {
   enddate
 
   isMisinformation: boolean = false//误报按钮的显隐
-  button=false
+  button = false
   tableScrollHeight
   resizeListener
   ngOnInit(): void {
@@ -312,7 +312,7 @@ export class CriminalRecordsComponent implements OnInit {
     // this.isShowEcharts.getMessage().subscribe((message: any) => {
     //   this.isEchartsShow()
     // });
-    
+
     this.tableScrollHeight = '100px'
     // 页面监听
     this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
@@ -325,7 +325,7 @@ export class CriminalRecordsComponent implements OnInit {
       this.returnLastMenus()
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
-      
+
     }
 
     if (loginUserInfo.roles.find((item) => {
@@ -374,10 +374,10 @@ export class CriminalRecordsComponent implements OnInit {
   }
   returnLastMenus() {
     let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
-    
+
     for (let index = 0; index < userMenu.length; index++) {
-      if (userMenu[index].parentId==5) {
-        this.button=true
+      if (userMenu[index].parentId == 5) {
+        this.button = true
       }
     }
     return
@@ -570,6 +570,10 @@ export class CriminalRecordsComponent implements OnInit {
   warningLevelsCopy: any
   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)) //原始数据备份
       this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });
diff --git a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
index 49d6d16..31ffad4 100644
--- a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
+++ b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -82,7 +82,10 @@
                 </nz-form-control>
             </nz-form-item>
         </div>
-        <div class="btnbox" *ngIf="!data2.handleTime">
+        <div *ngIf="!data2.handleTime &&!isOilStationUser" style="height: 30px;">
+
+        </div>
+        <div class="btnbox" *ngIf="!data2.handleTime && isOilStationUser">
             <button nz-button type="submit" class="ok" (click)="ok()">确定</button>
             <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
         </div>
diff --git a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
index 54e07ec..e98bdc1 100644
--- a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
+++ b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
@@ -21,6 +21,7 @@ export class DisposeequipmentComponent implements OnInit {
   isScraped
 
   newdata
+  isOilStationUser
   ngOnInit(): void {
     this.data2 = JSON.parse(JSON.stringify(this.data))
     this.copydata2 = JSON.parse(JSON.stringify(this.data))
@@ -41,10 +42,10 @@ export class DisposeequipmentComponent implements OnInit {
           this.isScraped = '维保'
         }
       })
-    }else{
-      if(this.data2.desc == '维保'){
+    } else {
+      if (this.data2.desc == '维保') {
         this.isScrap = false
-      }else{
+      } else {
         this.isScrap = true
       }
     }
@@ -57,7 +58,11 @@ export class DisposeequipmentComponent implements OnInit {
       validityEndTime: [null, [Validators.required]]
     });
 
-
+    if (sessionStorage.getItem('isGasStation') == 'true') {
+      this.isOilStationUser = true
+    } else {
+      this.isOilStationUser = false
+    }
   }
 
   destroyModal() {
diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
index ad98472..78251d5 100644
--- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
+++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
@@ -51,8 +51,7 @@
                 </nz-form-item>
                 <nz-form-item class="searchParams searchParamsLong">
                     <nz-form-control>
-                        <nz-select 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>
@@ -127,6 +126,7 @@
                         <th>油站名称</th>
                         <th>证照/消防设施名称</th>
                         <th>有效期限</th>
+                        <th>状态</th>
                         <th>操作</th>
                     </tr>
                 </thead>
@@ -197,6 +197,10 @@
                             </ng-template>
 
                         </td>
+                        <td nzEllipsis>
+                            <span *ngIf="item.handleTime">已处置</span>
+                            <span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span>
+                        </td>
                         <td>
                             <span style="cursor: pointer;color: #36A2FF;" (click)="look(item)">查看</span>
                         </td>
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
index 8598795..0711e13 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
@@ -61,8 +61,6 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     }
 
 
-
-
     let loginUserInfo
     if (sessionStorage.getItem('isGasStation') == 'true') {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
@@ -72,8 +70,8 @@ export class GetOutOfLineDetailsComponent implements OnInit {
       this.isOilStationUser = false
     }
 
-    if (loginUserInfo.roles.find((item) => {
-      return item.name == 'ViolationPositiveCensorer'
+    if (loginUserInfo.permissions.find((item) => {
+      return item.name == 'Data.Violation.Positive.Censor'
     }) && this.data.violation.violationType != '证照资质') {
       this.isMisinformation = true
     } else {