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 @@ 器材名称:{{newdata.name}}
处置方式:维保
处置方式:报废
+ 预警时间:{{data2.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}
处置时间:{{data2.handleTime | date:"yyyy-MM-dd HH:mm:ss"}}
存放地点:{{newdata.storageLocation}}
生产日期:{{newdata.productionDate | date:"yyyy-MM-dd"}}
@@ -29,8 +30,9 @@ 有效期至:{{newdata.validityEndTime | date:"yyyy-MM-dd"}}

-

+

油站名称:{{data2.gasStation.stationName}}
+ 预警时间:{{data2.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}
器材名称:{{data2.violatedItemSnapshotObj.name}}
存放地点:{{data2.violatedItemSnapshotObj.storageLocation}}
有效期至:{{data2.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}} @@ -39,6 +41,7 @@

油站名称: {{data2.gasStation.stationName}}

+

预警时间: {{data2.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}

消防器材名称

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 @@ 油站名称 证照/消防设施名称 有效期限 + 预警时间 状态 操作 @@ -196,8 +197,9 @@ - + {{item.violateTime | date:"yyyy-MM-dd hh:mm:ss"}} + + {{item.handleStateStr}}