diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
index 40c7c30..76e4882 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
@@ -113,7 +113,7 @@
油站名称
- 组织机构
+ 公司名称
卸油开始时间
@@ -125,7 +125,7 @@
操作前准备预警节点数量
- 操作后准备预警节点数量
+ 操作中准备预警节点数量
全流程准备预警节点数量
@@ -142,10 +142,10 @@
- 油站名称
+ {{item.gasStation.stationName}}
- 组织机构
+ {{item.gasStation.companyName}}
{{item.startTime ? (item.startTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
@@ -157,14 +157,14 @@
{{item.proccessBeforeCount}}
- {{item.proccessAfterCount}}
+ {{item.proccessingCount}}
{{item.allProccessCount}}
+ *ngIf="item.proccessBeforeCount == 0 && item.proccessingCount == 0 && item.allProccessCount == 0; else elseTemplate">
合规
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
index 980529a..01572e2 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
@@ -585,9 +585,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
}).subscribe((data: any) => {
this.list = this.list.concat(data.result.items);
this.list = [...this.list]
- console.log('xxx',this.list)
+ // console.log('xxx',this.list)
this.totalCount = data.result.totalCount
- console.log('获取卸油流程列表', data.result.items)
+ // console.log('获取卸油流程列表', data.result.items)
// this.getAggregations()
})
}