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 {