From c86cf929e840493b5addfd7b4f146020a5060c94 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 9 Sep 2022 17:24:03 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B98.25?=
 =?UTF-8?q?=E6=96=87=E6=A1=A31=EF=BC=8C2=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disposeequipment/disposeequipment.component.html        | 5 ++++-
 .../disposeequipment/disposeequipment.component.ts          | 6 +-----
 .../warning-statistics-list.component.html                  | 6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
index a46be04..e5efd1d 100644
--- a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
+++ b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -22,6 +22,7 @@
         <span>器材名称:{{newdata.name}}</span><br>
         <span *ngIf="isScraped == '维保'" style="color: green;">处置方式:维保<br></span>
         <span *ngIf="isScraped == '报废'" style="color: red;">处置方式:报废<br></span>
+        <span>预警时间:{{data2.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}<br></span>
         <span>处置时间:{{data2.handleTime | date:"yyyy-MM-dd HH:mm:ss"}}<br></span>
         <span>存放地点:{{newdata.storageLocation}}<br></span>
         <span>生产日期:{{newdata.productionDate | date:"yyyy-MM-dd"}}<br></span>
@@ -29,8 +30,9 @@
         <span>有效期至:{{newdata.validityEndTime | date:"yyyy-MM-dd"}}</span>
     </p>
 
-    <p *ngIf=" !data2.handleTime && isScrap" style="text-align: center;color: #91CCFF;">
+    <p *ngIf="!data2.handleTime && isScrap" style="text-align: center;color: #91CCFF;">
         <span>油站名称:{{data2.gasStation.stationName}}</span><br>
+        <span>预警时间:{{data2.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}</span><br>
         <span>器材名称:{{data2.violatedItemSnapshotObj.name}}</span><br>
         <span>存放地点:{{data2.violatedItemSnapshotObj.storageLocation}}<br></span>
         <span>有效期至:{{data2.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}}</span>
@@ -39,6 +41,7 @@
     <form nz-form [formGroup]="validateForm" class="form">
         <div *ngIf=" !data2.handleTime && !isScrap">
             <p>油站名称: {{data2.gasStation.stationName}}</p>
+            <p>预警时间: {{data2.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}</p>
             <p>消防器材名称</p>
             <nz-form-item>
                 <nz-form-control>
diff --git a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
index 0ebf301..6c29471 100644
--- a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
+++ b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
@@ -16,7 +16,6 @@ export class DisposeequipmentComponent implements OnInit {
 
   radioValue = "A"
   data2
-  copydata2
   isScrap
   isScraped
 
@@ -24,11 +23,8 @@ export class DisposeequipmentComponent implements OnInit {
   isSubmit
   ngOnInit(): void {
     this.data2 = JSON.parse(JSON.stringify(this.data))
-    this.copydata2 = JSON.parse(JSON.stringify(this.data))
 
-
-
-    // console.log('快照预警数据', this.data2)
+    console.log('快照预警数据', this.data2)
     if (this.data2.handleTime) {
       let params = {
         Id: this.data2.violatedItemSnapshotObj.id
diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
index cbd828c..d8a922a 100644
--- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
+++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
@@ -126,6 +126,7 @@
                         <th>油站名称</th>
                         <th>证照/消防设施名称</th>
                         <th>有效期限</th>
+                        <th>预警时间</th>
                         <th>状态</th>
                         <th>操作</th>
                     </tr>
@@ -196,8 +197,9 @@
                             </ng-template>
                         </td>
                         <td nzEllipsis>
-                            <!-- <span *ngIf="item.handleTime">已处置</span>
-                            <span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span> -->
+                            {{item.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}
+                        </td>
+                        <td nzEllipsis>
                             <span
                                 [ngClass]="{'greenColor': item.handleStateStr=='已处置','yellowColor': item.handleStateStr=='处置中','redColor': item.handleStateStr=='未处置'}">{{item.handleStateStr}}</span>
                         </td>