From 5a43d0fb9db8bdabb76a7ab2d8bd28dc817f0ee0 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 3 Mar 2022 10:16:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE=E6=B6=88=E9=98=B2=E8=AE=BE=E6=96=BD=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disposeequipment/disposeequipment.component.html      | 8 ++++++--
 .../disposeequipment/disposeequipment.component.ts        | 2 +-
 .../warning-statistics-list.component.ts                  | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
index 69507aa..d6985e0 100644
--- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -6,8 +6,12 @@
         <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
     </div>
 
-    <p *ngIf="!data2.handleTime && !isScrap" style="color: green;text-align: center;margin-top: 12px;">维保</p>
-    <p *ngIf="!data2.handleTime && isScrap" style="color: red;text-align: center;margin-top: 12px;">报废</p>
+    <p *ngIf="!data2.handleTime && !isScrap" style="color: green;text-align: center;margin-top: 12px;">维保<span
+            *ngIf="data2.numberOfTimes == 2">临期预警</span><span *ngIf="data2.numberOfTimes == 3">逾期预警</span>
+    </p>
+    <p *ngIf="!data2.handleTime && isScrap" style="color: red;text-align: center;margin-top: 12px;">报废<span
+            *ngIf="data2.numberOfTimes == 2">临期预警</span><span *ngIf="data2.numberOfTimes == 3">逾期预警</span>
+    </p>
     <p *ngIf="data2.handleTime && (isScraped == '维保' || isScraped == '报废')" style="text-align: center;color: #91CCFF;">
         <br>
         <span *ngIf="isScraped == '维保'" style="color: green;">已处置<br></span>
diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
index 3672893..54e07ec 100644
--- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
@@ -27,7 +27,7 @@ export class DisposeequipmentComponent implements OnInit {
 
 
 
-    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/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
index 3166903..29c95f9 100644
--- a/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
+++ b/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
@@ -424,7 +424,7 @@ export class WarningStatisticsListComponent implements OnInit {
     })
   }
   refreshEchartsData1(data) {
-    console.log('echarts信息', data)
+    // console.log('echarts信息', data)
     //饼图
     let totalCount = 0
     data.violationList.forEach(element => {
@@ -539,7 +539,7 @@ export class WarningStatisticsListComponent implements OnInit {
     }
 
     let ViolationIds = []
-    console.log(456, this.validateForm.value)
+    // console.log(456, this.validateForm.value)
     if (this.validateForm.value.eventSystemName) {
       ViolationIds.push(this.validateForm.value.eventSystemName)
     } else {
@@ -587,7 +587,7 @@ export class WarningStatisticsListComponent implements OnInit {
       this.validateForm.controls[key].markAsPristine();
       this.validateForm.controls[key].updateValueAndValidity();
     }
-    console.log('赋值日期', [this.startdate, this.enddate])
+    // console.log('赋值日期', [this.startdate, this.enddate])
     this.validateForm.patchValue({
       datePicker: [this.startdate, this.enddate],
       eventSystemName: null,
@@ -629,7 +629,7 @@ export class WarningStatisticsListComponent implements OnInit {
         },
         nzFooter: null,
         nzOnOk: async () => {
-          console.log(99999, instance.content)
+          // console.log(99999, instance.content)
         }
       });
       const instance = modal.getContentComponent();