From 733930435785353e3502f6fe804f6d81853570ab Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 25 Feb 2022 10:20:59 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment-info/equipment-info.component.html     | 12 ++++++------
 .../disposeequipment/disposeequipment.component.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html
index 4d88e13..9d7fb1c 100644
--- a/src/app/pages/equipment-info/equipment-info.component.html
+++ b/src/app/pages/equipment-info/equipment-info.component.html
@@ -29,13 +29,13 @@
             消防器材
           </div>
           <div nz-col nzSpan="4">
-            规格
+            存放地点
           </div>
           <div nz-col nzSpan="4">
-            购入日期
+            生产日期
           </div>
           <div nz-col nzSpan="4">
-            生产日期
+            下次维保日期
           </div>
           <div nz-col nzSpan="4">
             有效期至
@@ -50,13 +50,13 @@
               {{item.name}}
             </div>
             <div nz-col nzSpan="4">
-              {{item.specification}}
+              {{item.storageLocation}}
             </div>
             <div nz-col nzSpan="4">
-              {{item.purchaseDate | date:"yyyy-MM-dd"}}
+              {{item.productionDate | date:"yyyy-MM-dd"}}
             </div>
             <div nz-col nzSpan="4">
-              {{item.productionDate | date:"yyyy-MM-dd"}}
+              {{item.maintenanceDate | date:"yyyy-MM-dd"}}
             </div>
             <div nz-col nzSpan="4">
               {{item.validityEndTime | date:"yyyy-MM-dd"}}
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 0289f21..b4f7fdf 100644
--- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -46,7 +46,7 @@
             <nz-form-item>
                 <nz-form-control>
                     <nz-date-picker [nzAllowClear]="false" [(ngModel)]="data2.violatedItemSnapshotObj.productionDate"
-                        formControlName="prodtime" nzPlaceHolder="请输入生产日期">
+                        formControlName="productionDate" nzPlaceHolder="请输入生产日期">
                     </nz-date-picker>
                 </nz-form-control>
             </nz-form-item>