From cd41ad1237dcb70bbba1a647e6665f8d8d0e2469 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 25 Feb 2022 15:48:23 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=BE=E5=A4=87=E5=BC=B9=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disposeequipment.component.html           | 17 ++++++++++------
 .../disposeequipment.component.ts             | 20 +++++++++----------
 2 files changed, 21 insertions(+), 16 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 b4f7fdf..69507aa 100644
--- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -6,13 +6,12 @@
         <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
     </div>
 
-    <nz-radio-group *ngIf="!data2.handleTime" class="radiobox" [(ngModel)]="radioValue"
-        (ngModelChange)="ngModelChange($event)">
-        <label nz-radio nzValue="A">维保</label>
-        <label nz-radio nzValue="B">报废</label>
-    </nz-radio-group>
+    <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 && (isScraped == '维保' || isScraped == '报废')" style="text-align: center;color: #91CCFF;">
         <br>
+        <span *ngIf="isScraped == '维保'" style="color: green;">已处置<br></span>
+        <span *ngIf="isScraped == '报废'" style="color: red;">已处置<br></span>
         <span>器材名称:{{newdata.name}}</span><br>
         <span *ngIf="isScraped == '维保'" style="color: green;">处置方式:维保<br></span>
         <span *ngIf="isScraped == '报废'" style="color: red;">处置方式:报废<br></span>
@@ -22,6 +21,13 @@
         <span>下次维保日期:{{newdata.maintenanceDate | date:"yyyy-MM-dd"}}<br></span>
         <span>有效期至:{{newdata.validityEndTime | date:"yyyy-MM-dd"}}</span>
     </p>
+
+    <p *ngIf=" !data2.handleTime && isScrap" style="text-align: center;color: #91CCFF;">
+        <span>器材名称:{{data2.violatedItemSnapshotObj.name}}</span><br>
+        <span>存放地点:{{data2.violatedItemSnapshotObj.storageLocation}}<br></span>
+        <span>有效期至:{{data2.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}}</span>
+    </p>
+
     <form nz-form [formGroup]="validateForm" class="form">
         <div *ngIf=" !data2.handleTime && !isScrap">
             <p>消防器材名称</p>
@@ -67,7 +73,6 @@
                 </nz-form-control>
             </nz-form-item>
         </div>
-
         <div class="btnbox" *ngIf="!data2.handleTime">
             <button nz-button type="submit" class="ok" (click)="ok()">确定</button>
             <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
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 6fb797c..3672893 100644
--- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
@@ -17,13 +17,16 @@ export class DisposeequipmentComponent implements OnInit {
   radioValue = "A"
   data2
   copydata2
-
+  isScrap
   isScraped
 
   newdata
   ngOnInit(): void {
     this.data2 = JSON.parse(JSON.stringify(this.data))
     this.copydata2 = JSON.parse(JSON.stringify(this.data))
+
+
+
     console.log('快照预警数据', this.data2)
     if (this.data2.handleTime) {
       let params = {
@@ -38,6 +41,12 @@ export class DisposeequipmentComponent implements OnInit {
           this.isScraped = '维保'
         }
       })
+    }else{
+      if(this.data2.desc == '维保'){
+        this.isScrap = false
+      }else{
+        this.isScrap = true
+      }
     }
 
     this.validateForm = this.fb.group({
@@ -57,13 +66,4 @@ export class DisposeequipmentComponent implements OnInit {
   ok() {
     this.modal.triggerOk()
   }
-  //是否报废
-  isScrap = false
-  ngModelChange(e) {
-    if (e == 'A') {
-      this.isScrap = false
-    } else {
-      this.isScrap = true
-    }
-  }
 }