From 323e0053221693cb0d59f34e1189d46a4ade46e6 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 22 Nov 2021 14:17:00 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=89=80=E6=9C=89=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9=EF=BC=9B=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90=EF=BC=9B?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=BB=9A=E5=8A=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../criminal-records-admin.component.html     |  52 +++--
 .../criminal-records-admin.component.ts       | 217 +++++++++++-------
 .../criminal-records.component.html           |  37 +--
 .../criminal-records.component.ts             | 155 +++++++------
 src/app/pages/home/home.component.html        |   4 +-
 src/app/pages/login/login.component.html      |   2 +-
 src/app/pages/login/login.component.ts        |   2 +-
 .../oil-station-info.component.html           | 100 +++++++-
 .../oil-station-info.component.ts             |  42 +++-
 src/app/pages/pages.module.ts                 |   8 +-
 .../plan-admin/plan-admin.component.html      |  38 +--
 .../pages/plan-admin/plan-admin.component.ts  | 113 +++++++--
 .../today-warning-admin.component.html        |  36 ++-
 .../today-warning-admin.component.scss        |   9 +-
 .../today-warning-admin.component.ts          |  40 +++-
 .../warning-details.component.html            |   0
 .../warning-details.component.scss            |   0
 .../warning-details.component.spec.ts         |  25 --
 .../warning-details.component.ts              |  15 --
 .../today-warning.component.html              |  12 +-
 .../today-warning.component.scss              |   9 +-
 .../today-warning/today-warning.component.ts  |  13 +-
 .../analysis-of-the-host.component.ts         |   7 +-
 .../organization/organization.component.ts    |   7 +-
 src/assets/images/level4.png                  | Bin 0 -> 8001 bytes
 src/theme.less                                |  17 +-
 26 files changed, 617 insertions(+), 343 deletions(-)
 delete mode 100644 src/app/pages/today-warning-admin/warning-details/warning-details.component.html
 delete mode 100644 src/app/pages/today-warning-admin/warning-details/warning-details.component.scss
 delete mode 100644 src/app/pages/today-warning-admin/warning-details/warning-details.component.spec.ts
 delete mode 100644 src/app/pages/today-warning-admin/warning-details/warning-details.component.ts
 create mode 100644 src/assets/images/level4.png

diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
index 7311c5f..36f92e9 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
@@ -3,30 +3,32 @@
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="level" formControlName="level" nzPlaceHolder="请选择级别">
+          <nz-select id="level" formControlName="level" nzPlaceHolder="请选择预警级别">
             <nz-option nzValue="1" nzLabel="一级"></nz-option>
             <nz-option nzValue="2" nzLabel="二级"></nz-option>
             <nz-option nzValue="3" nzLabel="三级"></nz-option>
+            <nz-option nzValue="4" nzLabel="四级"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="type" formControlName="type" nzPlaceHolder="请选择事件类型">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
+          <nz-select id="type" formControlName="type" nzPlaceHolder="请选择预警类型">
+            <nz-option *ngFor="let item of warningTypes" [nzValue]="item.key" [nzLabel]="item.key"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="site" formControlName="site" nzPlaceHolder="请选择地点">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
+          <nz-select id="site" formControlName="site" nzPlaceHolder="请选择站内发生区域">
+            <nz-option nzValue="出入口" nzLabel="出入口"></nz-option>
+            <nz-option nzValue="加油区" nzLabel="加油区"></nz-option>
+            <nz-option nzValue="油罐区" nzLabel="油罐区"></nz-option>
+            <nz-option nzValue="便利店" nzLabel="便利店"></nz-option>
+            <nz-option nzValue="办公区" nzLabel="办公区"></nz-option>
+            <nz-option nzValue="其他区域" nzLabel="其他区域"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
@@ -61,7 +63,7 @@
         <div class="leftbox">
           <span class="chartname">
             <img src="../../../assets/images/flower.png" alt="">
-            预警事件统计
+            预警类别统计
           </span>
           <div class="centerContent">
             <div class="numname">预警事件总数</div>
@@ -74,7 +76,7 @@
         <div class="rightbox">
           <span class="chartname">
             <img src="../../../assets/images/flower.png" alt="">
-            预警趋势
+            近一个月预警统计
           </span>
           <div class="btnbox">
             <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('站点排名')"
@@ -97,17 +99,20 @@
     <div class="tablebox">
       <div class="table">
         <div nz-row class="th">
-          <div nz-col nzSpan="2" style="box-sizing: border-box;padding-left: 18px;">
-            事件级别
+          <div nz-col nzSpan="1" style="text-align: right;">
+           
           </div>
-          <div nz-col nzSpan="4">
-            事件类型
+          <div nz-col nzSpan="2">
+            预警级别
+          </div>
+          <div nz-col nzSpan="3">
+            预警类型
           </div>
           <div nz-col nzSpan="4">
             所属公司
           </div>
           <div nz-col nzSpan="2">
-            区域
+            管理区域
           </div>
           <div nz-col nzSpan="1">
 
@@ -116,7 +121,7 @@
             加油站
           </div>
           <div nz-col nzSpan="3">
-            摄像头
+            预警区域
           </div>
           <div nz-col nzSpan="3">
             预警时间
@@ -125,12 +130,15 @@
             操作
           </div>
         </div>
-        <div class="tbody">
+        <div class="tbody" id="tbody">
           <div nz-row class="tr" *ngFor="let item of list">
-            <div nz-col nzSpan="2" style="box-sizing: border-box;padding-left: 18px;">
+            <div nz-col nzSpan="1" style="text-align: right;">
+              <img style="width: 36px;" src="../../../assets/images/level1.png" alt="">
+            </div>
+            <div nz-col nzSpan="2">
               Ⅰ级
             </div>
-            <div nz-col nzSpan="4">
+            <div nz-col nzSpan="3">
               日常预警行为
             </div>
             <div nz-col nzSpan="4">
@@ -140,13 +148,13 @@
               山东-淄博
             </div>
             <div nz-col nzSpan="1" style="text-align: right;box-sizing: border-box;padding-right: 8px;">
-              自营
+              <span class="ziying">自营</span>  
             </div>
             <div nz-col nzSpan="4">
               中化山东省淄博市第6加油站
             </div>
             <div nz-col nzSpan="3">
-              加油区2号摄像头
+              便利店
             </div>
             <div nz-col nzSpan="3">
               2021-10-12  09:28:13
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
index bb4723c..8d024e8 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
@@ -1,7 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Component, ElementRef, OnInit } 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';
 @Component({
   selector: 'app-criminal-records-admin',
   templateUrl: './criminal-records-admin.component.html',
@@ -10,11 +14,72 @@ import * as echarts from 'echarts';
 export class CriminalRecordsAdminComponent implements OnInit {
 
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder, private router: Router) { }
-
-
-
-  mybarChart: any //柱状图
+  constructor(private element: ElementRef, private http: HttpClient, private fb: FormBuilder, private router: Router) { }
+  //饼图
+  myChart
+  option = {
+    color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'],
+    tooltip: {
+      trigger: 'item'//触发类型
+    },
+    series: [
+      {
+        // name: 'Access From',
+        type: 'pie',
+        radius: [85, 112],//内半径外，外半径
+        left: '-30%',
+        avoidLabelOverlap: false,//防止标签重叠策略
+        label: {//每一个标签外网延伸的引导说明
+          show: false,
+          position: 'outside'
+        },
+        labelLine: {//引导线
+          show: true,
+          showAbove: true
+        },
+        emphasis: {//中间高亮区域
+          label: {
+            show: false,
+            fontSize: '40',
+            fontWeight: 'bold'
+          }
+        },
+        data: [
+          { value: 26, name: '工作人员倚靠加油机或者立柱1' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱2' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱3' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱4' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱5' },
+          { value: 26, name: '工作人员倚靠加油机或者立柱6' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱7' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱8' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱9' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱10' },
+          { value: 26, name: '工作人员倚靠加油机或者立柱11' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱12' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱13' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱14' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱15' },
+          { value: 26, name: '工作人员倚靠加油机或者立柱16' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱17' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱18' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱19' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱20' }
+        ],
+        tooltip: {//鼠标移入提示
+          position: 'right',
+          padding: [14, 19],
+          backgroundColor: 'rgba(28, 129, 218, 0.4)',
+          textStyle: {
+            color: '#fff',
+            fontSize: 12
+          }
+        }
+      }
+    ]
+  };
+  //柱状图
+  mybarChart: any
   baroption = {
     xAxis: {
       type: 'category',
@@ -76,6 +141,9 @@ export class CriminalRecordsAdminComponent implements OnInit {
         type: 'line',
         symbol: 'circle',
         symbolSize: 8,
+        label: {
+          show: true
+        },
         itemStyle: {
           color: '#fff',
           shadowColor: '#fff',
@@ -101,7 +169,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
     },
     yAxis: {
       type: 'category',
-      data: ['北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站'],
+      data: ['北京市第十九加油站1', '北京市第十九加油站2', '北京市第十九加油站3', '北京市第十九加油站4', '北京市第十九加油站5', '北京市第十九加油站6', '北京市第十九加油站7', '北京市第十九加油站8', '北京市第十九加油站9', '北京市第十九加油站10', '北京市第十九加油站11', '北京市第十九加油站12', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站', '北京市第十九加油站20', '北京市第十九加油站21', '北京市第十九加油站22', '北京市第十九加油站23'],
       axisLine: {
         show: false,
         lineStyle: {
@@ -132,7 +200,8 @@ export class CriminalRecordsAdminComponent implements OnInit {
             shadowColor: "#fff"
           }
         }
-      }
+      },
+      inverse: true
 
     },
     series:
@@ -144,9 +213,9 @@ export class CriminalRecordsAdminComponent implements OnInit {
         color: "#fff",
         fontSize: 12,
         formatter: '{c}',
-        offset:[6,0]
+        offset: [6, 0]
       },
-      data: [40, 36, 30, 25, 19, 15, 14, 11, 10, 8].reverse(),
+      data: [40, 36, 30, 25, 19, 15, 14, 11, 10, 8, 40, 36, 30, 25, 19, 15, 14, 11, 10, 8, 1, 2, 3].reverse(),
       type: 'bar',
       itemStyle: {
         color: {
@@ -168,11 +237,35 @@ export class CriminalRecordsAdminComponent implements OnInit {
     }
     ,
     grid: {
-      left: '138px',
-      right: '60px',
+      left: '150px',
+      right: '80px',
       bottom: '3px',
       top: '20px'
-    }
+    },
+    dataZoom: [                  //Y轴滑动条
+      {
+        type: 'slider', //滑动条
+        show: true,      //开启
+        yAxisIndex: 0,//表示控制第几个y轴
+        left: '97%',  //滑动条位置
+        start: 1,    //初始化时，滑动条宽度开始标度
+        end: 100,    //初始化时，滑动条宽度结束标度<br>   
+        maxValueSpan: 10,//显示数据的条数(默认显示10个)
+        showDataShadow: false,//是否显示数据阴影 默认auto
+        showDetail: false,//即拖拽时候是否显示详细数值信息 默认true
+        realtime: true, //是否实时更新
+        filterMode: 'filter',
+        backgroundColor:'#001735',
+        width:'18'
+      },
+      {
+        type:'inside',
+        yAxisIndex:0,
+        zoomOnMouseWheel:false,  //滚轮是否触发缩放
+        moveOnMouseMove:true,  //鼠标滚轮触发滚动
+        moveOnMouseWheel:true
+      }
+    ]
   }
   ngOnInit(): void {
     this.validateForm = this.fb.group({
@@ -182,75 +275,23 @@ export class CriminalRecordsAdminComponent implements OnInit {
       datePicker: [null]
     });
 
-    // 基于准备好的dom，初始化echarts实例
-    let myChart = echarts.init(document.getElementById('piechart'));
-    let option = {
-      color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'],
-      tooltip: {
-        trigger: 'item'//触发类型
-      },
-      series: [
-        {
-          // name: 'Access From',
-          type: 'pie',
-          radius: [85, 112],//内半径外，外半径
-          left: '-30%',
-          avoidLabelOverlap: false,//防止标签重叠策略
-          label: {//每一个标签外网延伸的引导说明
-            show: false,
-            position: 'outside'
-          },
-          labelLine: {//引导线
-            show: true,
-            showAbove: true
-          },
-          emphasis: {//中间高亮区域
-            label: {
-              show: false,
-              fontSize: '40',
-              fontWeight: 'bold'
-            }
-          },
-          data: [
-            { value: 26, name: '工作人员倚靠加油机或者立柱1' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱2' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱3' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱4' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱5' },
-            { value: 26, name: '工作人员倚靠加油机或者立柱6' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱7' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱8' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱9' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱10' },
-            { value: 26, name: '工作人员倚靠加油机或者立柱11' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱12' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱13' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱14' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱15' },
-            { value: 26, name: '工作人员倚靠加油机或者立柱16' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱17' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱18' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱19' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱20' }
-          ],
-          tooltip: {//鼠标移入提示
-            position: 'right',
-            padding: [14, 19],
-            backgroundColor: 'rgba(28, 129, 218, 0.4)',
-            textStyle: {
-              color: '#fff',
-              fontSize: 12
-            }
-          }
-        }
-      ]
-    };
-    // 绘制图表
-    myChart.setOption(option);
-
+    //饼图
+    this.myChart = echarts.init(document.getElementById('piechart'));
+    this.myChart.setOption(this.option);
+    //柱状折线图
     this.mybarChart = echarts.init(document.getElementById('barchart'));
-
     this.mybarChart.setOption(this.baroption);
+
+    this.warningType()
+  }
+
+
+  ngAfterViewInit(): void {
+    fromEvent(this.element.nativeElement.querySelector(`#tbody`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe((event: any) => { //监听 DOM 滚动事件
+      if (event.target.scrollHeight - (event.target.scrollTop + event.target.clientHeight) <= 10) {
+        console.log('需要加载数据了', event)
+      }
+    });
   }
   getThirtyDays() {
     //获取当前日期
@@ -301,7 +342,15 @@ export class CriminalRecordsAdminComponent implements OnInit {
     }
   }
 
-
+  //预警类型接口
+  warningTypes: any //预警接口数据
+  warningTypesDetails: any
+  warningType() {
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+      this.warningTypesDetails = data.result
+      this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });
+    })
+  }
   list: any = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
   look() {
     this.router.navigate(['/records/petrolStation'])
@@ -314,12 +363,12 @@ export class CriminalRecordsAdminComponent implements OnInit {
     this.selectedType = type
     this.mybarChart.dispose()
     this.mybarChart = echarts.init(document.getElementById('barchart'));
-    if(type == '排名'){
+    if (type == '排名') {
       this.mybarChart.setOption(this.baroption2);
-    }else{
+    } else {
       this.mybarChart.setOption(this.baroption);
     }
-    
+
   }
   echartClick2(type) {
     this.selectedRankingType = type
diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html
index 815a2fb..a457144 100644
--- a/src/app/pages/criminal-records/criminal-records.component.html
+++ b/src/app/pages/criminal-records/criminal-records.component.html
@@ -3,30 +3,32 @@
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="level" formControlName="level" nzPlaceHolder="请选择级别">
+          <nz-select formControlName="level" nzPlaceHolder="请选择预警级别">
             <nz-option nzValue="1" nzLabel="一级"></nz-option>
             <nz-option nzValue="2" nzLabel="二级"></nz-option>
             <nz-option nzValue="3" nzLabel="三级"></nz-option>
+            <nz-option nzValue="4" nzLabel="四级"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="type" formControlName="type" nzPlaceHolder="请选择事件类型">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
+          <nz-select formControlName="type" nzPlaceHolder="请选择预警类型">
+            <nz-option *ngFor="let item of warningTypes" [nzValue]="item.key" [nzLabel]="item.key"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="site" formControlName="site" nzPlaceHolder="请选择地点">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
+          <nz-select formControlName="site" nzPlaceHolder="请选择站内发生区域">
+            <nz-option nzValue="出入口" nzLabel="出入口"></nz-option>
+            <nz-option nzValue="加油区" nzLabel="加油区"></nz-option>
+            <nz-option nzValue="油罐区" nzLabel="油罐区"></nz-option>
+            <nz-option nzValue="便利店" nzLabel="便利店"></nz-option>
+            <nz-option nzValue="办公区" nzLabel="办公区"></nz-option>
+            <nz-option nzValue="其他区域" nzLabel="其他区域"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
@@ -61,7 +63,7 @@
         <div class="leftbox">
           <span class="chartname">
             <img src="../../../assets/images/flower.png" alt="">
-            预警事件统计
+            预警类别统计
           </span>
           <div class="centerContent">
             <div class="numname">预警事件总数</div>
@@ -74,7 +76,7 @@
         <div class="rightbox">
           <span class="chartname">
             <img src="../../../assets/images/flower.png" alt="">
-            预警趋势
+            近一个月预警统计
           </span>
           <div class="btnbox">
             <!-- <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('站点排名')"
@@ -97,7 +99,9 @@
     <div class="tablebox">
       <div class="table">
         <div nz-row class="th">
-          <div nz-col nzSpan="4" style="box-sizing: border-box;padding-left: 6%;">
+          <div nz-col nzSpan="1">
+          </div>
+          <div nz-col nzSpan="3">
             预警级别
           </div>
           <div nz-col nzSpan="5">
@@ -107,7 +111,7 @@
             预警信息
           </div>
           <div nz-col nzSpan="4">
-            摄像头
+            预警区域
           </div>
           <div nz-col nzSpan="4">
             预警时间
@@ -118,7 +122,10 @@
         </div>
         <div class="tbody">
           <div nz-row class="tr" *ngFor="let item of list">
-            <div nz-col nzSpan="4" style="box-sizing: border-box;padding-left: 6%;">
+            <div nz-col nzSpan="1" style="text-align: right;">
+              <img style="width: 36px;" src="../../../assets/images/level1.png" alt="">
+            </div>
+            <div nz-col nzSpan="3">
               Ⅰ级
             </div>
             <div nz-col nzSpan="5">
@@ -128,7 +135,7 @@
               工作人员倚靠加油机或立柱
             </div>
             <div nz-col nzSpan="4">
-              加油区2号摄像头
+              便利店
             </div>
             <div nz-col nzSpan="4">
               2021-10-12 09:28:13
diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts
index a20a60a..e80e752 100644
--- a/src/app/pages/criminal-records/criminal-records.component.ts
+++ b/src/app/pages/criminal-records/criminal-records.component.ts
@@ -1,3 +1,4 @@
+import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import * as echarts from 'echarts';
@@ -8,7 +9,72 @@ import * as echarts from 'echarts';
 })
 export class CriminalRecordsComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder) { }
+  constructor(private http: HttpClient, private fb: FormBuilder) { }
+
+  myChart: any //左侧饼图
+  option = {
+    color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'],
+    tooltip: {
+      trigger: 'item'//触发类型
+    },
+    series: [
+      {
+        // name: 'Access From',
+        type: 'pie',
+        radius: [85, 112],//内半径外，外半径
+        left: '-30%',
+        avoidLabelOverlap: false,//防止标签重叠策略
+        label: {//每一个标签外网延伸的引导说明
+          show: false,
+          position: 'outside'
+        },
+        labelLine: {//引导线
+          show: true,
+          showAbove: true
+        },
+        emphasis: {//中间高亮区域
+          label: {
+            show: false,
+            fontSize: '40',
+            fontWeight: 'bold'
+          }
+        },
+        data: [
+          { value: 26, name: '工作人员倚靠加油机或者立柱1' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱2' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱3' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱4' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱5' },
+          { value: 26, name: '工作人员倚靠加油机或者立柱6' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱7' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱8' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱9' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱10' },
+          { value: 26, name: '工作人员倚靠加油机或者立柱11' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱12' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱13' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱14' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱15' },
+          { value: 26, name: '工作人员倚靠加油机或者立柱16' },
+          { value: 86, name: '工作人员倚靠加油机或者立柱17' },
+          { value: 34, name: '工作人员倚靠加油机或者立柱18' },
+          { value: 55, name: '工作人员倚靠加油机或者立柱19' },
+          { value: 60, name: '工作人员倚靠加油机或者立柱20' }
+        ],
+        tooltip: {//鼠标移入提示
+          position: 'right',
+          padding: [14, 19],
+          backgroundColor: 'rgba(28, 129, 218, 0.4)',
+          textStyle: {
+            color: '#fff',
+            fontSize: 12
+          }
+        }
+      }
+    ]
+  };
+
+
   mybarChart: any //柱状图
   baroption = {
     xAxis: {
@@ -71,6 +137,9 @@ export class CriminalRecordsComponent implements OnInit {
         type: 'line',
         symbol: 'circle',
         symbolSize: 8,
+        label: {
+          show: true
+        },
         itemStyle: {
           color: '#fff',
           shadowColor: '#fff',
@@ -210,75 +279,14 @@ export class CriminalRecordsComponent implements OnInit {
       site: [null],
       datePicker: [null]
     });
-    // 基于准备好的dom，初始化echarts实例
-    let myChart = echarts.init(document.getElementById('piechart'));
-    let option = {
-      color: ['#FF4B65', '#23D9FF', '#608AFF', '#B2FF6D', '#FFFF99', '#C4E2FC', '#FF7F00', '#0090FF', '#FFD634', '#105597', '#FF4B65', '#23D9FF', '#71FFF5', '#B2FF6D'],
-      tooltip: {
-        trigger: 'item'//触发类型
-      },
-      series: [
-        {
-          // name: 'Access From',
-          type: 'pie',
-          radius: [85, 112],//内半径外，外半径
-          left: '-30%',
-          avoidLabelOverlap: false,//防止标签重叠策略
-          label: {//每一个标签外网延伸的引导说明
-            show: false,
-            position: 'outside'
-          },
-          labelLine: {//引导线
-            show: true,
-            showAbove: true
-          },
-          emphasis: {//中间高亮区域
-            label: {
-              show: false,
-              fontSize: '40',
-              fontWeight: 'bold'
-            }
-          },
-          data: [
-            { value: 26, name: '工作人员倚靠加油机或者立柱1' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱2' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱3' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱4' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱5' },
-            { value: 26, name: '工作人员倚靠加油机或者立柱6' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱7' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱8' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱9' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱10' },
-            { value: 26, name: '工作人员倚靠加油机或者立柱11' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱12' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱13' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱14' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱15' },
-            { value: 26, name: '工作人员倚靠加油机或者立柱16' },
-            { value: 86, name: '工作人员倚靠加油机或者立柱17' },
-            { value: 34, name: '工作人员倚靠加油机或者立柱18' },
-            { value: 55, name: '工作人员倚靠加油机或者立柱19' },
-            { value: 60, name: '工作人员倚靠加油机或者立柱20' }
-          ],
-          tooltip: {//鼠标移入提示
-            position: 'right',
-            padding: [14, 19],
-            backgroundColor: 'rgba(28, 129, 218, 0.4)',
-            textStyle: {
-              color: '#fff',
-              fontSize: 12
-            }
-          }
-        }
-      ]
-    };
-    // 绘制图表
-    myChart.setOption(option);
-
+    // 饼图
+    this.myChart = echarts.init(document.getElementById('piechart'));
+    this.myChart.setOption(this.option);
+    //柱状折线图
     this.mybarChart = echarts.init(document.getElementById('barchart'));
-
     this.mybarChart.setOption(this.baroption);
+
+    this.warningType()
   }
   submitForm(): void {
     for (const i in this.validateForm.controls) {
@@ -298,6 +306,17 @@ export class CriminalRecordsComponent implements OnInit {
   }
 
 
+  //预警类型接口
+  warningTypes: any //预警接口数据
+  warningTypesDetails: any
+  warningType() {
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+      this.warningTypesDetails = data.result
+      this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });
+    })
+  }
+
+
   list: any = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 
   selectedType = '分布'
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index 4c4d150..6702563 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -4,7 +4,7 @@
     </div>
     <div class="menu">
         <li *ngIf="!isGasStationNav" [routerLink]="['/plan']" routerLinkActive="router-link-active">
-            数字站点
+            数字油站
         </li>
         <li *ngIf="!isGasStationNav" [routerLink]="['/warning']" routerLinkActive="router-link-active">
             今日预警
@@ -14,7 +14,7 @@
         </li>
 
         <li *ngIf="isGasStationNav" [routerLink]="['/plan/petrolStation']" routerLinkActive="router-link-active">
-            三维预案
+            数字油站
         </li>
         <li *ngIf="isGasStationNav" [routerLink]="['/warning/petrolStation']" routerLinkActive="router-link-active">
             今日预警
diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html
index 9b48d0d..db3fe0a 100644
--- a/src/app/pages/login/login.component.html
+++ b/src/app/pages/login/login.component.html
@@ -52,7 +52,7 @@
 
   <div class="name">
     <img src="../../../assets/images/logo.png" alt="">
-    <h1>中化油站</h1>
+    <h1>中化石油</h1>
     <h1>智能安全管理系统</h1>
   </div>
 
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 60788b3..2252ca7 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -115,7 +115,7 @@ export class LoginComponent implements OnInit {
           } else {
             if (data.result.user.organization.isGasStation) {
               sessionStorage.setItem("isGasStation", 'true');
-              this.router.navigate(['/plan/petrolStation'])
+              this.router.navigate(['/warning/petrolStation'])
             } else {
               sessionStorage.setItem("isGasStation", 'false');
               this.router.navigate(['/plan'])
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
index 6491aa9..816d689 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.html
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -66,6 +66,95 @@
                 </nz-form-item>
               </td>
             </tr>
+            <tr>
+              <td class="head">区域</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.locationName" nz-input type="text" formControlName="locationName" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+              <td class="head">所属公司</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.companyName" nz-input type="text" formControlName="companyName" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+            </tr>
+            <tr>
+              <td class="head">联系人</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.leaderName" nz-input type="text" formControlName="leaderName" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+              <td class="head">联系电话</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.leaderContact" nz-input type="text"
+                        formControlName="leaderContact" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+            </tr>
+            <tr>
+              <td class="head">油站等级</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.stationLevel" nz-input type="text" formControlName="stationLevel" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+              <td class="head">经营品种</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.sellVariety" nz-input type="text" formControlName="sellVariety" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+            </tr>
+            <tr>
+              <td class="head">油机数量</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.gasStationCount" nz-input type="text" formControlName="gasStationCount" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+              <td class="head">油罐容积</td>
+              <td class="text">
+                <nz-form-item>
+                  <nz-form-control>
+                    <nz-input-group>
+                      <input [(ngModel)]="httpBody.tankVolume" nz-input type="text" formControlName="tankVolume" />
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </td>
+            </tr>
           </table>
           <table formGroupName="policeStation">
             <tr>
@@ -106,7 +195,8 @@
                 <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
-                      <input [(ngModel)]="policeStation.contactInformation" nz-input type="text" formControlName="contactInformation" />
+                      <input [(ngModel)]="policeStation.contactInformation" nz-input type="text"
+                        formControlName="contactInformation" />
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -152,7 +242,8 @@
                 <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
-                      <input [(ngModel)]="hospital.contactInformation" nz-input type="text" formControlName="contactInformation" />
+                      <input [(ngModel)]="hospital.contactInformation" nz-input type="text"
+                        formControlName="contactInformation" />
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -198,7 +289,8 @@
                 <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
-                      <input [(ngModel)]="fireBrigade.contactInformation" nz-input type="text" formControlName="contactInformation" />
+                      <input [(ngModel)]="fireBrigade.contactInformation" nz-input type="text"
+                        formControlName="contactInformation" />
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -272,7 +364,7 @@
           </table>
         </div>
         <div class="btnbox">
-          <button  [nzLoading]="isLoadingSave" nz-button type="submit">保存</button>
+          <button [nzLoading]="isLoadingSave" nz-button type="submit">保存</button>
           <button nz-button type="button"><img style="vertical-align: top;margin-right: 6px;"
               src="../../../assets/images/excel.png" alt=""> 导出Excel</button>
         </div>
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
index 0b917eb..98d8c61 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.ts
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -26,7 +26,15 @@ export class OilStationInfoComponent implements OnInit {
         oilStationType: [null],
         laneNumber: [null],
         address: [null],
-        validityTime: [null, [Validators.required]]//营业执照有效期
+        validityTime: [null, [Validators.required]],//营业执照有效期
+        locationName: [null],
+        companyName: [null],
+        leaderName: [null],
+        leaderContact: [null],
+        stationLevel: [null],
+        sellVariety: [null],
+        gasStationCount: [null],
+        tankVolume: [null],
       }),
       policeStation: this.fb.group({
         name: [null],
@@ -66,16 +74,20 @@ export class OilStationInfoComponent implements OnInit {
       }
     }).subscribe((data: any) => {
       console.log('油站信息', data)
-      this.httpBody = data.result
-      this.httpBody.govUnitDetail = JSON.parse(data.result.govUnitDetail)
-      this.policeStation = data.result.govUnitDetail.policeStation
-      this.hospital = data.result.govUnitDetail.hospital
-      this.fireBrigade = data.result.govUnitDetail.fireBrigade
-      this.httpBody.stationType = String(this.httpBody.stationType)
-      this.validityTime[0] = data.result.validityStartTime
-      this.validityTime[1] = data.result.validityEndTime
-      this.validityTime = [...this.validityTime]
-      console.log(this.validityTime)
+
+      if (this.httpBody.govUnitDetail) {
+        this.httpBody = data.result
+        this.httpBody.govUnitDetail = JSON.parse(data.result.govUnitDetail)
+        this.policeStation = data.result.govUnitDetail.policeStation
+        this.hospital = data.result.govUnitDetail.hospital
+        this.fireBrigade = data.result.govUnitDetail.fireBrigade
+        this.httpBody.stationType = String(this.httpBody.stationType)
+        this.validityTime[0] = data.result.validityStartTime
+        this.validityTime[1] = data.result.validityEndTime
+        this.validityTime = [...this.validityTime]
+      } else {
+        this.httpBody.id = data.result.id
+      }
       setTimeout(() => {
         this.gallery = new Viewer(document.getElementById('images'), {
           show: () => {  // 动态加载图片后，更新实例
@@ -119,6 +131,14 @@ export class OilStationInfoComponent implements OnInit {
     stationType: '',
     laneCount: '',
     address: '',
+    locationName: '',
+    companyName: '',
+    leaderName: '',
+    leaderContact: '',
+    stationLevel: '',
+    sellVariety: '',
+    gasStationCount: '',
+    tankVolume: '',
     govUnitDetail: {
       policeStation: {},
       hospital: {},
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 0a9396d..c30a97f 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -42,14 +42,13 @@ import { EditequipmentComponent } from './equipment-info/editequipment/editequip
 import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
 import { PlanAdminComponent } from './plan-admin/plan-admin.component';
 import { GetOutOfLineDetailsComponent } from './today-warning/get-out-of-line-details/get-out-of-line-details.component';
-import { WarningDetailsComponent } from './today-warning-admin/warning-details/warning-details.component';
 import { NzTableModule } from 'ng-zorro-antd/table';
 import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
-
+import { NzTimePickerModule } from 'ng-zorro-antd/time-picker';
 @NgModule({
   declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, 
     TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, 
-    AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent, WarningDetailsComponent],
+    AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent],
 
 
   imports: [
@@ -83,7 +82,8 @@ import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
     NzCollapseModule,
     NzStepsModule,
     NzTableModule,
-    NzCheckboxModule
+    NzCheckboxModule,
+    NzTimePickerModule
   ],
   entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html
index 941d2d1..8039995 100644
--- a/src/app/pages/plan-admin/plan-admin.component.html
+++ b/src/app/pages/plan-admin/plan-admin.component.html
@@ -5,7 +5,7 @@
       <app-title [name]="'组织机构'"></app-title>
     </div>
     <div class="or">
-      <nz-tree [nzExpandedKeys]="nzExpandedKeys" [nzShowExpand]="false" #nzTreeComponent [nzExpandAll]="nzExpandAll"
+      <nz-tree [nzExpandedKeys]="nzExpandedKeys" [nzSelectedKeys]="nzSelectedKeys" [nzShowExpand]="false" #nzTreeComponent [nzExpandAll]="nzExpandAll"
         nzBlockNode [nzData]="nodes" (nzClick)="activeNode($event)" [nzTreeTemplate]="nzTreeTemplate"
         [nzMultiple]="false"></nz-tree>
       <ng-template #nzTreeTemplate let-node let-origin="origin">
@@ -50,9 +50,9 @@
         </nz-form-item>
       </form>
     </div>
-    <div class="tablebox">
+    <div class="tablebox" id="tablebox">
 
-      <nz-table #basicTable [nzData]="list" [nzShowPagination]="false">
+      <nz-table [nzPageSize]='999' #headerTable [nzData]="list" [nzShowPagination]="false"  [nzScroll]="{ y:tableheight() }">
         <thead>
           <tr>
             <th style="text-align: center;">加油站名称</th>
@@ -68,30 +68,32 @@
             <th>操作</th>
           </tr>
         </thead>
-        <tbody>
-          <tr *ngFor="let data of basicTable.data">
-            <th style="text-align: center;">加油站名称</th>
-            <th>区域</th>
-            <th>所属公司</th>
-            <th>联系人</th>
-            <th>联系电话</th>
-            <th>油站等级</th>
-            <th>经营品类</th>
-            <th>油机数量</th>
-            <th>车道数量</th>
-            <th>油罐容积</th>
-            <th class="look" (click)="look()" style="cursor:pointer;color: #36A2FF">查看</th>
+        <tbody id="table">
+          <tr *ngFor="let item of headerTable.data;let key = index">
+            <th style="text-align: center;">{{item.stationName}}</th>
+            <th>{{item.locationName}}</th>
+            <th>{{item.companyName}}</th>
+            <th>{{item.leaderName}}</th>
+            <th>{{item.leaderContact}}</th>
+            <th>{{item.stationLevel}}</th>
+            <th>{{item.sellVariety}}</th>
+            <th>{{item.gasStationCount}}</th>
+            <th>{{item.laneCount}}</th>
+            <th>{{item.tankVolume}}</th>
+            <th>
+              <span class="look" (click)="look()" style="cursor:pointer;color: #36A2FF">查看</span>
+            </th>
           </tr>
         </tbody>
       </nz-table>
 
 
-
+<!-- 
       <div class="pagination">
         <nz-pagination [nzPageIndex]="1" [nzTotal]="85" [nzPageSize]="20" [nzShowTotal]="totalTemplate"
           nzShowQuickJumper></nz-pagination>
         <ng-template #totalTemplate let-total> 16条/页,共100条 </ng-template>
-      </div>
+      </div> -->
     </div>
   </div>
 </div>
diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts
index 8ecf84e..ec73cbf 100644
--- a/src/app/pages/plan-admin/plan-admin.component.ts
+++ b/src/app/pages/plan-admin/plan-admin.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { TreeService } from 'src/app/service/tree.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -6,6 +6,8 @@ import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dro
 import { NzFormatEmitEvent, NzTreeComponent, NzTreeNode } from 'ng-zorro-antd/tree';
 import { Router } from '@angular/router';
 import { NavChangeService } from 'src/app/service/navChange.service';
+import { fromEvent } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 @Component({
   selector: 'app-plan-admin',
   templateUrl: './plan-admin.component.html',
@@ -14,21 +16,44 @@ import { NavChangeService } from 'src/app/service/navChange.service';
 export class PlanAdminComponent implements OnInit {
   validateForm!: FormGroup;
   @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
-  constructor(private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { }
-  list: any = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+  constructor(private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { }
+  list: any = []
+
+  tableHeight
   ngOnInit(): void {
     this.validateForm = this.fb.group({
-      name: [null],
-      linkman: [null],
-      phone: [null]
+      name: [null]
     });
     this.getAllOrganization()
+
+  }
+
+  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) {
+        console.log('需要加载数据了', event)
+        this.SkipCount += 100
+        await this.getGasStation()
+      }
+    });
   }
   submitForm(): void {
     for (const i in this.validateForm.controls) {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
     }
+    let params = {
+      StationName: this.validateForm.value.name,
+      OrganizationUnitId: String(this.OrganizationUnitId),
+      IsContainsChildren: 'true',
+      SkipCount: '0',
+      MaxResultCount: this.MaxResultCount
+    }
+    this.http.get('/api/services/app/GasStation/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
+      this.list = [...data.result.items]
+    })
   }
   resetForm(e: MouseEvent): void {
     e.preventDefault();
@@ -37,21 +62,40 @@ export class PlanAdminComponent implements OnInit {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
     }
+    let params = {
+      StationName: this.validateForm.value.name,
+      OrganizationUnitId: String(this.OrganizationUnitId),
+      IsContainsChildren: 'true',
+      SkipCount: '0',
+      MaxResultCount: this.MaxResultCount
+    }
+    this.http.get('/api/services/app/GasStation/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
+      this.list = [...data.result.items]
+    })
   }
   //获取所有组织机构
   nodes: any = []
   nzExpandAll = false
+  nzSelectedKeys: any = []
   getAllOrganization() {
+    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: "false"
+    }
     this.http.get('/api/services/app/Organization/GetAll', {
-      params: {
-        SkipCount: '0',
-        MaxResultCount: '9999'
-      }
+      params: params
     }).subscribe((data: any) => {
-
-      data.result.items = data.result.items.filter((item, i) => {
-        return !item.isGasStation 
-      })
+      data.result.items.forEach(element => {
+        if (element.id == OrganizationUnitId) {
+          element.parentId = null
+        }
+      });
+      // data.result.items = data.result.items.filter((item, i) => {
+      //   return !item.isGasStation
+      // })
       for (let index = 0; index < data.result.items.length; index++) {
         const element = data.result.items[index];
         element.key = element.id
@@ -59,26 +103,63 @@ export class PlanAdminComponent implements OnInit {
       }
 
       this.nodes = [...this.toTree.toTree(data.result.items)]
+      this.nzSelectedKeys = [OrganizationUnitId]
+      this.OrganizationUnitId = OrganizationUnitId
       this.nzExpandAll = true
+      this.getGasStation()
     })
   }
 
+
+  tableheight() {
+    return (document.getElementById('tablebox').clientHeight - 42) + 'px'
+  }
+
   look() {
     this.router.navigate(['/plan/petrolStation'])
-
     let obj = {
       name: 'oilstation'
     }
     this.navChangeService.sendMessage(obj);//发布一条消息
   }
+
   nzExpandedKeys: any = []
   activatedNode?: NzTreeNode;
   //点击tree节点
   activeNode(data: NzFormatEmitEvent): void {
     this.activatedNode = data.node!;
-    // console.log(data)
+    console.log(data)
+    this.OrganizationUnitId = data.node.origin.id
+    this.getGasStation()
+  }
+
+
+  //获取点击组织机构的所有加油站
+  SkipCount: string = '0'
+  MaxResultCount: string = '100'
+  OrganizationUnitId: any
+  async getGasStation() {
+    let params = {
+      StationName: this.validateForm.value.name,
+      OrganizationUnitId: String(this.OrganizationUnitId),
+      IsContainsChildren: 'true',
+      SkipCount: this.SkipCount,
+      MaxResultCount: this.MaxResultCount
+    }
+    await new Promise((resolve, reject) => {
+      this.http.get('/api/services/app/GasStation/GetAll', {
+        params: params
+      }).subscribe((data: any) => {
+        this.list = this.list.concat(data.result.items);
+        this.list = [...this.list]
+        resolve(data)
+        console.log(999999, data)
+      })
+    })
   }
 
+
+
   expand(e, node) {
     e.stopPropagation()
     node.isExpanded = !node.isExpanded
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 27a0dfc..521910f 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
@@ -55,7 +55,13 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-range-picker formControlName="datePicker"></nz-range-picker>
+          <nz-time-picker nzPlaceHolder="请选择开始时间" formControlName="datePickerStart" nzFormat="HH:mm"></nz-time-picker>
+        </nz-form-control>
+      </nz-form-item>
+      <i style="display: flex;align-items: center;color: #fff;" nz-icon nzType="swap-right" nzTheme="outline"></i>
+      <nz-form-item class="searchParams">
+        <nz-form-control>
+          <nz-time-picker nzPlaceHolder="请选择结束时间" formControlName="datePickerEnd" nzFormat="HH:mm"></nz-time-picker>
         </nz-form-control>
       </nz-form-item>
 
@@ -75,20 +81,26 @@
   </div>
   <div class="listbox">
     <div nz-row class="listitem listitemhead">
-      <div nz-col nzSpan="3" style="box-sizing: border-box;padding-left: 10px;">
+      <div nz-col nzSpan="2" style="box-sizing: border-box;padding-left: 10px;">
         预警级别
       </div>
       <div nz-col nzSpan="3">
         预警类型
       </div>
-      <div nz-col nzSpan="6">
-        预警事件
+      <div nz-col nzSpan="4">
+        预警信息
+      </div>
+      <div nz-col nzSpan="2">
+        所属公司
+      </div>
+      <div nz-col nzSpan="2">
+        管理区域
       </div>
       <div nz-col nzSpan="3">
         油站名称
       </div>
-      <div nz-col nzSpan="3">
-        区域
+      <div nz-col nzSpan="2">
+        预警区域
       </div>
       <div nz-col nzSpan="4">
         预警时间
@@ -98,7 +110,7 @@
       </div>
     </div>
     <div nz-row class="listitem" *ngFor="let item of list">
-      <div nz-col nzSpan="3">
+      <div nz-col nzSpan="2">
         <span *ngIf="item.violation.violationType == '卸油作业检查'">
           <img src="../../../assets/images/warning2.png">
         </span>
@@ -128,13 +140,19 @@
       <div nz-col nzSpan="3">
         {{item.violation.violationType}}
       </div>
-      <div nz-col nzSpan="6">
+      <div nz-col nzSpan="4">
         {{item.violation.violationName}}
       </div>
+      <div nz-col nzSpan="2">
+        {{item.gasStation.companyName}}
+      </div>
+      <div nz-col nzSpan="2">
+        {{item.gasStation.locationName}}
+      </div>
       <div nz-col nzSpan="3">
         {{item.gasStation.stationName}}
       </div>
-      <div nz-col nzSpan="3">
+      <div nz-col nzSpan="2">
         {{item.violateArea}}
       </div>
       <div nz-col nzSpan="4">
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.scss b/src/app/pages/today-warning-admin/today-warning-admin.component.scss
index 2d1bdf1..76334d8 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.scss
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.scss
@@ -27,7 +27,7 @@
       justify-content: space-around;
 
       .searchParams {
-        width: 14.6%;
+        width: 12.5%;
       }
 
       .btn {
@@ -41,12 +41,7 @@
       nz-tree-select{
         color: rgba(145, 204, 255, 0.95);
       }
-
-      nz-date-picker {
-        background-color: rgba(0, 0, 0, 0);
-        width: 145%;
-      }
-      nz-range-picker {
+      nz-time-picker {
         background-color: rgba(0, 0, 0, 0);
         width: 100%;
       }
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
index 51e5ec4..5ddb301 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
@@ -29,7 +29,8 @@ export class TodayWarningAdminComponent implements OnInit {
       event: [null],
       organization: [null],
       area: [null],
-      datePicker: [null]
+      datePickerStart: [new Date(`${moment(new Date()).format('YYYY-MM-DD')} 00:00`)],
+      datePickerEnd: [new Date(`${moment(new Date()).format('YYYY-MM-DD')} 23:59`)]
     });
     this.warningType()
     this.getAllOrganization()
@@ -37,21 +38,21 @@ export class TodayWarningAdminComponent implements OnInit {
 
   //预警类型接口
   warningTypes: any //预警接口数据
-  warningTypesDetails:any
+  warningTypesDetails: any
   warningType() {
     this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
       this.warningTypesDetails = data.result
       this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });
     })
   }
-  typeChange(e){
+  typeChange(e) {
     this.warningTypes.forEach(element => {
-      if(element.key == e){
+      if (element.key == e) {
         this.warningTypesDetails = element
       }
     });
     this.validateForm.patchValue({
-      event: null, 
+      event: null,
     });
   }
 
@@ -59,8 +60,18 @@ export class TodayWarningAdminComponent implements OnInit {
   //获取所有组织机构
   nodes: any = []
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+    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
       });
@@ -78,20 +89,22 @@ export class TodayWarningAdminComponent implements OnInit {
   totalCount: string //预警总数    
   getEarlyWarningList() {
     let ViolationIds = []
-    if(this.validateForm.value.event){
+    if (this.validateForm.value.event) {
       ViolationIds.push(this.validateForm.value.event)
     }
-    if(this.validateForm.value.type && !this.validateForm.value.event){
+    if (this.validateForm.value.type && !this.validateForm.value.event) {
       this.warningTypesDetails.forEach(item => {
         item.id ? ViolationIds.push(item.id) : null
       });
     }
+
+    console.log(this.validateForm.value)
     let params = {
       Level: this.validateForm.value.level,
       ViolationIds: ViolationIds,
       ViolateArea: this.validateForm.value.area,
       organizationUnitId: this.validateForm.value.organization,
-      ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('YYYY-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('YYYY-MM-DD')] : null,
+      ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null,
       SkipCount: '0',
       MaxResultCount: '9999'
     }
@@ -110,7 +123,7 @@ export class TodayWarningAdminComponent implements OnInit {
         console.log('走这里了')
         this.navChangeService.sendMessage(obj);//发布一条消息
       }, 0);
-    
+
     })
   }
 
@@ -131,8 +144,11 @@ export class TodayWarningAdminComponent implements OnInit {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
     }
-    this.defaultOrId = JSON.parse(sessionStorage.getItem('userdata')).organization.id
-    this.validateForm.value.organization = this.defaultOrId
+    this.validateForm.patchValue({
+      organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+      datePickerStart: new Date(`${moment(new Date()).format('YYYY-MM-DD')} 00:00`),
+      datePickerEnd: new Date(`${moment(new Date()).format('YYYY-MM-DD')} 23:59`)
+    });
     this.getEarlyWarningList()
   }
 
diff --git a/src/app/pages/today-warning-admin/warning-details/warning-details.component.html b/src/app/pages/today-warning-admin/warning-details/warning-details.component.html
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/pages/today-warning-admin/warning-details/warning-details.component.scss b/src/app/pages/today-warning-admin/warning-details/warning-details.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/pages/today-warning-admin/warning-details/warning-details.component.spec.ts b/src/app/pages/today-warning-admin/warning-details/warning-details.component.spec.ts
deleted file mode 100644
index 3e13d28..0000000
--- a/src/app/pages/today-warning-admin/warning-details/warning-details.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WarningDetailsComponent } from './warning-details.component';
-
-describe('WarningDetailsComponent', () => {
-  let component: WarningDetailsComponent;
-  let fixture: ComponentFixture<WarningDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WarningDetailsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WarningDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/today-warning-admin/warning-details/warning-details.component.ts b/src/app/pages/today-warning-admin/warning-details/warning-details.component.ts
deleted file mode 100644
index bcb568b..0000000
--- a/src/app/pages/today-warning-admin/warning-details/warning-details.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-warning-details',
-  templateUrl: './warning-details.component.html',
-  styleUrls: ['./warning-details.component.scss']
-})
-export class WarningDetailsComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index e2959f9..3110598 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -38,7 +38,13 @@
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-range-picker formControlName="datePicker"></nz-range-picker>
+          <nz-time-picker nzPlaceHolder="请选择开始时间" formControlName="datePickerStart" nzFormat="HH:mm"></nz-time-picker>
+        </nz-form-control>
+      </nz-form-item>
+      <i style="display: flex;align-items: center;color: #fff;" nz-icon nzType="swap-right" nzTheme="outline"></i>
+      <nz-form-item class="searchParams">
+        <nz-form-control>
+          <nz-time-picker nzPlaceHolder="请选择结束时间" formControlName="datePickerEnd" nzFormat="HH:mm"></nz-time-picker>
         </nz-form-control>
       </nz-form-item>
 
@@ -88,10 +94,10 @@
         </span>
       </div>
       <div nz-col nzSpan="4">
-        事件类型: {{item.violation.violationType}}
+        预警类型: {{item.violation.violationType}}
       </div>
       <div nz-col nzSpan="5">
-        事件信息: {{item.violation.violationName}}
+        预警信息: {{item.violation.violationName}}
       </div>
       <div nz-col nzSpan="5">
         区域: {{item.violateArea}}
diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss
index 412dff8..1c6c02c 100644
--- a/src/app/pages/today-warning/today-warning.component.scss
+++ b/src/app/pages/today-warning/today-warning.component.scss
@@ -27,7 +27,7 @@
       justify-content: space-around;
 
       .searchParams {
-        width: 22%;
+        width: 17.5%;
       }
 
       .btn {
@@ -38,12 +38,7 @@
         color: rgba(145, 204, 255, 0.95);
       }
 
-      nz-date-picker {
-        background-color: rgba(0, 0, 0, 0);
-        width: 100%;
-      }
-
-      nz-range-picker {
+      nz-time-picker {
         background-color: rgba(0, 0, 0, 0);
         width: 100%;
       }
diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts
index 9dd0a96..32b412e 100644
--- a/src/app/pages/today-warning/today-warning.component.ts
+++ b/src/app/pages/today-warning/today-warning.component.ts
@@ -20,7 +20,8 @@ export class TodayWarningComponent implements OnInit {
       level: [null],
       type: [null],
       area: [null],
-      datePicker: [null]
+      datePickerStart: [new Date(`${moment(new Date()).format('YYYY-MM-DD')} 00:00`)],
+      datePickerEnd: [new Date(`${moment(new Date()).format('YYYY-MM-DD')} 23:59`)]
     });
     this.warningType()
     this.getEarlyWarningList()
@@ -50,7 +51,7 @@ export class TodayWarningComponent implements OnInit {
   totalCount: string //预警总数    
   getEarlyWarningList() {
     let ViolationIds = []
-    if(this.validateForm.value.type){
+    if (this.validateForm.value.type) {
       this.warningTypesDetails.forEach(item => {
         item.id ? ViolationIds.push(item.id) : null
       });
@@ -59,8 +60,8 @@ export class TodayWarningComponent implements OnInit {
       Level: this.validateForm.value.level,
       ViolationIds: ViolationIds,
       ViolateArea: this.validateForm.value.area,
-      organizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id  ,
-      ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('YYYY-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('YYYY-MM-DD')] : null,
+      organizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id,
+      ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null,
       SkipCount: '0',
       MaxResultCount: '9999'
     }
@@ -96,6 +97,10 @@ export class TodayWarningComponent implements OnInit {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
     }
+    this.validateForm.patchValue({
+      datePickerStart: new Date(`${moment(new Date()).format('YYYY-MM-DD')} 00:00`),
+      datePickerEnd: new Date(`${moment(new Date()).format('YYYY-MM-DD')} 23:59`)
+    });
     this.getEarlyWarningList()
   }
 
diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts
index 724ab45..e9921ac 100644
--- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts
+++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts
@@ -26,12 +26,7 @@ export class AnalysisOfTheHostComponent implements OnInit {
   nzExpandAll = false;
   totalCount: string
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll', {
-      params: {
-        SkipCount: '0',
-        MaxResultCount: '9999'
-      }
-    }).subscribe((data: any) => {
+    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
       this.totalCount = data.result.totalCount
       data.result.items.forEach(element => {
         element.key = element.id
diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts
index e071506..65ba6a8 100644
--- a/src/app/system-management/organization/organization.component.ts
+++ b/src/app/system-management/organization/organization.component.ts
@@ -36,12 +36,7 @@ export class OrganizationComponent implements OnInit {
   nzExpandAll = false;
   totalCount: string
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll',{
-      params:{
-        SkipCount:'0',
-        MaxResultCount:'9999'
-      }
-    }).subscribe((data: any) => {
+    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
       this.totalCount = data.result.totalCount
       // console.log('组织机构',data.result.totalCount)
       data.result.items.forEach(element => {
diff --git a/src/assets/images/level4.png b/src/assets/images/level4.png
new file mode 100644
index 0000000000000000000000000000000000000000..451f69ab4ce207f65b8089a7fec59ab8c9506051
GIT binary patch
literal 8001
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
D(2+0^

literal 0
HcmV?d00001

diff --git a/src/theme.less b/src/theme.less
index 47aab87..7f7917c 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -177,7 +177,7 @@
 #recordsbox,
 #warningbox,
 #warningboxadmin,
-#addequipment {
+#addequipment,#stationPlanBox {
   ::-webkit-input-placeholder {
     /* WebKit browsers */
     color: #345d85;
@@ -278,7 +278,7 @@
 
 
 #stationPlanBox {
-
+  
   .ant-tree .ant-tree-node-content-wrapper:hover,
   .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
     background: linear-gradient(90deg, rgba(0, 13, 33, 0) 0%, #2399FF 50%, rgba(0, 13, 33, 0) 100%);
@@ -342,11 +342,22 @@
     padding: 0;
     color: #91CCFF;
   }
-
   .look {
     color: #36A2FF;
     cursor: pointer;
   }
+  .ant-table-measure-now{
+    display: none;
+  }
+  .ant-empty-description{
+    color: #23D9FF;
+  }
+  .ant-table-tbody > tr > td{
+    border-bottom: none;
+  }
+  .ant-table-tbody > tr > td:hover{
+    background: none;
+  }
 }