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 51f0175..7c3eba7 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
@@ -293,7 +293,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
   tableScrollHeight
   resizeListener
   isShowEchartsListener
-  
+
 
   ngOnInit(): void {
     console.log(this.isShowEchartsListener)
@@ -628,6 +628,11 @@ export class CriminalRecordsAdminComponent 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 != '证照年检临期提醒'
+      })
+      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.ts b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts
index 9758440..11859e6 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
@@ -38,7 +38,7 @@ export class WarningStatisticsListComponent implements OnInit {
   isOrShow: boolean
 
   isMisinformation: boolean = false//误报按钮的显隐
-  button=false
+  button = false
   tableScrollHeight
   resizeListener
   ngOnInit(): void {
@@ -56,7 +56,7 @@ export class WarningStatisticsListComponent implements OnInit {
       this.returnLastMenus()
     } else {
       loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
-      this.button=false
+      this.button = false
     }
 
     if (loginUserInfo.roles.find((item) => {
@@ -103,10 +103,10 @@ export class WarningStatisticsListComponent implements OnInit {
   }
   returnLastMenus() {
     let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
-    
+
     for (let index = 0; index < userMenu.length; index++) {
-      if (userMenu[index].parentId==7) {
-        this.button=true
+      if (userMenu[index].parentId == 7) {
+        this.button = true
       }
     }
     return
@@ -582,20 +582,15 @@ export class WarningStatisticsListComponent implements OnInit {
       });
       this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
         console.log('预警事件', data.result)
-        let option1
-        let option2
+
         data.result.forEach(element => {
-          if (element.violationType == '证照资质') {
-            option1 = element.id
-          }
-          if (element.violationType == '设备监测') {
-            option2 = element.id
+          if (element.violationType == '设备监测' || element.violationType == '证照资质') {
+            this.eventSystemNameOption.push(
+              { id: element.id, name: element.eventSystemName }
+            )
           }
         });
-        this.eventSystemNameOption = [
-          { id: option1, name: '证照预警' },
-          { id: option2, name: '消防设施预警' },
-        ]
+
         this.list = []
         this.SkipCount = '0'
         this.getLicenseList()
@@ -635,7 +630,6 @@ export class WarningStatisticsListComponent implements OnInit {
         ViolationIds.push(element.id)
       });
     }
-    console.log('xxx', this.validateForm.value.licenseType)
     let params = {
       ViolationIds: ViolationIds,
       organizationUnitId: organizationUnitId,
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 e4f13ce..3c3db3f 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
@@ -153,13 +153,13 @@
           <img src="../../../assets/images/warning2.png">
         </span>
         <span
-          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证件临期' && item.violation.violationType != '器材临期' ">
+          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' ">
           <img src=" ../../../assets/images/warning1.png">
         </span>
-        <span *ngIf="item.violation.violationType === '证件临期'">
+        <span *ngIf="item.violation.violationType === '证照资质'">
           <img src="../../../assets/images/warning3.png">
         </span>
-        <span *ngIf="item.violation.violationType === '器材临期'">
+        <span *ngIf="item.violation.violationType === '设备监测'">
           <img src="../../../assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.level == 1">
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 4c0545f..cd0abcc 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
@@ -28,6 +28,9 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   fileUrl
 
   isLicenseWarning = false
+
+
+  isOilStationUser
   ngOnInit(): void {
 
     if (this.data.violation.violationType == '证照资质') {
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index 354ad50..2abf3db 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -125,13 +125,13 @@
           <img src="../../../assets/images/warning2.png">
         </span>
         <span
-          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证件临期' && item.violation.violationType != '器材临期' ">
+          *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' ">
           <img src=" ../../../assets/images/warning1.png">
         </span>
-        <span *ngIf="item.violation.violationType === '证件临期'">
+        <span *ngIf="item.violation.violationType === '证照资质'">
           <img src="../../../assets/images/warning3.png">
         </span>
-        <span *ngIf="item.violation.violationType === '器材临期'">
+        <span *ngIf="item.violation.violationType === '设备监测'">
           <img src="../../../assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.level == 1">