diff --git a/src/app/pages/gis-home/card-list/card-list.component.html b/src/app/pages/gis-home/card-list/card-list.component.html
new file mode 100644
index 0000000..f120e5e
--- /dev/null
+++ b/src/app/pages/gis-home/card-list/card-list.component.html
@@ -0,0 +1,15 @@
+<div class="box" cdkDrag>
+    <div class="title" cdkDragHandle>
+        <span>
+            {{title}}
+        </span>
+        <span class="close" (click)="close()">
+            <i nz-icon nzType="close" nzTheme="outline"></i>
+        </span>
+    </div>
+    <div class="content">
+        <ul>
+            <li *ngFor="let item of data">{{item}}</li>
+        </ul>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/gis-home/card-list/card-list.component.scss b/src/app/pages/gis-home/card-list/card-list.component.scss
new file mode 100644
index 0000000..bbfe11f
--- /dev/null
+++ b/src/app/pages/gis-home/card-list/card-list.component.scss
@@ -0,0 +1,54 @@
+.box {
+  width: 280px;
+  font-size: 16px;
+  border: 1px solid #558DB1;
+}
+.title {
+  height: 32px;
+  line-height: 32px;
+  background-image: url(../../../../assets/gismap/listtitle.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  color: #fff;
+  box-sizing: border-box;
+  padding-left: 16px;
+  padding-right: 10px;
+  display: flex;
+  justify-content: space-between;
+  cursor: default;
+  .close{
+    cursor: pointer;
+  }
+}
+.content {
+  max-height: 250px;
+  overflow-y: auto;
+  ul{
+    margin-bottom: 0;
+  }
+  li {
+    height: 38px;
+    line-height: 38px;
+    padding-left: 16px;
+    padding-right: 10px;
+    color: #f7faff;
+    font-size: 15px;
+    cursor: pointer;
+  } 
+  li:nth-child(odd) {
+    background: linear-gradient(
+      90deg,
+      RGBA(17, 50, 83, 1),
+      RGBA(17, 50, 83, 0.8)
+    );
+  }
+  li:nth-child(even) {
+    background: linear-gradient(
+      90deg,
+      RGBA(38, 56, 73, 1),
+      RGBA(38, 56, 73, 0.8)
+    );
+    border-top: 1px solid #3e4f60;
+    border-bottom: 1px solid #3e4f60;
+  }
+}
diff --git a/src/app/pages/gis-home/card-list/card-list.component.ts b/src/app/pages/gis-home/card-list/card-list.component.ts
new file mode 100644
index 0000000..b692f8a
--- /dev/null
+++ b/src/app/pages/gis-home/card-list/card-list.component.ts
@@ -0,0 +1,20 @@
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+
+@Component({
+  selector: "app-card-list",
+  templateUrl: "./card-list.component.html",
+  styleUrls: ["./card-list.component.scss"],
+})
+export class CardListComponent implements OnInit {
+  @Input() title;
+  @Input() data;
+
+  @Output() childEvent = new EventEmitter<any>();
+  constructor() {}
+
+  ngOnInit(): void {}
+
+  close() {
+    this.childEvent.emit("closeCardList");
+  }
+}
diff --git a/src/app/pages/gis-home/gis-home.component.html b/src/app/pages/gis-home/gis-home.component.html
index 6ded6e1..cb897bc 100644
--- a/src/app/pages/gis-home/gis-home.component.html
+++ b/src/app/pages/gis-home/gis-home.component.html
@@ -2,9 +2,10 @@
     <div id="mapDiv"></div>
     <div class="mask" style="pointer-events: none;"></div>
     <div class="leftBox">
-        <div class="left1 cardItem">
+        <div class="left1 cardItem"
+            (click)="urlTo('http://localhost:51423/planManagement/entryPlan?singleSignOn=true')">
             <app-card-title [title]="'预案统计'" [subtitle]="'Plan statistics'"></app-card-title>
-            <app-unit-title [num]="33"></app-unit-title>
+            <app-unit-title [num]="33" (childEvent)="handleChildData($event)"></app-unit-title>
             <div class="content">
                 <div id="echartleft1"></div>
             </div>
@@ -25,7 +26,8 @@
         </div>
     </div>
     <div class="rightBox">
-        <div class="right1 cardItem">
+
+        <div class="right1 cardItem" (click)="urlTo('/homepage')">
             <app-card-title [title]="'接入类型'" [subtitle]="'Intervention type'"></app-card-title>
             <div class="content">
                 <div class="accessList">
@@ -41,13 +43,13 @@
                 </div>
             </div>
         </div>
-        <div class="right2 cardItem">
+        <div class="right2 cardItem" (click)="urlTo('/todaywarning')">
             <app-card-title [title]="'预警统计'" [subtitle]="'Warning statistics'"></app-card-title>
             <div class="content">
                 <div id="echartright1"></div>
             </div>
         </div>
-        <div class="right3 cardItem">
+        <div class="right3 cardItem" (click)="urlTo('/records_nav/oliunloadinglist')">
             <app-card-title [title]="'卸油事件'" [subtitle]="'Oil unloading event'"></app-card-title>
             <div class="content">
                 <div id="echartright2"></div>
@@ -56,30 +58,7 @@
         </div>
     </div>
 
-    <!-- <div class="markerInfoWin">
-        <div class="icon icon1">
-            <img src="../../../assets/gismap/gis/1.png" alt="">
-        </div>
-        <div class="num">
-            36
-        </div>
-        <div class="icon icon2">
-            <img src="../../../assets/gismap/gis/2.png" alt="">
-        </div>
-        <div class="num">
-            36
-        </div>
-        <div class="icon icon3">
-            <img src="../../../assets/gismap/gis/3.png" alt="">
-        </div>
-        <div class="num">
-            36
-        </div>
-        <div class="icon icon4">
-            <img src="../../../assets/gismap/gis/4.png" alt="">
-        </div>
-        <div class="num">
-            36
-        </div>
-    </div> -->
+    <div class="unitList" [hidden]="!isConnectedUnit">
+        <app-card-list [title]="'已接入单位'" [data]="unitList1" (childEvent)="handleChildData($event)"></app-card-list>
+    </div>
 </div>
\ No newline at end of file
diff --git a/src/app/pages/gis-home/gis-home.component.scss b/src/app/pages/gis-home/gis-home.component.scss
index 0c4a8a1..120b54a 100644
--- a/src/app/pages/gis-home/gis-home.component.scss
+++ b/src/app/pages/gis-home/gis-home.component.scss
@@ -138,4 +138,9 @@
   bottom: 0;
 }
 
-
+.unitList {
+  position: absolute;
+  left: 24%;
+  top: 2%;
+  z-index: 500;
+}
diff --git a/src/app/pages/gis-home/gis-home.component.ts b/src/app/pages/gis-home/gis-home.component.ts
index d2b0320..6e08b63 100644
--- a/src/app/pages/gis-home/gis-home.component.ts
+++ b/src/app/pages/gis-home/gis-home.component.ts
@@ -1172,4 +1172,28 @@ export class GisHomeComponent implements OnInit {
   MapClick(e) {
     console.log("点击坐标:", e.lnglat.getLng() + "," + e.lnglat.getLat());
   }
+
+  urlTo(url) {
+    window.open(url);
+  }
+
+  unitList1 = ["广西有限公司", "重庆有限公司", "柳州有限公司"];
+  unitList2 = [
+    "芯恩集成电路有限公司",
+    "盛宏建材科技有限公司",
+    "高凯斯电子有限公司",
+    "君晟有限公司",
+    "昀朗建筑工程有限公司",
+    "必康有限公司",
+  ];
+  isConnectedUnit = false;
+  handleChildData(e) {
+    console.log(e);
+    if (e === "openCardList") {
+      this.isConnectedUnit = true;
+    }
+    if (e === "closeCardList") {
+      this.isConnectedUnit = false;
+    }
+  }
 }
diff --git a/src/app/pages/gis-home/unit-title/unit-title.component.html b/src/app/pages/gis-home/unit-title/unit-title.component.html
index 75c8d6e..3848ec9 100644
--- a/src/app/pages/gis-home/unit-title/unit-title.component.html
+++ b/src/app/pages/gis-home/unit-title/unit-title.component.html
@@ -2,5 +2,5 @@
     <div class="numbox">
         截至{{time}} , 已接入单位数 : <div class="num" *ngFor="let item of numArr">{{item}}</div> 家
     </div>
-    <button class="btn">选择</button>
-</div> 
\ No newline at end of file
+    <button class="btn" (click)="select($event)">选择</button>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/gis-home/unit-title/unit-title.component.ts b/src/app/pages/gis-home/unit-title/unit-title.component.ts
index f1b7099..91ec639 100644
--- a/src/app/pages/gis-home/unit-title/unit-title.component.ts
+++ b/src/app/pages/gis-home/unit-title/unit-title.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
 @Component({
   selector: "app-unit-title",
@@ -7,6 +7,8 @@ import { Component, Input, OnInit } from "@angular/core";
 })
 export class UnitTitleComponent implements OnInit {
   @Input() num: number;
+
+  @Output() childEvent = new EventEmitter<any>();
   constructor() {}
 
   time: string;
@@ -38,4 +40,9 @@ export class UnitTitleComponent implements OnInit {
         this.numArr = str.split("");
     }
   }
+
+  select(event) {
+    event.stopPropagation();
+    this.childEvent.emit("openCardList");
+  }
 }
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index a25f98b..621fa3f 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -1,8 +1,8 @@
 <div class="box">
   <div class="menu">
-    <div class="boxleft">
+    <!-- <div class="boxleft">
       <img *ngIf="isProd" src="../../../assets/images/logo2.png" alt="">
-    </div>
+    </div> -->
     <!-- <div class="libox" *ngIf="!isGasStationNav">
       <li *ngFor="let item of menuList1" (click)="routerChange(item)"
         [ngClass]="{'router-link-active': item.name == selectedItem}">
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index c648e07..cef8fb3 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -41,16 +41,13 @@ export class HomeComponent implements OnInit {
     private listRefreshService: listRefreshService,
     private http: HttpClient,
     private router: Router,
-    private navChangeService: NavChangeService,
     public token: CacheTokenService,
     private message: NzMessageService,
     private notificationService: NzNotificationService,
     private modal: NzModalService,
     private viewContainerRef: ViewContainerRef,
     private fb: FormBuilder,
-    private selectedMenu: SelectedMenu,
-    private location: Location,
-    private patternService: PatternService
+    private location: Location
   ) {
     const { password } = MyValidators;
 
@@ -95,7 +92,7 @@ export class HomeComponent implements OnInit {
   ];
 
   menubeijing = [
-    // { name: "首页", url: "/homepage" },
+    { name: "首页", url: "/homepage" },
     // { name: "数字油站", url: "/plan" },
     { name: "今日预警", url: "/todaywarning" },
     { name: "预警记录", url: "/records_nav" },
@@ -108,13 +105,13 @@ export class HomeComponent implements OnInit {
   menuList2 = [];
   selectedItem;
   routerChange(item) {
-    if (JSON.parse(sessionStorage.getItem("isGasStation"))) {
-      let a = JSON.parse(sessionStorage.getItem("3dSceneData"));
-      if (!a.hasBuildingInfo && item.url == "/plan/petrolStation") {
-        this.message.info("当前油站未开通!");
-        return;
-      }
-    }
+    // if (JSON.parse(sessionStorage.getItem("isGasStation"))) {
+    //   let a = JSON.parse(sessionStorage.getItem("3dSceneData"));
+    //   if (!a.hasBuildingInfo && item.url == "/plan/petrolStation") {
+    //     this.message.info("当前油站未开通!");
+    //     return;
+    //   }
+    // }
 
     if (item.name == this.selectedItem) {
       return;
@@ -123,41 +120,9 @@ export class HomeComponent implements OnInit {
     this.selectedItem = item.name;
     this.router.navigate([item.url]);
   }
-  isProd: boolean;
-  ngOnInit(): void {
-    this.isProd = this.patternService.isProd;
-    this.location.subscribe((event) => {
-      console.log("走这里了吗？？？？？？？？？？？？？？？？？？？？？？？");
-
-      if (event.url == "/homepage") {
-        sessionStorage.setItem("selectedMenu", "首页");
-        this.selectedItem = "首页";
-      } else if (event.url == "/plan" || event.url == "/plan/petrolStation") {
-        sessionStorage.setItem("selectedMenu", "数字油站");
-        this.selectedItem = "数字油站";
-      } else if (
-        event.url == "/todaywarning" ||
-        event.url == "/todaywarning/petrolStation"
-      ) {
-        sessionStorage.setItem("selectedMenu", "今日预警");
-        this.selectedItem = "今日预警";
-      } else if (event.url.indexOf("/records_nav") != -1) {
-        if (event.url == "/records_nav") {
-          this.router.navigate(["/records_nav/all"]);
-        } else if (event.url == "/records_nav/petrolStation") {
-          this.router.navigate(["/records_nav/petrolStation/all"]);
-        }
-        sessionStorage.setItem("selectedMenu", "预警记录");
-        this.selectedItem = "预警记录";
-      } else if (
-        event.url == "/license" ||
-        event.url == "/license/petrolStation"
-      ) {
-        sessionStorage.setItem("selectedMenu", "证照管理");
-        this.selectedItem = "证照管理";
-      }
-    });
 
+  ngOnInit(): void {
+    this.initSelectedItem(this.router);
     let a = sessionStorage.getItem("userdata");
     this.userMenu = JSON.parse(a).menus;
     for (let index = 0; index < this.userMenu.length; index++) {
@@ -169,33 +134,6 @@ export class HomeComponent implements OnInit {
     }
 
     this.isGasStation = JSON.parse(sessionStorage.getItem("isGasStation"));
-    //初始化登陆 如果是油站用户
-    if (this.isGasStation) {
-      this.isGasStationNav = true;
-      for (let index = 0; index < this.menu2.length; index++) {
-        for (let k = 0; k < this.tap.length; k++) {
-          if (this.tap[k] == this.menu2[index].name) {
-            this.menuList1.push(this.menu2[index]);
-          }
-        }
-      }
-    } else {
-      //初始化登陆 如果是管理者用户
-      this.isGasStationNav = false;
-      this.isGasStationBack = false;
-      for (let index = 0; index < this.menu1.length; index++) {
-        for (let k = 0; k < this.tap.length; k++) {
-          if (this.tap[k] == this.menu1[index].name) {
-            this.menuList1.push(this.menu1[index]);
-          }
-        }
-      }
-      for (let index = 0; index < this.tap.length; index++) {
-        if (this.tap[index] == "系统管理") {
-          this.xitongguanli = true;
-        }
-      }
-    }
 
     this.router.events
       .pipe(filter((event) => event instanceof NavigationEnd))
@@ -253,6 +191,36 @@ export class HomeComponent implements OnInit {
     this.getWarningSwitch();
   }
 
+  initSelectedItem(event) {
+    if (event.url == "/homepage") {
+      sessionStorage.setItem("selectedMenu", "首页");
+      this.selectedItem = "首页";
+    } else if (event.url == "/plan" || event.url == "/plan/petrolStation") {
+      sessionStorage.setItem("selectedMenu", "数字油站");
+      this.selectedItem = "数字油站";
+    } else if (
+      event.url == "/todaywarning" ||
+      event.url == "/todaywarning/petrolStation"
+    ) {
+      sessionStorage.setItem("selectedMenu", "今日预警");
+      this.selectedItem = "今日预警";
+    } else if (event.url.indexOf("/records_nav") != -1) {
+      if (event.url == "/records_nav") {
+        this.router.navigate(["/records_nav/all"]);
+      } else if (event.url == "/records_nav/petrolStation") {
+        this.router.navigate(["/records_nav/petrolStation/all"]);
+      }
+      sessionStorage.setItem("selectedMenu", "预警记录");
+      this.selectedItem = "预警记录";
+    } else if (
+      event.url == "/license" ||
+      event.url == "/license/petrolStation"
+    ) {
+      sessionStorage.setItem("selectedMenu", "证照管理");
+      this.selectedItem = "证照管理";
+    }
+  }
+
   isWarningVoice = true; //预警声音
   isWarningWindow = true; //预警弹窗
   /**
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 7fb93c3..08d1dbb 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -253,7 +253,7 @@ export class LoginComponent implements OnInit {
                 //   //
 
                 // }
-                this.router.navigate(["/todaywarning"]);
+                this.router.navigate(["/gishome"]);
                 this.message.create("success", `登录成功`);
               },
               (err) => {
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index d3dd6dc..5b5293e 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -97,10 +97,11 @@ import { AnxinImgLookComponent } from './oil-unloading-process/anxin-img-look/an
 import { GisHomeComponent } from './gis-home/gis-home.component';
 import { CardTitleComponent } from './gis-home/card-title/card-title.component';
 import { UnitTitleComponent } from './gis-home/unit-title/unit-title.component';
+import { CardListComponent } from './gis-home/card-list/card-list.component';
 @NgModule({
   declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
     TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
-    AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName, SystemModelComponent, ForgetComponent, HomePageNologinComponent, DownImageComponent, ImgLookComponent, AnxinImgLookComponent, GisHomeComponent, CardTitleComponent, UnitTitleComponent],
+    AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName, SystemModelComponent, ForgetComponent, HomePageNologinComponent, DownImageComponent, ImgLookComponent, AnxinImgLookComponent, GisHomeComponent, CardTitleComponent, UnitTitleComponent, CardListComponent],
 
 
   imports: [
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 427b1bd..e3d75fb 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
@@ -1,110 +1,136 @@
-import { HttpClient } from '@angular/common/http';
-import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router'
-import * as echarts from 'echarts';
-import { fromEvent } from 'rxjs';
-import { debounceTime } from 'rxjs/operators';
-import * as moment from 'moment';
-import { NzModalService } from 'ng-zorro-antd/modal';
-import { GetOutOfLineDetailsComponent } from '../../today-warning/get-out-of-line-details/get-out-of-line-details.component';
-import { DispositionComponent } from '../../disposition/disposition.component';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { TreeService } from 'src/app/service/tree.service';
-import { DisposeequipmentComponent } from '../warning-statistics-list/disposeequipment/disposeequipment.component';
-import { IsShowEchartsService } from 'src/app/service/isShowEcharts.service';
+import { HttpClient } from "@angular/common/http";
+import { Component, ElementRef, OnInit, ViewContainerRef } from "@angular/core";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { Router } from "@angular/router";
+import * as echarts from "echarts";
+import { fromEvent } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import * as moment from "moment";
+import { NzModalService } from "ng-zorro-antd/modal";
+import { GetOutOfLineDetailsComponent } from "../../today-warning/get-out-of-line-details/get-out-of-line-details.component";
+import { DispositionComponent } from "../../disposition/disposition.component";
+import { NzMessageService } from "ng-zorro-antd/message";
+import { TreeService } from "src/app/service/tree.service";
+import { DisposeequipmentComponent } from "../warning-statistics-list/disposeequipment/disposeequipment.component";
+import { IsShowEchartsService } from "src/app/service/isShowEcharts.service";
 @Component({
-  selector: 'app-criminal-records-admin',
-  templateUrl: './criminal-records-admin.component.html',
-  styleUrls: ['./criminal-records-admin.component.scss']
+  selector: "app-criminal-records-admin",
+  templateUrl: "./criminal-records-admin.component.html",
+  styleUrls: ["./criminal-records-admin.component.scss"],
 })
 export class CriminalRecordsAdminComponent implements OnInit {
-
   validateForm!: FormGroup;
-  constructor(private element: ElementRef, private toTree: TreeService, private http: HttpClient, private fb: FormBuilder, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private isShowEcharts: IsShowEchartsService) { }
+  constructor(
+    private element: ElementRef,
+    private toTree: TreeService,
+    private http: HttpClient,
+    private fb: FormBuilder,
+    private router: Router,
+    private modal: NzModalService,
+    private viewContainerRef: ViewContainerRef,
+    private message: NzMessageService,
+    private isShowEcharts: IsShowEchartsService
+  ) {}
   //饼图
-  myChart
+  myChart;
   option = {
-    color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'],
+    color: [
+      "#91CCFF",
+      "#46DFFF",
+      "#36A2FF",
+      "#FF6181",
+      "#B4C3FF",
+      "#FF9963",
+      "#5A9CFF",
+      "#4BFFD4",
+      "#46DFFF",
+      "#91CCFF",
+    ],
     tooltip: {
-      trigger: 'item'//触发类型
+      trigger: "item", //触发类型
     },
     series: [
       {
         // name: 'Access From',
-        type: 'pie',
-        radius: ['58%', '75%'],//内半径外，外半径
-        left: '0',
-        top: '9%',
-        avoidLabelOverlap: false,//防止标签重叠策略
-        label: {//每一个标签外网延伸的引导说明
+        type: "pie",
+        radius: ["58%", "75%"], //内半径外，外半径
+        left: "0",
+        top: "9%",
+        avoidLabelOverlap: false, //防止标签重叠策略
+        label: {
+          //每一个标签外网延伸的引导说明
           show: false,
-          position: 'outside'
+          position: "outside",
         },
-        labelLine: {//引导线
+        labelLine: {
+          //引导线
           show: true,
-          showAbove: true
+          showAbove: true,
         },
-        emphasis: {//中间高亮区域
+        emphasis: {
+          //中间高亮区域
           label: {
             show: false,
-            fontSize: '40',
-            fontWeight: 'bold'
-          }
+            fontSize: "40",
+            fontWeight: "bold",
+          },
         },
-        data: [
-
-        ],
-        tooltip: {//鼠标移入提示
-          position: 'right',
+        data: [],
+        tooltip: {
+          //鼠标移入提示
+          position: "right",
           padding: [14, 19],
-          backgroundColor: 'rgba(28, 129, 218, 0.4)',
+          backgroundColor: "rgba(28, 129, 218, 0.4)",
           textStyle: {
-            color: '#fff',
-            fontSize: 12
+            color: "#fff",
+            fontSize: 12,
           },
-          formatter: "{b} : {c} ({d}%)"
-        }
-      }
-    ]
+          formatter: "{b} : {c} ({d}%)",
+        },
+      },
+    ],
   };
   //柱状图
-  mybarChart: any
+  mybarChart: any;
   baroption = {
     xAxis: {
-      type: 'category',
+      type: "category",
       data: [],
       axisLine: {
         show: false,
         lineStyle: {
-          color: '#91CCFF'
-        }
+          color: "#91CCFF",
+        },
       },
-      axisTick: {//刻度线
-        show: false
+      axisTick: {
+        //刻度线
+        show: false,
       },
-      inverse: true
+      inverse: true,
     },
     yAxis: {
-      type: 'value',
+      type: "value",
       nameTextStyle: {
-        color: '#C4E2FC'
+        color: "#C4E2FC",
       },
-      splitLine: {//分割线
+      splitLine: {
+        //分割线
         lineStyle: {
-          color: ['#0f4374'],
-          width: 2
-        }
+          color: ["#0f4374"],
+          width: 2,
+        },
       },
-      axisTick: {//刻度线
-        show: false
+      axisTick: {
+        //刻度线
+        show: false,
       },
-      axisLine: {//轴线
+      axisLine: {
+        //轴线
         show: false,
         lineStyle: {
-          color: '#C4E2FC'
-        }
-      }
+          color: "#C4E2FC",
+        },
+      },
     },
     tooltip: {
       // trigger: 'axis'
@@ -112,85 +138,91 @@ export class CriminalRecordsAdminComponent implements OnInit {
     series: [
       {
         data: [],
-        type: 'bar',
+        type: "bar",
         itemStyle: {
           color: {
-            type: 'linear',
+            type: "linear",
             x: 0,
             y: 0,
             x2: 0,
             y2: 1,
-            colorStops: [{
-              offset: 0, color: '#23F0FF' // 0% 处的颜色
-            }, {
-              offset: 1, color: 'rgba(35, 153, 255, 0.1)' // 100% 处的颜色
-            }],
-            global: false // 缺省为 false
-          }
+            colorStops: [
+              {
+                offset: 0,
+                color: "#23F0FF", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "rgba(35, 153, 255, 0.1)", // 100% 处的颜色
+              },
+            ],
+            global: false, // 缺省为 false
+          },
         },
-        barWidth: '25%'
+        barWidth: "25%",
       },
       {
         data: [],
-        type: 'line',
-        symbol: 'circle',
+        type: "line",
+        symbol: "circle",
         symbolSize: 8,
         label: {
-          show: true
+          show: true,
         },
         itemStyle: {
-          color: '#fff',
-          shadowColor: '#fff',
-          shadowBlur: 10
+          color: "#fff",
+          shadowColor: "#fff",
+          shadowBlur: 10,
         },
         lineStyle: {
-          color: '#FFCC8A',
-          width: 1
-        }
-      }
+          color: "#FFCC8A",
+          width: 1,
+        },
+      },
     ],
     grid: {
-      left: '42px',
-      right: '30px',
-      bottom: '38px',
-      top: '80px'
-    }
+      left: "42px",
+      right: "30px",
+      bottom: "38px",
+      top: "80px",
+    },
   };
   baroption2 = {
     xAxis: {
-      type: 'value',
-      show: false
+      type: "value",
+      show: false,
     },
     tooltip: {
       // trigger: 'axis'
     },
     yAxis: {
-      type: 'category',
+      type: "category",
       data: [],
       axisLine: {
         show: false,
         lineStyle: {
-          color: '#91CCFF',
-        }
+          color: "#91CCFF",
+        },
       },
-      axisTick: {//刻度线
-        show: false
+      axisTick: {
+        //刻度线
+        show: false,
       },
       axisLabel: {
         formatter: function (value, index) {
-          let newParamsName = '';
+          let newParamsName = "";
           const paramsNameNumber = value.length;
           const provideNumber = 1000;
           const rowNumber = Math.ceil(paramsNameNumber / provideNumber);
           if (paramsNameNumber > provideNumber) {
             for (let p = 0; p < rowNumber; p++) {
-              let tempStr = '';
+              let tempStr = "";
               const start = p * provideNumber;
               const end = start + provideNumber;
               if (p == rowNumber - 1) {
                 tempStr = value.substring(start, paramsNameNumber);
               } else {
-                tempStr = value.substring(start, end) + '\n';
+                tempStr = value.substring(start, end) + "\n";
               }
               newParamsName += tempStr;
             }
@@ -198,64 +230,66 @@ export class CriminalRecordsAdminComponent implements OnInit {
             newParamsName = value;
           }
           // 格式化成月/日，只在第一个刻度显示年份
-          return '{s|·}' + `{a|${newParamsName}}`;
+          return "{s|·}" + `{a|${newParamsName}}`;
         },
         rich: {
           a: {
-            color: '#C4E2FC',
+            color: "#C4E2FC",
             padding: [0, 0, 0, 8],
           },
           s: {
-            color: '#fff',
+            color: "#fff",
             borderWidth: 1,
-            borderColor: '#23D9FF',
-            backgroundColor: '#fff',
+            borderColor: "#23D9FF",
+            backgroundColor: "#fff",
             width: 4,
             height: 4,
             shadowBlur: 3,
-            shadowColor: "#fff"
-          }
-        }
+            shadowColor: "#fff",
+          },
+        },
       },
-      inverse: true//倒序
-
+      inverse: true, //倒序
     },
-    series:
-    {
+    series: {
       label: {
         // 柱图头部显示值
         show: true,
         position: "right",
         color: "#fff",
         fontSize: 12,
-        formatter: '{c}',
-        offset: [6, 0]
+        formatter: "{c}",
+        offset: [6, 0],
       },
       data: [],
-      type: 'bar',
+      type: "bar",
       itemStyle: {
         color: {
-          type: 'linear',
+          type: "linear",
           x: 0,
           y: 0,
           x2: 1,
           y2: 0,
-          colorStops: [{
-            offset: 0, color: '#063d72' // 0% 处的颜色
-          }, {
-            offset: 1, color: '#FF9963' // 100% 处的颜色
-          }],
-          global: false // 缺省为 false
-        }
+          colorStops: [
+            {
+              offset: 0,
+              color: "#063d72", // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: "#FF9963", // 100% 处的颜色
+            },
+          ],
+          global: false, // 缺省为 false
+        },
       },
-      barWidth: '36%'
-    }
-    ,
+      barWidth: "36%",
+    },
     grid: {
-      left: '175px',
-      right: '60px',
-      bottom: '3px',
-      top: '36px'
+      left: "175px",
+      right: "60px",
+      bottom: "3px",
+      top: "36px",
     },
     // dataZoom: [                  //Y轴滑动条
     //   {
@@ -264,7 +298,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
     //     yAxisIndex: 0,//表示控制第几个y轴
     //     left: '97%',  //滑动条位置
     //     start: 1,    //初始化时，滑动条宽度开始标度
-    //     end: 100,    //初始化时，滑动条宽度结束标度<br>   
+    //     end: 100,    //初始化时，滑动条宽度结束标度<br>
     //     maxValueSpan: 10,//显示数据的条数(默认显示10个)
     //     showDataShadow: false,//是否显示数据阴影 默认auto
     //     showDetail: false,//即拖拽时候是否显示详细数值信息 默认true
@@ -281,48 +315,62 @@ export class CriminalRecordsAdminComponent implements OnInit {
     //     moveOnMouseWheel: true
     //   }
     // ]
-  }
-
-  isEcharts: boolean = true
+  };
 
-  startdate
-  enddate
-  button = false
-  isMisinformation: boolean = false//误报按钮的显隐
+  isEcharts: boolean = true;
 
-  tableScrollHeight
-  resizeListener
-  isShowEchartsListener
+  startdate;
+  enddate;
+  button = false;
+  isMisinformation: boolean = false; //误报按钮的显隐
 
+  tableScrollHeight;
+  resizeListener;
+  isShowEchartsListener;
 
   ngOnInit(): void {
     // console.log(this.isShowEchartsListener)
-    this.isShowEchartsListener = this.isShowEcharts.getMessage().subscribe((message: any) => {
-      console.log(message)
-      this.isEchartsShow()
-    });
+    this.isShowEchartsListener = this.isShowEcharts
+      .getMessage()
+      .subscribe((message: any) => {
+        console.log(message);
+        this.isEchartsShow();
+      });
     // console.log(this.isShowEchartsListener)
-    this.tableScrollHeight = '100px'
+    this.tableScrollHeight = "100px";
     // 页面监听
-    this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
-      let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
-    });
-    let loginUserInfo
-    if (sessionStorage.getItem('isGasStation') == 'true') {
-      loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
-      this.returnLastMenus(true)
+    this.resizeListener = fromEvent(window, "resize")
+      .pipe(debounceTime(100))
+      .subscribe((event) => {
+        let tableHeader =
+          this.element.nativeElement.querySelector(
+            `.ant-table-header`
+          ).clientHeight;
+        this.tableScrollHeight =
+          document.getElementById("tablebox").clientHeight -
+          tableHeader -
+          10 +
+          "px";
+      });
+    let loginUserInfo;
+    if (sessionStorage.getItem("isGasStation") == "true") {
+      loginUserInfo = JSON.parse(
+        sessionStorage.getItem("userdataOfgasstation")
+      );
+      this.returnLastMenus(true);
     } else {
-      loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
-      this.returnLastMenus(false)
+      loginUserInfo = JSON.parse(sessionStorage.getItem("userdata"));
+      this.returnLastMenus(false);
     }
 
-    if (loginUserInfo.permissions.find((item) => {
-      return item.name == 'Data.Violation.Positive.Censor'
-    })) {
-      this.isMisinformation = true
+    if (
+      loginUserInfo.permissions.find((item) => {
+        return item.name == "Data.Violation.Positive.Censor";
+      })
+    ) {
+      this.isMisinformation = true;
     } else {
-      this.isMisinformation = false
+      this.isMisinformation = false;
     }
 
     //当前日期
@@ -330,13 +378,23 @@ export class CriminalRecordsAdminComponent implements OnInit {
     let nowY = myDate.getFullYear();
     let nowM = myDate.getMonth() + 1;
     let nowD = myDate.getDate();
-    this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
+    this.enddate =
+      nowY +
+      "-" +
+      (nowM < 10 ? "0" + nowM : nowM) +
+      "-" +
+      (nowD < 10 ? "0" + nowD : nowD); //当前日期
     //获取三十天前日期
-    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29);//最后一个数字30可改，30天的意思
+    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29); //最后一个数字30可改，30天的意思
     let lastY = lw.getFullYear();
     let lastM = lw.getMonth() + 1;
     let lastD = lw.getDate();
-    this.startdate = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
+    this.startdate =
+      lastY +
+      "-" +
+      (lastM < 10 ? "0" + lastM : lastM) +
+      "-" +
+      (lastD < 10 ? "0" + lastD : lastD); //三十天之前日期
 
     this.validateForm = this.fb.group({
       level: [null],
@@ -347,252 +405,322 @@ export class CriminalRecordsAdminComponent implements OnInit {
       disposalState: [null],
       appealState: [null],
       datePicker: [[this.startdate, this.enddate]],
-      misinformation: ['true'],
+      misinformation: ["true"],
     });
 
     setTimeout(() => {
       //饼图
-      this.myChart = echarts.init(document.getElementById('piechart'));
+      this.myChart = echarts.init(document.getElementById("piechart"));
       this.myChart.setOption(this.option);
       //柱状折线图
-      this.mybarChart = echarts.init(document.getElementById('barchart'));
+      this.mybarChart = echarts.init(document.getElementById("barchart"));
       this.mybarChart.setOption(this.baroption);
     }, 0);
 
-
-    this.warningType()
-    this.tableSpin = true
-    this.getAllOrganization()
-    this.getAggregations()
+    this.warningType();
+    this.tableSpin = true;
+    this.getAllOrganization();
+    this.getAggregations();
   }
   ngAfterViewInit(): void {
-    fromEvent(this.element.nativeElement.querySelector(`.ant-table-body`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe(async (event: any) => { //监听 DOM 滚动事件
-      if (event.target.scrollHeight - (event.target.scrollTop + event.target.clientHeight) <= 10) {
-        if (this.totalCount > this.list.length) {
-          console.log('需要加载数据了', event)
-          this.SkipCount = String(Number(this.SkipCount) + 50)
-          this.getViolateRecordList()
+    fromEvent(
+      this.element.nativeElement.querySelector(
+        `.ant-table-body`
+      ) as HTMLCanvasElement,
+      "scroll"
+    )
+      .pipe(debounceTime(100))
+      .subscribe(async (event: any) => {
+        //监听 DOM 滚动事件
+        if (
+          event.target.scrollHeight -
+            (event.target.scrollTop + event.target.clientHeight) <=
+          10
+        ) {
+          if (this.totalCount > this.list.length) {
+            console.log("需要加载数据了", event);
+            this.SkipCount = String(Number(this.SkipCount) + 50);
+            this.getViolateRecordList();
+          }
         }
-      }
-    });
-
+      });
   }
   isEchartsShow() {
-    this.isEcharts = !this.isEcharts
+    this.isEcharts = !this.isEcharts;
     setTimeout(() => {
-      let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-      this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
+      let tableHeader =
+        this.element.nativeElement.querySelector(
+          `.ant-table-header`
+        ).clientHeight;
+      this.tableScrollHeight =
+        document.getElementById("tablebox").clientHeight -
+        tableHeader -
+        10 +
+        "px";
     }, 0);
   }
 
   ngOnDestroy(): void {
-    this.resizeListener.unsubscribe()
-    this.isShowEchartsListener.unsubscribe()
+    this.resizeListener.unsubscribe();
+    this.isShowEchartsListener.unsubscribe();
   }
-  defaultOrId: string
+  defaultOrId: string;
   //获取所有组织机构
-  nodes: any = []
+  nodes: any = [];
   getAllOrganization() {
-    let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
+    let OrganizationUnitId =
+      sessionStorage.getItem("isGasStation") == "true"
+        ? JSON.parse(sessionStorage.getItem("userdataOfgasstation"))
+            .organization.id
+        : JSON.parse(sessionStorage.getItem("userdata")).organization.id;
     let params = {
       OrganizationUnitId: OrganizationUnitId,
-      IsContainsChildren: "true"
-    }
-    this.http.get('/api/services/app/Organization/GetAll', {
-      params: params
-    }).subscribe((data: any) => {
-      data.result.items.forEach(element => {
-        if (element.id == OrganizationUnitId) {
-          element.parentId = null
-        }
-        element.key = element.id
-        element.title = element.displayName
+      IsContainsChildren: "true",
+    };
+    this.http
+      .get("/api/services/app/Organization/GetAll", {
+        params: params,
+      })
+      .subscribe((data: any) => {
+        data.result.items.forEach((element) => {
+          if (element.id == OrganizationUnitId) {
+            element.parentId = null;
+          }
+          element.key = element.id;
+          element.title = element.displayName;
+        });
+        this.nodes = [...this.toTree.toTree(data.result.items)];
+        this.defaultOrId = JSON.parse(
+          sessionStorage.getItem("userdata")
+        ).organization.id;
+        this.validateForm.value.organization = this.defaultOrId;
+        this.getViolateRecordList();
       });
-      this.nodes = [...this.toTree.toTree(data.result.items)]
-      this.defaultOrId = JSON.parse(sessionStorage.getItem('userdata')).organization.id
-      this.validateForm.value.organization = this.defaultOrId
-      this.getViolateRecordList()
-    })
   }
   //刷新饼图图表数据
-  num
-  echartsData: any
+  num;
+  echartsData: any;
   refreshPieData(data) {
     //饼图
     let option = this.myChart.getOption();
-    var num = 0
-    data.pieTop.forEach(element => {
-      num += element.count
-      element.name = element.key
-      element.value = element.count
-    });
-    this.num = num
-    option.series[0].data = data.pieTop;
+    var num = 0;
+    if (data) {
+      data.pieTop.forEach((element) => {
+        num += element.count;
+        element.name = element.key;
+        element.value = element.count;
+      });
+      option.series[0].data = data.pieTop;
+    }
+
+    this.num = num;
+
     this.myChart.setOption(option);
   }
   //刷新柱状折线图表数据
   refreshBarLineData(data, type) {
-    console.log('统计图表数据', data)
+    console.log("统计图表数据", data);
     //柱状图
     let option = this.mybarChart.getOption();
-    console.log('柱图option', option)
-    if (type == 'month') {//近一个月柱状折线图
-      option = this.baroption
-      let monthArr = []
-      let valuedata = []
-      data.timeTop.forEach(element => {
-        monthArr.push(moment(element.key).format('MM.DD'))
-        valuedata.push(element.count)
-      });
-      option.xAxis.data = monthArr
-      option.series[0].data = valuedata
-      option.series[1].data = valuedata
-    } else if (type == 'eventTop') {
-      option = this.baroption2
-      let ydata = []
-      let valuedata = []
-      data.eventTop.forEach(element => {
-        ydata.push(element.key)
-        valuedata.push(element.count)
+    console.log("柱图option", option);
+    if (type == "month") {
+      //近一个月柱状折线图
+      option = this.baroption;
+      let monthArr = [];
+      let valuedata = [];
+      if(data){
+        data.timeTop.forEach((element) => {
+          monthArr.push(moment(element.key).format("MM.DD"));
+          valuedata.push(element.count);
+        });
+      }
+     
+      option.xAxis.data = monthArr;
+      option.series[0].data = valuedata;
+      option.series[1].data = valuedata;
+    } else if (type == "eventTop") {
+      option = this.baroption2;
+      let ydata = [];
+      let valuedata = [];
+      data.eventTop.forEach((element) => {
+        ydata.push(element.key);
+        valuedata.push(element.count);
       });
-      option.yAxis.data = ydata
-      option.series.data = valuedata
-    } else if (type == 'siteTop') {
-      option = this.baroption2
-      let ydata = []
-      let valuedata = []
-      data.siteTop.forEach(element => {
-        ydata.push(element.key)
-        valuedata.push(element.count)
+      option.yAxis.data = ydata;
+      option.series.data = valuedata;
+    } else if (type == "siteTop") {
+      option = this.baroption2;
+      let ydata = [];
+      let valuedata = [];
+      data.siteTop.forEach((element) => {
+        ydata.push(element.key);
+        valuedata.push(element.count);
       });
-      option.yAxis.data = ydata
-      option.series.data = valuedata
+      option.yAxis.data = ydata;
+      option.series.data = valuedata;
     }
     this.mybarChart.setOption(option);
   }
   //获取统计信息
-  chartsSpin: boolean = false
+  chartsSpin: boolean = false;
   getAggregations() {
-    this.chartsSpin = true
-    let ViolationIds = []
+    this.chartsSpin = true;
+    let ViolationIds = [];
     if (this.validateForm.value.type) {
-      this.warningTypesDetails.forEach(item => {
-        item.id ? ViolationIds.push(item.id) : null
+      this.warningTypesDetails.forEach((item) => {
+        item.id ? ViolationIds.push(item.id) : null;
       });
     }
     let body: any = {
-      organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+      organizationUnitId: JSON.parse(sessionStorage.getItem("userdata"))
+        .organization.id,
       isContainsChildren: true,
-      ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null
-    }
-    this.validateForm.value.level ? body.level = this.validateForm.value.level : null
-    this.validateForm.value.site ? body.violateArea = this.validateForm.value.site : null
-    ViolationIds.length != 0 ? body.violationType = ViolationIds : null
-    this.http.post('/api/services/app/ViolateRecord/Aggregations', body).subscribe((data: any) => {
-      this.echartsData = data.result
-      this.chartsSpin = false
-      this.refreshPieData(data.result)
-      this.refreshBarLineData(this.echartsData, 'month')
-    })
+      ViolateTime: this.validateForm.value.datePicker
+        ? [
+            moment(this.validateForm.value.datePicker[0]).format("yyyy-MM-DD") +
+              " 00:00:00",
+            moment(this.validateForm.value.datePicker[1]).format("yyyy-MM-DD") +
+              " 23:59:59",
+          ]
+        : null,
+    };
+    this.validateForm.value.level
+      ? (body.level = this.validateForm.value.level)
+      : null;
+    this.validateForm.value.site
+      ? (body.violateArea = this.validateForm.value.site)
+      : null;
+    ViolationIds.length != 0 ? (body.violationType = ViolationIds) : null;
+    this.http
+      .post("/api/services/app/ViolateRecord/Aggregations", body)
+      .subscribe((data: any) => {
+        this.echartsData = data.result;
+        this.chartsSpin = false;
+        this.refreshPieData(data.result);
+        this.refreshBarLineData(this.echartsData, "month");
+      });
   }
   //获得违规记录列表
-  SkipCount: string = '0'
-  MaxResultCount: string = '50'
-  list: any = []
-  totalCount: string
-  tableSpin: boolean = false
-  isLoading = false
+  SkipCount: string = "0";
+  MaxResultCount: string = "50";
+  list: any = [];
+  totalCount: string;
+  tableSpin: boolean = false;
+  isLoading = false;
   getViolateRecordList() {
-    this.isLoading = true
-    let ViolationIds = []
+    this.isLoading = true;
+    let ViolationIds = [];
     // console.log(this.validateForm.value.event)
     if (this.validateForm.value.event) {
-      ViolationIds = this.validateForm.value.event
+      ViolationIds = this.validateForm.value.event;
     }
     if (this.validateForm.value.type && !this.validateForm.value.event) {
-      this.warningTypesDetails.forEach(item => {
-        item.id ? ViolationIds.push(item.id) : null
+      this.warningTypesDetails.forEach((item) => {
+        item.id ? ViolationIds.push(item.id) : null;
       });
     }
-    let disposalState
-    if (this.validateForm.value.disposalState == '0') {
-      disposalState = true
-    } else if (this.validateForm.value.disposalState == '1') {
-      disposalState = false
+    let disposalState;
+    if (this.validateForm.value.disposalState == "0") {
+      disposalState = true;
+    } else if (this.validateForm.value.disposalState == "1") {
+      disposalState = false;
     } else {
-      disposalState = null
+      disposalState = null;
     }
     let params = {
       Level: this.validateForm.value.level,
       ViolationIds: ViolationIds,
       ViolateAreas: this.validateForm.value.site,
       OrganizationUnitId: this.validateForm.value.organization,
-      IsContainsChildren: 'true',
+      IsContainsChildren: "true",
       IsHandled: disposalState,
-      ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
+      ViolateTime: this.validateForm.value.datePicker
+        ? [
+            moment(this.validateForm.value.datePicker[0]).format("yyyy-MM-DD") +
+              " 00:00:00",
+            moment(this.validateForm.value.datePicker[1]).format("yyyy-MM-DD") +
+              " 23:59:59",
+          ]
+        : null,
       SkipCount: this.SkipCount,
       MaxResultCount: this.MaxResultCount,
       AppealStatus: this.validateForm.value.appealState,
-      Positive: this.validateForm.value.misinformation
-    }
-    this.tableSpin = true
-    this.http.get('/api/services/app/ViolateRecord/GetAll', {
-      params: params
-    }).subscribe((data: any) => {
-      this.list = this.list.concat(data.result.items);
-      this.list = [...this.list]
-      this.totalCount = data.result.totalCount
-      console.log('违规记录列表', data)
-      this.tableSpin = false
-      this.isLoading = false
+      Positive: this.validateForm.value.misinformation,
+    };
+    this.tableSpin = true;
+    this.http
+      .get("/api/services/app/ViolateRecord/GetAll", {
+        params: params,
+      })
+      .subscribe((data: any) => {
+        this.list = this.list.concat(data.result.items);
+        this.list = [...this.list];
+        this.totalCount = data.result.totalCount;
+        console.log("违规记录列表", data);
+        this.tableSpin = false;
+        this.isLoading = false;
 
-      setTimeout(() => {
-        let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
-        this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
-      }, 0);
-    })
+        setTimeout(() => {
+          let tableHeader =
+            this.element.nativeElement.querySelector(
+              `.ant-table-header`
+            ).clientHeight;
+          this.tableScrollHeight =
+            document.getElementById("tablebox").clientHeight -
+            tableHeader -
+            10 +
+            "px";
+        }, 0);
+      });
   }
 
-
-  isMouseEnter = false
+  isMouseEnter = false;
   mouseEnter() {
-    this.isMouseEnter = true
+    this.isMouseEnter = true;
   }
   mouseleave() {
-    this.isMouseEnter = false
+    this.isMouseEnter = false;
   }
 
-
   getThirtyDays() {
     //获取当前日期
     let myDate = new Date();
     var nowY = myDate.getFullYear();
     var nowM = myDate.getMonth() + 1;
     var nowD = myDate.getDate();
-    var enddateStr = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
+    var enddateStr =
+      nowY +
+      "-" +
+      (nowM < 10 ? "0" + nowM : nowM) +
+      "-" +
+      (nowD < 10 ? "0" + nowD : nowD); //当前日期
     var enddate = new Date(enddateStr);
 
-
     //获取三十天前日期
-    var lw = new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+    var lw = new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * 30); //最后一个数字30可改，30天的意思
     var lastY = lw.getFullYear();
     var lastM = lw.getMonth() + 1;
     var lastD = lw.getDate();
-    var startdateStr = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
+    var startdateStr =
+      lastY +
+      "-" +
+      (lastM < 10 ? "0" + lastM : lastM) +
+      "-" +
+      (lastD < 10 ? "0" + lastD : lastD); //三十天之前日期
     var startDate = new Date(startdateStr);
 
-    const dateList = []
+    const dateList = [];
     while (true) {
-      startDate.setDate(startDate.getDate() + 1)
+      startDate.setDate(startDate.getDate() + 1);
       if (startDate.getTime() <= enddate.getTime()) {
         if (startDate.getDate() < 10) {
           // startDate.getFullYear() 获取年，此处没加上年份
-          dateList.push((startDate.getMonth() + 1) + '.0' + startDate.getDate())
+          dateList.push(startDate.getMonth() + 1 + ".0" + startDate.getDate());
         } else {
-          dateList.push((startDate.getMonth() + 1) + '.' + startDate.getDate())
+          dateList.push(startDate.getMonth() + 1 + "." + startDate.getDate());
         }
       } else {
-        break
+        break;
       }
     }
     return dateList;
@@ -602,10 +730,10 @@ export class CriminalRecordsAdminComponent implements OnInit {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
     }
-    this.totalCount = null
-    this.list = []
-    this.SkipCount = '0'
-    this.getViolateRecordList()
+    this.totalCount = null;
+    this.list = [];
+    this.SkipCount = "0";
+    this.getViolateRecordList();
   }
   resetForm(e: MouseEvent): void {
     e.preventDefault();
@@ -615,70 +743,89 @@ export class CriminalRecordsAdminComponent implements OnInit {
       this.validateForm.controls[key].updateValueAndValidity();
     }
     this.validateForm.patchValue({
-      organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+      organization: JSON.parse(sessionStorage.getItem("userdata")).organization
+        .id,
       datePicker: [this.startdate, this.enddate],
-      misinformation: 'true',
+      misinformation: "true",
     });
-    this.totalCount = null
-    this.list = []
-    this.SkipCount = '0'
-    this.getViolateRecordList()
+    this.totalCount = null;
+    this.list = [];
+    this.SkipCount = "0";
+    this.getViolateRecordList();
   }
 
   //预警类型接口
-  warningTypesDetails: any
-  warningTypesDetailsCopy: any
+  warningTypesDetails: any;
+  warningTypesDetailsCopy: any;
 
-  warningTypes: any //预警接口数据
-  warningTypesCopy: any
-  warningLevels: any
-  warningLevelsCopy: any
+  warningTypes: any; //预警接口数据
+  warningTypesCopy: any;
+  warningLevels: any;
+  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.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 });
-      this.warningTypesCopy = (data.result as any).groupBy((t) => { return t.violationType })
-      this.warningLevels = (data.result as any).groupBy((t) => { return t.level });
-      this.warningLevelsCopy = (data.result as any).groupBy((t) => { return t.level })
-      this.warningLevels.sort(function (a, b) {
-        if (a.key < b.key) {
-          return -1;
-        } else if (a.key == b.key) {
-          return 0;
-        } else {
-          return 1;
-        }
-      });
-      this.warningLevelsCopy.sort(function (a, b) {
-        if (a.key < b.key) {
-          return -1;
-        } else if (a.key == b.key) {
-          return 0;
-        } else {
-          return 1;
-        }
+        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;
+        });
+        this.warningTypesCopy = (data.result as any).groupBy((t) => {
+          return t.violationType;
+        });
+        this.warningLevels = (data.result as any).groupBy((t) => {
+          return t.level;
+        });
+        this.warningLevelsCopy = (data.result as any).groupBy((t) => {
+          return t.level;
+        });
+        this.warningLevels.sort(function (a, b) {
+          if (a.key < b.key) {
+            return -1;
+          } else if (a.key == b.key) {
+            return 0;
+          } else {
+            return 1;
+          }
+        });
+        this.warningLevelsCopy.sort(function (a, b) {
+          if (a.key < b.key) {
+            return -1;
+          } else if (a.key == b.key) {
+            return 0;
+          } else {
+            return 1;
+          }
+        });
+        // console.log(111, this.warningTypesDetails)
+        // console.log(222, this.warningTypesCopy)
+        // console.log(333, this.warningLevels)
       });
-      // console.log(111, this.warningTypesDetails)
-      // console.log(222, this.warningTypesCopy)
-      // console.log(333, this.warningLevels)
-    })
   }
   typeChange(e) {
     if (!e) {
-      this.warningTypesDetails = this.warningTypesDetailsCopy
-      this.warningLevels = this.warningLevelsCopy
-      return
+      this.warningTypesDetails = this.warningTypesDetailsCopy;
+      this.warningLevels = this.warningLevelsCopy;
+      return;
     }
-    this.warningTypes.forEach(element => {
+    this.warningTypes.forEach((element) => {
       if (element.key == e) {
-        this.warningTypesDetails = element
-        this.warningLevels = (element as any).groupBy((t) => { return t.level });
+        this.warningTypesDetails = element;
+        this.warningLevels = (element as any).groupBy((t) => {
+          return t.level;
+        });
       }
     });
     this.validateForm.patchValue({
@@ -687,17 +834,19 @@ export class CriminalRecordsAdminComponent implements OnInit {
   }
   levelChange(e) {
     if (!e) {
-      this.warningTypesDetails = this.warningTypesDetailsCopy
-      this.warningTypes = this.warningTypesCopy
+      this.warningTypesDetails = this.warningTypesDetailsCopy;
+      this.warningTypes = this.warningTypesCopy;
       this.validateForm.patchValue({
         type: null,
       });
-      return
+      return;
     }
-    this.warningLevels.forEach(element => {
+    this.warningLevels.forEach((element) => {
       if (element.key == e) {
-        this.warningTypesDetails = element
-        this.warningTypes = (element as any).groupBy((t) => { return t.violationType });
+        this.warningTypesDetails = element;
+        this.warningTypes = (element as any).groupBy((t) => {
+          return t.violationType;
+        });
       }
     });
     this.validateForm.patchValue({
@@ -705,86 +854,113 @@ export class CriminalRecordsAdminComponent implements OnInit {
     });
   }
 
-
   look(item) {
-    console.log('点击item', item)
-    if (item.violation.violationType == '设备监测') {
-      item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
+    console.log("点击item", item);
+    if (item.violation.violationType == "设备监测") {
+      item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot);
       const modal = this.modal.create({
         nzContent: DisposeequipmentComponent,
         nzViewContainerRef: this.viewContainerRef,
         nzWidth: 380,
         nzBodyStyle: {
-          'border': '1px solid #91CCFF',
-          'border-radius': '0px',
-          'padding': '7px',
-          'box-shadow': '0 0 8px 0 #fff',
-          'background-image': 'linear-gradient(#003665, #000f25)'
+          border: "1px solid #91CCFF",
+          "border-radius": "0px",
+          padding: "7px",
+          "box-shadow": "0 0 8px 0 #fff",
+          "background-image": "linear-gradient(#003665, #000f25)",
         },
         nzComponentParams: {
-          data: item
+          data: item,
         },
         nzFooter: null,
         nzClosable: false,
         nzOnOk: async () => {
           if (instance.isScrap) {
-            await new Promise(resolve => {
+            await new Promise((resolve) => {
               let body = {
                 id: item.violatedItemSnapshotObj.id,
                 name: instance.copydata2.violatedItemSnapshotObj.name,
-                storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
-                productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
-                maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
-                validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD'),
+                storageLocation:
+                  instance.copydata2.violatedItemSnapshotObj.storageLocation,
+                productionDate: moment(
+                  instance.copydata2.violatedItemSnapshotObj.productionDate
+                ).format("yyyy-MM-DD"),
+                maintenanceDate: moment(
+                  instance.copydata2.violatedItemSnapshotObj.maintenanceDate
+                ).format("yyyy-MM-DD"),
+                validityEndTime: moment(
+                  instance.copydata2.violatedItemSnapshotObj.validityEndTime
+                ).format("yyyy-MM-DD"),
                 isScrapped: true,
-                organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
-              }
-              this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
-                let body = {
-                  id: item.id,
-                  handleRecord: '报废成功!'
-                }
-                this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
-                  resolve(data)
-                  this.message.create('success', '报废成功!');
-                  item.handleTime = new Date()
-                  return true
-                })
-              })
-            })
-
+                organizationUnitId:
+                  item.violatedItemSnapshotObj.organizationUnitId,
+              };
+              this.http
+                .put("/api/services/app/FireEquipment/Update", body)
+                .subscribe((data: any) => {
+                  let body = {
+                    id: item.id,
+                    handleRecord: "报废成功!",
+                  };
+                  this.http
+                    .post(
+                      "/api/services/app/ViolateRecord/HandleViolateRecord",
+                      body
+                    )
+                    .subscribe((data) => {
+                      resolve(data);
+                      this.message.create("success", "报废成功!");
+                      item.handleTime = new Date();
+                      return true;
+                    });
+                });
+            });
           } else {
             if (instance.validateForm.valid) {
-              await new Promise(resolve => {
+              await new Promise((resolve) => {
                 let body = {
                   id: item.violatedItemSnapshotObj.id,
                   name: instance.validateForm.value.name,
                   storageLocation: instance.validateForm.value.storageLocation,
-                  productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
-                  maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
-                  validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
-                  organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
-                }
-                this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
-                  // item.violatedItemSnapshotObj = data.result
-                  let body = {
-                    id: item.id,
-                    handleRecord: '维保成功!'
-                  }
-                  this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
-                    resolve(data)
-                    this.message.create('success', '维保成功!');
-                    item.handleTime = new Date()
-                    return true
-                  })
-                })
-              })
+                  productionDate: moment(
+                    instance.validateForm.value.productionDate
+                  ).format("yyyy-MM-DD"),
+                  maintenanceDate: moment(
+                    instance.validateForm.value.maintenanceDate
+                  ).format("yyyy-MM-DD"),
+                  validityEndTime: moment(
+                    instance.validateForm.value.validityEndTime
+                  ).format("yyyy-MM-DD"),
+                  organizationUnitId:
+                    item.violatedItemSnapshotObj.organizationUnitId,
+                };
+                this.http
+                  .put("/api/services/app/FireEquipment/Update", body)
+                  .subscribe((data: any) => {
+                    // item.violatedItemSnapshotObj = data.result
+                    let body = {
+                      id: item.id,
+                      handleRecord: "维保成功!",
+                    };
+                    this.http
+                      .post(
+                        "/api/services/app/ViolateRecord/HandleViolateRecord",
+                        body
+                      )
+                      .subscribe((data) => {
+                        resolve(data);
+                        this.message.create("success", "维保成功!");
+                        item.handleTime = new Date();
+                        return true;
+                      });
+                  });
+              });
             } else {
-              this.message.create('warning', '请填写完整!');
-              return false
+              this.message.create("warning", "请填写完整!");
+              return false;
             }
           }
-        }
+        },
       });
       const instance = modal.getContentComponent();
     } else {
@@ -792,175 +968,192 @@ export class CriminalRecordsAdminComponent implements OnInit {
         nzContent: GetOutOfLineDetailsComponent,
         nzWrapClassName: "vertical-center-modal",
         nzViewContainerRef: this.viewContainerRef,
-        nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+        nzWidth:
+          document.documentElement.clientHeight < 650 ||
+          document.documentElement.clientWidth < 1400
+            ? 1000
+            : 1200,
         nzClosable: false,
-        nzClassName: 'modelnobg',
+        nzClassName: "modelnobg",
         nzBodyStyle: {
-          'border-radius': '0px',
-          'padding': '0px',
+          "border-radius": "0px",
+          padding: "0px",
         },
         nzComponentParams: {
-          data: item
+          data: item,
         },
         nzFooter: null,
         nzOnOk: async () => {
-          console.log('误报处理')
-          console.log('点击item', item)
-          console.log('list', this.list)
+          console.log("误报处理");
+          console.log("点击item", item);
+          console.log("list", this.list);
           for (let index = 0; index < this.list.length; index++) {
             const element = this.list[index];
             if (element.id == item.id) {
-              this.list.splice(index, 1)
-              this.totalCount = String(Number(this.totalCount) - 1)
-              this.SkipCount = String(Number(this.SkipCount) - 1)
-              this.list = [...this.list]
+              this.list.splice(index, 1);
+              this.totalCount = String(Number(this.totalCount) - 1);
+              this.SkipCount = String(Number(this.SkipCount) - 1);
+              this.list = [...this.list];
             }
           }
-        }
+        },
       });
       const instance = modal.getContentComponent();
     }
-
   }
 
-
-  selectedType = '分布'
-  selectedRankingType = null
+  selectedType = "分布";
+  selectedRankingType = null;
   echartClick(type) {
-    this.selectedType = type
-    this.mybarChart.dispose()
-    this.mybarChart = echarts.init(document.getElementById('barchart'));
-    this.selectedRankingType = null
-    this.refreshBarLineData(this.echartsData, 'month')
-
+    this.selectedType = type;
+    this.mybarChart.dispose();
+    this.mybarChart = echarts.init(document.getElementById("barchart"));
+    this.selectedRankingType = null;
+    this.refreshBarLineData(this.echartsData, "month");
   }
   echartClick2(type) {
-    this.mybarChart.dispose()
-    this.mybarChart = echarts.init(document.getElementById('barchart'));
-    this.selectedType = null
-    this.selectedRankingType = type
-    if (this.selectedRankingType == '站点排名') {
-      this.refreshBarLineData(this.echartsData, 'siteTop')
+    this.mybarChart.dispose();
+    this.mybarChart = echarts.init(document.getElementById("barchart"));
+    this.selectedType = null;
+    this.selectedRankingType = type;
+    if (this.selectedRankingType == "站点排名") {
+      this.refreshBarLineData(this.echartsData, "siteTop");
     }
-    if (this.selectedRankingType == '事件排名') {
-      this.refreshBarLineData(this.echartsData, 'eventTop')
+    if (this.selectedRankingType == "事件排名") {
+      this.refreshBarLineData(this.echartsData, "eventTop");
     }
   }
 
-
   //跳转卸油统计页面
   goOilList() {
-    this.router.navigate(['/records/oliunloadinglist'])
+    this.router.navigate(["/records/oliunloadinglist"]);
   }
   goWarningList() {
-    this.router.navigate(['/records/warningstatisticslist'])
+    this.router.navigate(["/records/warningstatisticslist"]);
   }
   goMisinformationList() {
-    this.router.navigate(['records/misinformationList'])
+    this.router.navigate(["records/misinformationList"]);
   }
   dispose(item) {
-    console.log(item)
+    console.log(item);
     const modal = this.modal.create({
       nzContent: DispositionComponent,
       nzWrapClassName: "vertical-center-modal",
       nzViewContainerRef: this.viewContainerRef,
       nzWidth: 380,
       nzBodyStyle: {
-        'border': '1px solid #91CCFF',
-        'border-radius': '0px',
-        'padding': '7px',
-        'box-shadow': '0 0 8px 0 #fff',
-        'background-image': 'linear-gradient(#003665, #000f25)'
+        border: "1px solid #91CCFF",
+        "border-radius": "0px",
+        padding: "7px",
+        "box-shadow": "0 0 8px 0 #fff",
+        "background-image": "linear-gradient(#003665, #000f25)",
       },
       nzComponentParams: {},
       nzFooter: null,
       nzClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          await new Promise(resolve => {
+          await new Promise((resolve) => {
             let body = {
               id: item.id,
-              handleRecord: instance.validateForm.value.content
-            }
-            this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
-              resolve(data)
-              this.message.create('success', '处置成功!');
-              item.handleTime = new Date()
-              return true
-            })
-          })
+              handleRecord: instance.validateForm.value.content,
+            };
+            this.http
+              .post("/api/services/app/ViolateRecord/HandleViolateRecord", body)
+              .subscribe((data) => {
+                resolve(data);
+                this.message.create("success", "处置成功!");
+                item.handleTime = new Date();
+                return true;
+              });
+          });
         } else {
-          this.message.create('warning', '请填写完整!');
-          return false
+          this.message.create("warning", "请填写完整!");
+          return false;
         }
       },
     });
     const instance = modal.getContentComponent();
   }
   returnLastMenus(e) {
-    let userMenu
+    let userMenu;
     if (e) {
-      userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus
+      userMenu = JSON.parse(
+        sessionStorage.getItem("userdataOfgasstation")
+      ).menus;
     } else {
-      userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus
+      userMenu = JSON.parse(sessionStorage.getItem("userdata")).menus;
     }
     for (let index = 0; index < userMenu.length; index++) {
       for (let k = 0; k < userMenu.length; k++) {
         if (userMenu[index].name == "预警类型统计") {
           if (userMenu[index].id == userMenu[k].parentId) {
-            this.button = true
+            this.button = true;
           }
         }
-
       }
     }
-    return
+    return;
   }
   exportExcel() {
-    let ViolationIds = []
+    let ViolationIds = [];
     if (this.validateForm.value.event) {
-      ViolationIds = this.validateForm.value.event
+      ViolationIds = this.validateForm.value.event;
     }
     if (this.validateForm.value.type && !this.validateForm.value.event) {
-      this.warningTypesDetails.forEach(item => {
-        item.id ? ViolationIds.push(item.id) : null
+      this.warningTypesDetails.forEach((item) => {
+        item.id ? ViolationIds.push(item.id) : null;
       });
     }
-    let disposalState
-    if (this.validateForm.value.disposalState == '0') {
-      disposalState = true
-    } else if (this.validateForm.value.disposalState == '1') {
-      disposalState = false
+    let disposalState;
+    if (this.validateForm.value.disposalState == "0") {
+      disposalState = true;
+    } else if (this.validateForm.value.disposalState == "1") {
+      disposalState = false;
     } else {
-      disposalState = null
+      disposalState = null;
     }
     const httpOptions = {
-      responseType: 'blob' as 'json',
+      responseType: "blob" as "json",
       params: {
         Level: this.validateForm.value.level,
         ViolationIds: ViolationIds,
         ViolateAreas: this.validateForm.value.site,
         OrganizationUnitId: this.validateForm.value.organization,
-        IsContainsChildren: 'true',
+        IsContainsChildren: "true",
         IsHandled: disposalState,
-        ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null,
-        Positive: this.validateForm.value.misinformation
-      }
+        ViolateTime: this.validateForm.value.datePicker
+          ? [
+              moment(this.validateForm.value.datePicker[0]).format(
+                "yyyy-MM-DD"
+              ) + " 00:00:00",
+              moment(this.validateForm.value.datePicker[1]).format(
+                "yyyy-MM-DD"
+              ) + " 23:59:59",
+            ]
+          : null,
+        Positive: this.validateForm.value.misinformation,
+      },
     };
-    this.http.get(`/api/services/app/ViolateRecord/ExportExcel`, httpOptions).subscribe((data: any) => {
-      // console.log('导出成功')
-      // 文件名中有中文 则对文件名进行转码
-      const link = document.createElement('a');
-      const blob = new Blob([data], { type: 'application/vnd.ms-excel' });
-      link.setAttribute('href', window.URL.createObjectURL(blob));
-      link.setAttribute('download', '预警记录' + '.xls');
-      link.style.visibility = 'hidden';
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-      this.message.create('success', `导出成功`);
-    }, err => {
-      this.message.create('error', `导出失败`);
-    })
+    this.http
+      .get(`/api/services/app/ViolateRecord/ExportExcel`, httpOptions)
+      .subscribe(
+        (data: any) => {
+          // console.log('导出成功')
+          // 文件名中有中文 则对文件名进行转码
+          const link = document.createElement("a");
+          const blob = new Blob([data], { type: "application/vnd.ms-excel" });
+          link.setAttribute("href", window.URL.createObjectURL(blob));
+          link.setAttribute("download", "预警记录" + ".xls");
+          link.style.visibility = "hidden";
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+          this.message.create("success", `导出成功`);
+        },
+        (err) => {
+          this.message.create("error", `导出失败`);
+        }
+      );
   }
 }
diff --git a/src/app/pages/records/records-nav/records-nav.component.ts b/src/app/pages/records/records-nav/records-nav.component.ts
index 2727e58..7046583 100644
--- a/src/app/pages/records/records-nav/records-nav.component.ts
+++ b/src/app/pages/records/records-nav/records-nav.component.ts
@@ -18,35 +18,16 @@ export class RecordsNavComponent implements OnInit {
   menuList = ["预警类型统计", "卸油统计", "证照预警统计"];
   tap = [];
   userMenu = [];
-  menu = ["预警类型统计"];
-  selectedMenu = "预警类型统计";
+  menu = ["预警类型统计", "卸油统计"];
+  selectedMenu;
   ngOnInit(): void {
-    // let a= sessionStorage.getItem('userdata')
-    // this.userMenu=JSON.parse(a).menus
-    // console.log('this.userMenu',this.userMenu);
-    // for (let index = 0; index < this.userMenu.length; index++) {
-    //   let a=this.userMenu[index].name
-    //   this.tap.push(a)
-
-    // }
-    // console.log(this.tap);
-
-    // if (this.userMenu.length==0) {
-    //   this.menu=this.menuList
-    // }else{
-    //   for (let index = 0; index < this.menuList.length; index++) {
-
-    //     for (let k = 0; k < this.tap.length; k++) {
-    //       if (this.tap[k]==this.menuList[index]) {
-    //         this.menu.push(this.tap[k])
-    //         console.log( this.menu);
-    //       }
-
-    //     }
-
-    //   }
-    // }
-    // this.selectedMenu = this.menu[0]
+    console.log(this.router);
+    if (this.router.url.indexOf("oliunloadinglist") !== -1) {
+      this.selectedMenu = "卸油统计";
+    }
+    if (this.router.url === "/records_nav") {
+      this.selectedMenu = this.menu[0];
+    }
     this.routerChange();
   }
 
@@ -60,6 +41,15 @@ export class RecordsNavComponent implements OnInit {
   }
 
   routerChange() {
+    console.log("this.selectedMenu", this.selectedMenu);
+    if (this.selectedMenu == "预警类型统计") {
+      this.router.navigate(["/records_nav/all"]);
+    } else if (this.selectedMenu == "卸油统计") {
+      this.router.navigate(["/records_nav/oliunloadinglist"]);
+    } else if (this.selectedMenu == "证照预警统计") {
+      this.router.navigate(["/records_nav/warningstatisticslist"]);
+    }
+    return;
     if (sessionStorage.getItem("isGasStation") == "false") {
       if (this.selectedMenu == "预警类型统计") {
         this.router.navigate(["/records_nav/all"]);
diff --git a/src/assets/gismap/listtitle.png b/src/assets/gismap/listtitle.png
new file mode 100644
index 0000000..5ba2f75
Binary files /dev/null and b/src/assets/gismap/listtitle.png differ