From 1158ad447fdb0dc10fd753d6e9ff3fb448a63c5c Mon Sep 17 00:00:00 2001 From: cyuamber Date: Fri, 20 Dec 2019 18:38:42 +0800 Subject: feat: change parameters of task status Change-Id: If4e057511bbfb0c70ad637bb1811877a99c8b5d7 Issue-ID: USECASEUI-368 Signed-off-by: cyuamber --- .../slicing-task-management.component.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'usecaseui-portal/src/app/views/services') diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts index 35bd191f..b99ee8ee 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts @@ -42,8 +42,8 @@ export class SlicingTaskManagementComponent implements OnInit { this.message.error('Failed to get form data'); } this.loading = false; - },({status, statusText}) => { - this.message.error(status + ' (' + statusText + ')'); + }, ({ status, statusText }) => { + this.message.error(status + ' (' + statusText + ')'); this.loading = false; }) } @@ -71,8 +71,8 @@ export class SlicingTaskManagementComponent implements OnInit { this.message.error('Failed to get form data'); } this.loading = false; - }, ({status, statusText}) => { - this.message.error(status + ' (' + statusText + ')'); + }, ({ status, statusText }) => { + this.message.error(status + ' (' + statusText + ')'); this.listOfData = []; this.loading = false; }) @@ -109,6 +109,10 @@ export class SlicingTaskManagementComponent implements OnInit { // item.status = '审核阶段'; item.operation = 'Process Task' break; + case 'WaitingToConfirm': + // item.status = '审核阶段'; + item.operation = 'Process Task' + break; case 'Creating': // item.status = '切片创建中'; item.operation = 'View Progress' @@ -125,7 +129,7 @@ export class SlicingTaskManagementComponent implements OnInit { showdetail(data: any): void { this.taskId = data.task_id; this.moduleTitle = data.task_name; - if (data.processing_status === 'WaitingToConfirm') { + if (data.processing_status === 'Waiting to Confirm' || data.processing_status === 'WaitingToConfirm') { this.showDetail = true; } else { this.moduleOperation = data.operation; @@ -133,7 +137,7 @@ export class SlicingTaskManagementComponent implements OnInit { } } - handelCancel(obj: any):void { + handelCancel(obj: any): void { this.showDetail = obj.showDetail; if (obj.bool) { if (this.selectedValue && this.selectedValue !== 'all') { -- cgit 1.2.3-korg