summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2020-03-11 12:34:54 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-11 12:34:54 +0000
commit781f5cf9ec7b76fad50436270ebf1d0226c0f7fb (patch)
treed3b649a3156926cd71e3f7167b307b81a3121153 /usecaseui-portal/src/app
parent054995b9d10934b55e5be5a214f642b9c817baf0 (diff)
parent61e717236b1b5ec8b157f16d8a6f5c7494c3e553 (diff)
Merge "feat: Modify the function of NSMF slicing-management"
Diffstat (limited to 'usecaseui-portal/src/app')
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_business_list.json6
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html6
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts4
3 files changed, 9 insertions, 7 deletions
diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
index bedefa98..f57945e8 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
@@ -11,8 +11,8 @@
"service_instance_name": "slicing-01-eMBB",
"service_type": "eMMB",
"service_snssai": "1-010101",
- "orchestration_status": "activated",
- "last_operation_type": "activate",
+ "orchestration_status": "processing",
+ "last_operation_type": "processing",
"last_operation_progress": 80
},
{
@@ -21,7 +21,7 @@
"service_type": "eMMB",
"service_snssai": "1-010101",
"orchestration_status": "activated",
- "last_operation_type": "activate",
+ "last_operation_type": "DELETE",
"last_operation_progress": 99
},
{
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 14c51f19..eef35756 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
@@ -43,7 +43,7 @@
<td>
<div class="action-icon">
<nz-switch [ngModel]="data.orchestration_status==='activated'?true:false"
- [nzDisabled]="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100'"
+ [nzDisabled]="data.orchestration_status === 'processing' || (data.orchestration_status !== 'processing' && 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'"
@@ -51,11 +51,11 @@
</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.orchestration_status === 'processing' || (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)"></i>
<nz-progress
- *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && terminateStart"
+ *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && terminateStart[i]"
[nzPercent]="data.last_operation_progress" [nzShowInfo]="false" nzStatus="active">
</nz-progress>
</div>
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 39e5f1d2..af7e2d63 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
@@ -149,7 +149,9 @@ export class SlicingTaskManagementComponent implements OnInit {
if (this.selectedValue && this.selectedValue !== 'all') {
this.getListOfProcessingStatus();
} else {
- this.getTaskList();
+ setTimeout(() => {
+ this.getTaskList()
+ }, 5000);
}
}
}