From: cyuamber <xuranyjy@chinamobile.com>
Date: Wed, 25 Dec 2019 07:59:58 +0000 (+0800)
Subject: feat: change progress param value
X-Git-Tag: 2.0.2~52
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F99908%2F1;p=usecase-ui.git

feat: change progress param value

Change-Id: I85e0200e68a06d9026e96ece7078dbcd9ff201a8
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
index 804fd65b..be7db387 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
@@ -46,12 +46,12 @@
                                     [nzDisabled]="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== 100"
                                     (ngModelChange)="switchChange(data,i)"></nz-switch>
                                 <nz-progress
-                                    *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== 100 && data.last_operation_type !== 'delete'"
+                                    *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== 100 && data.last_operation_type !== 'DELETE'"
                                     [nzPercent]="data.last_operation_progress" [nzShowInfo]="false" nzStatus="active">
                                 </nz-progress>
                             </div>
                             <div class="action-icon">
-                                <i [ngClass]="{'cannotclick': data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== 100 && (data.last_operation_type !== 'delete' || data.orchestration_status==='activated')}"
+                                <i [ngClass]="{'cannotclick': data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== 100 && (data.last_operation_type !== 'DELETE' || data.orchestration_status==='activated')}"
                                     nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
                                     (click)="terminate(data)"></i>
                                 <nz-progress
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 bba63540..f81f94e1 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
@@ -55,14 +55,14 @@ export class SlicingBusinessTableComponent implements OnInit {
                 this.total = record_number;
                 this.loading = false;
                 this.listOfData = slicing_business_list.map((item, index) => {
-                    if (item.last_operation_progress !== null && item.last_operation_progress < 100 && item.last_operation_type !== null) {
-                        let updata = (prodata) => {
+                    if (item.last_operation_progress && item.last_operation_type && item.last_operation_progress < 100) {
+                        let updata = (prodata: { operation_progress: string }) => {
                             item.last_operation_progress = prodata.operation_progress || item.last_operation_progress;
                         };
                         let obj = {
                             serviceId: item.service_instance_id
                         };
-                        if (item.last_operation_type === 'delete') this.terminateStart = true;
+                        if (item.last_operation_type === 'DELETE') this.terminateStart = true;
                         this.queryProgress(obj, item.orchestration_status, index, updata).then((res) => {
                             item.last_operation_progress = 100;
                         })