diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.html b/src/app/pages/audit/audit-ing/audit-ing.component.html
index 7da6832..e3fb3ac 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.html
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.html
@@ -11,7 +11,8 @@
油站名称 |
区域名称 |
公司名称 |
-
+ 申请人 |
+ 提交时间 |
审批状态 |
审批 |
@@ -38,7 +39,8 @@
-
+ {{item.creatorUser.name || ''}} |
+ {{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }} |
{{item.auditStatusDesc}} |
审批
diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html
index c203f21..fe3732c 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -10,6 +10,7 @@
+
@@ -17,8 +18,9 @@
-
+
diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts
index 5d40445..8bb2b8c 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -61,6 +61,9 @@ export class AuditRecordComponent implements OnInit {
this.getTypeList()
await this.getAllOrganization()
this.getRecordList()
+
+
+ this.warningType()
}
ngOnDestroy(): void {
@@ -165,6 +168,25 @@ export class AuditRecordComponent implements OnInit {
})
}
+
+ warningTypesDetails
+ warningTypesDetailsCopy
+ //获得所有预警事件
+ warningType() {
+ this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+
+ data.result = data.result.filter((item) => {
+ return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
+ })
+
+ this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
+ this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
+ // console.log('所有预警事件', this.warningTypesDetailsCopy)
+ })
+ }
+
+
+
infoChange(e) {
if (e == '0') {
this.typeList = this.typeListOfStationData
@@ -176,6 +198,8 @@ export class AuditRecordComponent implements OnInit {
this.typeList = this.typeListOfFile
} else if (e == '4') {
this.typeList = this.typeListOfUsers
+ } else if (e == '5') {
+ this.typeList = [...this.warningTypesDetailsCopy]
} else {
this.typeList = [...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile]
}
diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
index 9755e64..9a4be5f 100644
--- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
@@ -120,7 +120,7 @@
-
+
diff --git a/src/app/pages/records/criminal-records/criminal-records.component.html b/src/app/pages/records/criminal-records/criminal-records.component.html
index a203298..b103908 100644
--- a/src/app/pages/records/criminal-records/criminal-records.component.html
+++ b/src/app/pages/records/criminal-records/criminal-records.component.html
@@ -96,7 +96,7 @@
-
+
|