diff options
| author |   cyuamber <xuranyjy@chinamobile.com> | 2019-12-25 15:59:58 +0800 |
|---|---|---|
| committer | cyuamber <xuranyjy@chinamobile.com> | 2019-12-25 16:00:03 +0800 |
| commit | 04c43a5bc9f4078368f6dcb880f7f9e6eca26c36 (patch) | |
| tree | 073b1c239151f4bab75f1706243d86c52977fbb6 /usecaseui-portal/src/app/views | |
| parent | bb8b9e1cf712d9f37557055586177c5fc1d7d3cd (diff) | |
feat: change progress param value
Change-Id: I85e0200e68a06d9026e96ece7078dbcd9ff201a8
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/views')
2 files changed, 5 insertions, 5 deletions
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; }) |