From 576ecf160be762904fce72279700b1c6a0a60989 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Wed, 11 Dec 2019 16:54:06 +0800 Subject: feat:Modify the query of the progress interface and the api urls Change-Id: Ie6076e2f22d0afe683dca55f4e1369541800710c Issue-ID: USECASEUI-369 Signed-off-by: cyuamber --- .../slicing-business-table.component.ts | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'usecaseui-portal/src/app/views') diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts index bb04c8f5..8054b613 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts @@ -111,14 +111,15 @@ export class SlicingBusinessTableComponent implements OnInit { serviceId: slicing.service_instance_id }; let updata = (prodata) => { - slicing.last_operation_progress = prodata.progress; - slicing.orchestration_status = prodata.operation_type; - this.queryProgress(obj, updata).then(() => { - slicing.last_operation_progress = 100; - slicing.orchestration_status = finished; - this.notification1.notificationSuccess('slicing business', finished, slicing.service_instance_id); - }) + slicing.last_operation_progress = prodata.progress || 0; + slicing.orchestration_status = prodata.operation_type || activateValue; }; + this.queryProgress(obj, updata).then(() => { + slicing.last_operation_progress = 100; + slicing.orchestration_status = finished; + this.notification1.notificationSuccess('slicing business', finished, slicing.service_instance_id); + this.getBusinessList(); + }) }else { this.notification1.notificationFailed('slicing business', finished, slicing.service_instance_id); console.error(result_message); @@ -138,20 +139,21 @@ export class SlicingBusinessTableComponent implements OnInit { const { result_header: { result_code, result_message }, result_body: { operation_id } } = res; if (+result_code === 200) { slicing.last_operation_progress = 0; - slicing.orchestration_status = 'deactivate'; + slicing.orchestration_status = 'delete'; console.log(operation_id,"operation_id"); let obj = { serviceId: slicing.service_instance_id }; let updata = (prodata) => { - slicing.last_operation_progress = prodata.progress; - slicing.orchestration_status = prodata.operation_type; - this.queryProgress(obj, updata).then(() => { - slicing.last_operation_progress = 100; - slicing.orchestration_status = "terminated"; - this.notification1.notificationSuccess('slicing business', 'terminate', slicing.service_instance_id); - }) + slicing.last_operation_progress = prodata.progress || 0; + slicing.orchestration_status = prodata.operation_type || "delete"; }; + this.queryProgress(obj, updata).then(() => { + slicing.last_operation_progress = 100; + slicing.orchestration_status = "terminated"; + this.notification1.notificationSuccess('slicing business', 'terminate', slicing.service_instance_id); + this.getBusinessList(); + }) }else { this.notification1.notificationFailed('slicing business', 'terminate', slicing.service_instance_id); console.error(result_message) -- cgit 1.2.3-korg