[完善]预警记录增加字段显示;算法台账分页优化

proxy.config.json

@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "http://121.36.37.70:8906/",
+    "target": "https://znaq.sinochemoilmarketing.com/",
     "测试1": "http://121.36.37.70:8906/",
     "测试2": "https://znaq.sinochemoilmarketing.com/",
     "测试3": "https://gas.anxincloud.cn/",

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

@@ -182,7 +182,9 @@
             <th>油站名称</th>
             <th>预警区域</th>
             <th>摄像头名称</th>
-            <th>预警时间</th>
+            <th nzWidth="8%">预警时间</th>
+            <th nzWidth="8%">申诉时间</th>
+            <th nzWidth="8%">处置时间</th>
             <th nzWidth="5%">处置状态</th>
             <th nzWidth="5%" *ngIf="isMisinformation">申诉状态</th>
             <th nzWidth="5%">操作</th>
@@ -213,6 +215,12 @@
             <td nzEllipsis [title]="item.violateTime | date:'yyyy-MM-dd HH:mm:ss'">
               {{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
             </td>
+            <td nzEllipsis [title]="item.appealLog ? (item.appealLog.committedTime | date:'yyyy-MM-dd HH:mm:ss') : ''">
+              {{item.appealLog ? (item.appealLog.committedTime | date:'yyyy-MM-dd HH:mm:ss') : ''}}
+            </td>
+            <td nzEllipsis [title]="item.handleTime? (item.handleTime| date:'yyyy-MM-dd HH:mm:ss') : ''">
+              {{item.handleTime? (item.handleTime| date:"yyyy-MM-dd HH:mm:ss") : ''}}
+            </td>
             <td nzEllipsis>
               <ng-container *ngIf="!item.positive; else elseTemplate">
                 误报

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

@@ -154,7 +154,9 @@
             <th>区域名称</th>
             <th>预警区域</th>
             <th>摄像头名称</th>
-            <th>预警时间</th>
+            <th nzWidth="8%">预警时间</th>
+            <th nzWidth="8%">申诉时间</th>
+            <th nzWidth="8%">处置时间</th>
             <th nzWidth="5%">处置状态</th>
             <th nzWidth="5%" *ngIf="isMisinformation">申诉状态</th>
             <th nzWidth="5%">操作</th>
@@ -183,6 +185,12 @@
             <td nzEllipsis [title]="item.violateTime | date:'yyyy-MM-dd HH:mm:ss'">
               {{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
             </td>
+            <td nzEllipsis [title]="item.appealLog ? (item.appealLog.committedTime | date:'yyyy-MM-dd HH:mm:ss') : ''">
+              {{item.appealLog ? (item.appealLog.committedTime | date:'yyyy-MM-dd HH:mm:ss') : ''}}
+            </td>
+            <td nzEllipsis [title]="item.handleTime? (item.handleTime| date:'yyyy-MM-dd HH:mm:ss') : ''">
+              {{item.handleTime? (item.handleTime| date:"yyyy-MM-dd HH:mm:ss") : ''}}
+            </td>
             <td nzEllipsis>
               <ng-container *ngIf="!item.positive; else elseTemplate">
                 误报

src/app/system-management/algorithm-config/algorithm-config.component.html

@@ -32,7 +32,7 @@
             </form>
         </div>
         <div class="tableBox">
-            <nz-table #basicTable [nzData]="listOfData" [nzShowPagination]='false' [nzPageSize]='10'
+            <nz-table #basicTable [nzData]="listOfData" [nzShowPagination]='false' [nzPageSize]='MaxResultCount'
                 [nzLoading]="isLoading">
                 <thead>
                     <tr>
@@ -85,11 +85,12 @@
 
         </div>
         <div class="pagination">
+            <ng-template #totalTemplate let-total>共{{totals}}条</ng-template>
             <nz-pagination [nzHideOnSinglePage]="false" [(nzPageIndex)]="nzPageIndex" [nzTotal]="totals"
-                [nzPageSize]="10" [nzShowTotal]="totalTemplate" nzShowQuickJumper
-                (nzPageIndexChange)="pageChange($event)">
+                [nzPageSize]="MaxResultCount" [nzShowTotal]="totalTemplate" nzShowQuickJumper nzShowSizeChanger
+                (nzPageIndexChange)="pageChange($event)" (nzPageSizeChange)="pageSizeChange($event)">
             </nz-pagination>
-            <ng-template #totalTemplate let-total> 10条/页,共{{totals}}条 </ng-template>
+          
         </div>
     </div>
 </div>

src/app/system-management/algorithm-config/algorithm-config.component.ts

@@ -113,13 +113,13 @@ export class AlgorithmConfigComponent implements OnInit {
   nzClick(event: NzFormatEmitEvent): void {
     console.log(event.node.origin);
     this.selectedOrId = event.node.origin.id;
-    this.SkipCount = 0
-    this.nzPageIndex = 1
+    this.SkipCount = 0;
+    this.nzPageIndex = 1;
     this.getStationViolationConfigList();
   }
 
   SkipCount = 0;
-  MaxResultCount = 10;
+  MaxResultCount = 20;
   isLoading = false;
   listOfData: any[] = [];
   thList = [];
@@ -158,13 +158,19 @@ export class AlgorithmConfigComponent implements OnInit {
       });
   }
 
-  nzPageIndex = 1
+  nzPageIndex = 1;
   pageChange($event) {
     console.log($event);
     this.SkipCount = ($event - 1) * this.MaxResultCount;
     this.getStationViolationConfigList();
   }
-
+  pageSizeChange($event) {
+    // console.log($event);
+    this.MaxResultCount = $event
+    this.SkipCount = 0;
+    this.nzPageIndex = 1;
+    this.getStationViolationConfigList();
+  }
   change(item, type) {
     this.isLoading = true;
     let body = {

src/app/system-management/organization/organization.component.html

@@ -33,7 +33,7 @@
       </span>
       <span class="operation" *ngIf="level === 1">
         <span (click)="addOr(node)" *ngIf="!node.origin.isGasStation">新增</span>
-        <!-- <span (click)="waring(node)" *ngIf="node.origin.isGasStation">配置预警事件</span> -->
+        <span (click)="waring(node)" *ngIf="node.origin.isGasStation">配置预警事件</span>
         <span (click)="editOr(node)">编辑</span>
         <span [ngClass]="{'grey':node.origin.children && node.origin.children.length != 0}"
           (click)="deleteOr(node)">删除</span>