Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/criminal-records-admin/criminal-records-admin.component.html

@@ -16,7 +16,49 @@
       <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
     </div>
 
-    <div class="search" [hidden]="!isEcharts">
+    <div class="chartsbox" [hidden]="!isEcharts">
+      <div class="chart">
+        <div class="leftbox" style="position: relative;">
+          <span class="chartname">
+            <img src="../../../assets/images/flower.png" alt="">
+            预警类别统计
+          </span>
+          <div class="centerContent">
+            <div class="numname">预警事件总数</div>
+            <div class="num">{{num}}</div>
+          </div>
+          <div class="piechart" id="piechart">
+
+          </div>
+          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
+        </div>
+        <div class="rightbox" style="position: relative;">
+          <span class="chartname">
+            <img src="../../../assets/images/flower.png" alt="">
+            近一个月预警统计
+          </span>
+          <div class="btnbox">
+            <div class="btn" (click)="echartClick('分布')" [ngClass]="{'selectedbtn': selectedType == '分布'}">统计</div>
+            <div class="rankingBtnbox" (mouseenter)="mouseEnter()" (mouseleave)="mouseleave()">
+              <div class="btn"
+                [ngClass]="{'selectedbtn': (selectedRankingType == '站点排名' || selectedRankingType == '事件排名')}">排名</div>
+              <div class="btn rankingBtn" *ngIf="isMouseEnter" (click)="echartClick2('站点排名')"
+                [ngClass]="{'selectedbtn': selectedRankingType == '站点排名'}">油站</div>
+              <div class="btn rankingBtn" *ngIf="isMouseEnter" (click)="echartClick2('事件排名')"
+                [ngClass]="{'selectedbtn':  selectedRankingType == '事件排名'}">事件</div>
+            </div>
+          </div>
+          <div class="barchart" id="barchart">
+          </div>
+          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
+        </div>
+      </div>
+    </div>
+
+    <div class="title">
+      <app-title [name]="'预警类型统计'"></app-title>
+    </div>
+    <div class="search">
       <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
         <nz-form-item class="searchParams">
           <nz-form-control>
@@ -116,50 +158,6 @@
         </nz-form-item>
       </form>
     </div>
-
-    <div class="chartsbox" [hidden]="!isEcharts">
-      <div class="chart">
-        <div class="leftbox" style="position: relative;">
-          <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
-            预警类别统计
-          </span>
-          <div class="centerContent">
-            <div class="numname">预警事件总数</div>
-            <div class="num">{{num}}</div>
-          </div>
-          <div class="piechart" id="piechart">
-
-          </div>
-          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
-        </div>
-        <div class="rightbox" style="position: relative;">
-          <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
-            近一个月预警统计
-          </span>
-          <div class="btnbox">
-            <div class="btn" (click)="echartClick('分布')" [ngClass]="{'selectedbtn': selectedType == '分布'}">统计</div>
-            <div class="rankingBtnbox" (mouseenter)="mouseEnter()" (mouseleave)="mouseleave()">
-              <div class="btn"
-                [ngClass]="{'selectedbtn': (selectedRankingType == '站点排名' || selectedRankingType == '事件排名')}">排名</div>
-              <div class="btn rankingBtn" *ngIf="isMouseEnter" (click)="echartClick2('站点排名')"
-                [ngClass]="{'selectedbtn': selectedRankingType == '站点排名'}">油站</div>
-              <div class="btn rankingBtn" *ngIf="isMouseEnter" (click)="echartClick2('事件排名')"
-                [ngClass]="{'selectedbtn':  selectedRankingType == '事件排名'}">事件</div>
-            </div>
-          </div>
-          <div class="barchart" id="barchart">
-          </div>
-          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
-        </div>
-      </div>
-    </div>
-
-    <div class="title">
-      <app-title [name]="'预警类型统计'"></app-title>
-    </div>
-
     <div class="tablebox">
       <div class="table">
         <div nz-row class="th">

src/app/pages/criminal-records-admin/criminal-records-admin.component.scss

@@ -140,7 +140,7 @@
     }
 
     .chart {
-      width: 98%;
+      width: 97%;
       height: 350px;
       box-sizing: border-box;
       padding: 0 10px;

src/app/pages/criminal-records/criminal-records.component.html

@@ -15,7 +15,46 @@
       </div>
       <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
     </div>
-    <div class="search" [hidden]="!isEcharts">
+    <div class="chartsbox" [hidden]="!isEcharts">
+      <div class="chart">
+        <div class="leftbox" style="position: relative;">
+          <span class="chartname">
+            <img src="../../../assets/images/flower.png" alt="">
+            预警类别统计
+          </span>
+          <div class="centerContent">
+            <div class="numname">预警事件总数</div>
+            <div class="num">{{num}}</div>
+          </div>
+          <div class="piechart" id="piechart">
+
+          </div>
+          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
+        </div>
+        <div class="rightbox" style="position: relative;">
+          <span class="chartname">
+            <img src="../../../assets/images/flower.png" alt="">
+            近一个月预警统计
+          </span>
+          <div class="btnbox">
+            <!-- <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('站点排名')"
+              [ngClass]="{'selectedbtn': selectedRankingType == '站点排名'}">油站</button>
+            <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('事件排名')"
+              [ngClass]="{'selectedbtn':  selectedRankingType == '事件排名'}">事件</button> -->
+            <button nz-button (click)="echartClick('分布')" [ngClass]="{'selectedbtn': selectedType == '分布'}">统计</button>
+            <button nz-button (click)="echartClick('排名')" [ngClass]="{'selectedbtn': selectedType == '排名'}">排名</button>
+          </div>
+          <div class="barchart" id="barchart">
+
+          </div>
+          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
+        </div>
+      </div>
+    </div>
+    <div class="title">
+      <app-title [name]="'预警类型统计'"></app-title>
+    </div>
+    <div class="search">
       <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
         <nz-form-item class="searchParams">
           <nz-form-control>
@@ -92,46 +131,6 @@
         </nz-form-item>
       </form>
     </div>
-    <div class="chartsbox" [hidden]="!isEcharts">
-      <div class="chart">
-        <div class="leftbox" style="position: relative;">
-          <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
-            预警类别统计
-          </span>
-          <div class="centerContent">
-            <div class="numname">预警事件总数</div>
-            <div class="num">{{num}}</div>
-          </div>
-          <div class="piechart" id="piechart">
-
-          </div>
-          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
-        </div>
-        <div class="rightbox" style="position: relative;">
-          <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
-            近一个月预警统计
-          </span>
-          <div class="btnbox">
-            <!-- <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('站点排名')"
-              [ngClass]="{'selectedbtn': selectedRankingType == '站点排名'}">油站</button>
-            <button class="rankingBtn" *ngIf="selectedType == '排名'" nz-button (click)="echartClick2('事件排名')"
-              [ngClass]="{'selectedbtn':  selectedRankingType == '事件排名'}">事件</button> -->
-            <button nz-button (click)="echartClick('分布')" [ngClass]="{'selectedbtn': selectedType == '分布'}">统计</button>
-            <button nz-button (click)="echartClick('排名')" [ngClass]="{'selectedbtn': selectedType == '排名'}">排名</button>
-          </div>
-          <div class="barchart" id="barchart">
-
-          </div>
-          <nz-spin *ngIf="chartsSpin" nzSimple class="nzspin"></nz-spin>
-        </div>
-      </div>
-    </div>
-
-    <div class="title">
-      <app-title [name]="'预警类型统计'"></app-title>
-    </div>
     <div class="tablebox">
       <div class="table">
         <div nz-row class="th">

src/app/pages/misinformation-list/misinformation-list.component.ts

@@ -757,7 +757,7 @@ export class MisinformationListComponent implements OnInit {
 
   //跳转卸油统计页面
   goOilList() {
-    
+
     if (this.router.url.indexOf('petrolStation') != -1) {
       this.router.navigate(['/records/petrolStation/oliunloadinglist'])
     } else {

src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html

@@ -49,11 +49,11 @@
         <div class="title">
             <app-title [name]="'卸油作业留证列表'"></app-title>
         </div>
-        <div class="search" [hidden]="!isEcharts">
+        <div class="search">
             <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
                 <nz-form-item class="searchParams">
                     <nz-form-control>
-                        <nz-select (ngModelChange)="stateChange($event)" nzAllowClear formControlName="state"
+                        <nz-select nzAllowClear formControlName="state"
                             nzPlaceHolder="请选择状态">
                             <nz-option nzValue="0" nzLabel="预警"></nz-option>
                             <nz-option nzValue="1" nzLabel="合规"></nz-option>
@@ -121,10 +121,10 @@
                         卸油结束时间
                     </div>
                     <div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                        操作前准备预警节点数量
+                        卸油准备
                     </div>
                     <div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                        操作中准备预警节点数量
+                        卸油操作
                     </div>
                     <!-- <div nz-col nzSpan="3" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                         全流程准备预警节点数量

src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts

@@ -254,17 +254,17 @@ export class OilUnloadingProcessListComponent implements OnInit {
         }
       }
     ],
-    legend: {
+    // legend: {
-      selectedMode: false, // 是否允许点击
+    //   selectedMode: false, // 是否允许点击
-      data: ['卸油事件'],
+    //   data: ['卸油事件'],
-      textStyle: {
+    //   textStyle: {
-        color: '#fff'
+    //     color: '#fff'
-      },
+    //   },
-      right: 28,
+    //   right: 28,
-      top: 18,
+    //   top: 18,
-      itemWidth: 8,
+    //   itemWidth: 8,
-      itemHeight: 8,
+    //   itemHeight: 8,
-    },
+    // },
     grid: {
       left: '42px',
       right: '30px',

src/app/pages/today-warning-admin/today-warning-admin.component.html

@@ -124,19 +124,19 @@
         管理区域
       </div>
       <div nz-col nzSpan="2">
-        油站名称
+        加油站
       </div>
       <div nz-col nzSpan="2">
         预警区域
       </div>
       <div nz-col nzSpan="2">
-        摄像头
+        摄像头名称
       </div>
       <div nz-col nzSpan="3">
         预警时间
       </div>
       <div nz-col nzSpan="2">
-        处置状态
+        状态
       </div>
       <div nz-col nzSpan="2">
         操作

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html

@@ -32,7 +32,7 @@
             </ng-container>
             <ng-template #elseTemplate>
                 <div class="btn">
-                    <span *ngIf="!data.handleTime && isMisinformation" style="color: #FF4B65;cursor: pointer;"
+                    <span *ngIf="!data.handleTime && isMisinformation" style="color: #FF4B65;cursor: pointer;margin-right: 20px;"
                         (click)="misinformation()">误报</span>
                     <span *ngIf="!data.handleTime" style="color: #36A2FF;cursor: pointer;" (click)="submit()">提交</span>
                     <span *ngIf="data.handleTime" style="color: #4BFFD4;cursor: default;">已处置</span>

src/app/pages/today-warning/today-warning.component.html

@@ -90,16 +90,16 @@
         预警信息
       </div>
       <div nz-col nzSpan="4">
-        区域
+        预警区域
       </div>
       <div nz-col nzSpan="3">
-        摄像头
+        摄像头名称
       </div>
       <div nz-col nzSpan="3">
         预警时间
       </div>
       <div nz-col nzSpan="2">
-        处置状态
+        状态
       </div>
       <div nz-col nzSpan="2">
         操作

src/app/pages/warning-statistics-list/warning-statistics-list.component.ts

@@ -222,17 +222,17 @@ export class WarningStatisticsListComponent implements OnInit {
         }
       }
     ],
-    legend: {
+    // legend: {
-      selectedMode: false, // 是否允许点击
+    //   selectedMode: false, // 是否允许点击
-      data: ['预警事件'],
+    //   data: ['预警事件'],
-      textStyle: {
+    //   textStyle: {
-        color: '#fff'
+    //     color: '#fff'
-      },
+    //   },
-      right: 28,
+    //   right: 28,
-      top: 18,
+    //   top: 18,
-      itemWidth: 8,
+    //   itemWidth: 8,
-      itemHeight: 8,
+    //   itemHeight: 8,
-    },
+    // },
     grid: {
       left: '42px',
       right: '30px',