summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usecaseui-portal/src/app/views/home/home.component.ts4
-rw-r--r--usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.html2
-rw-r--r--usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts8
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts7
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts5
5 files changed, 15 insertions, 11 deletions
diff --git a/usecaseui-portal/src/app/views/home/home.component.ts b/usecaseui-portal/src/app/views/home/home.component.ts
index 75ebb183..1b01dfff 100644
--- a/usecaseui-portal/src/app/views/home/home.component.ts
+++ b/usecaseui-portal/src/app/views/home/home.component.ts
@@ -59,10 +59,6 @@ export class HomeComponent implements OnInit {
this.seriverChart.resize(this.services.nativeElement.offsetHeight, 250)
}
- ngOnDestroy() {
- this.resizeMark.unsubscribe()
- }
-
// services
serviceNumber: number = 0;
serviceChartData: Object;
diff --git a/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.html b/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.html
index 3d65623e..62a7d8cc 100644
--- a/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.html
+++ b/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.html
@@ -8,7 +8,7 @@
<span> {{"i18nTextDefine_Customer" | translate}} : </span>
<nz-select [(ngModel)]="currentCustomer.id" nzAllowClear
(ngModelChange)="customerChange(currentCustomer.id)">
- <nz-option *ngFor="let item of customerList" [nzValue]="item.name" [nzLabel]="item.name"></nz-option>
+ <nz-option *ngFor="let item of customerList" [nzValue]="item.id" [nzLabel]="item.name"></nz-option>
</nz-select>
</div>
<div class="select-list">
diff --git a/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts b/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts
index 9d0dd610..5369f855 100644
--- a/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts
@@ -145,14 +145,10 @@ export class CreateModelComponent implements OnInit {
this.http.getTemplateParameters(types, chosedtemplates)
.subscribe((data) => {
this.loadingAnimateShow = false;
- if (!data || !data.status) {
- this.temParametersTips = true;
- this.isVisible = true;
- this.msg.error('Back end data format error')
- }
- else if (data.status == "FAILED") {
+ if (!data || !data.status || data.status == "FAILED") {
this.temParametersTips = true;
this.isVisible = true;
+ this.msg.error('Template parsing failed');
} else {
this.cancel.emit(false);
this.temParametersTips = false;
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
index d7062473..a448bcf2 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
@@ -31,6 +31,13 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
ngOnInit() {}
+ ngOnDestroy() {
+ console.log(this.progressingTimer)
+ this.progressingTimer.forEach((item) => {
+ clearInterval(item.timer)
+ })
+ }
+
selectedValue: string = BUSINESS_STATUS[0];
listOfData: any[] = [];
pageIndex: number = 1;
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 cf9b221c..313e3fa9 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
@@ -32,6 +32,11 @@ export class SlicingBusinessTableComponent implements OnInit {
ngOnInit() {
}
+ ngOnDestroy() {
+ this.progressingTimer.forEach((item) => {
+ clearInterval(item.timer)
+ })
+ }
selectedValue: string = BUSINESS_STATUS[0];
listOfData: any[] = [];
pageIndex: number = 1;