summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcyuamber <xuranyjy@chinamobile.com>2019-12-19 17:20:51 +0800
committercyuamber <xuranyjy@chinamobile.com>2019-12-19 17:20:56 +0800
commit69f6fe3f33d033ae1d43785dfd3f4b9ed8ee0588 (patch)
treec127dad7441d0bdcc963d731910e400d4a2581a2
parent05925e61ceb9d73971e868436c14a44c3fb61906 (diff)
fix: ifx bug of slicing management page
Change-Id: Icad8d4d3e64cab01168e6621754ad43f0ed07ccd Issue-ID: USECASEUI-369 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts9
4 files changed, 13 insertions, 4 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts
index c34787d9..569a018f 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts
@@ -24,9 +24,9 @@ export class NsiModelComponent implements OnInit {
}
getNsiDetail() {
this.myhttp.getSlicingNsiDetail(this.nsiId).subscribe(res => {
+ this.isSpinning = false;
const {result_header: {result_code}, result_body: {hosted_business_list,included_nssi_list} } = res;
if (+result_code === 200) {
- this.isSpinning = false;
this.businessList = hosted_business_list;
this.nssiList = included_nssi_list;
}
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts
index d1af5457..034d8666 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts
@@ -22,9 +22,9 @@ export class NssiModelComponent implements OnInit {
}
getNssiDetail(){
this.myhttp.getSlicingNssiDetail(this.nssiId).subscribe(res => {
+ this.isSpinning = false;
const {result_header: {result_code}, result_body: {hosted_nsi_list} } = res;
if (+result_code === 200) {
- this.isSpinning = false;
this.nsiList = hosted_nsi_list;
}
})
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
index 253e1c32..e0328c89 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
@@ -29,9 +29,9 @@ export class SlicingBusinessModelComponent implements OnInit {
getDetail() {
this.myhttp.getSlicingBusinessDetail(this.businessId).subscribe(res => {
+ this.isSpinning = false;
const { result_body, result_header: { result_code } } = res;
if (+result_code === 200) {
- this.isSpinning = false;
const {business_demand_info,business_demand_info: { coverage_area_ta_list },nst_info,nsi_info} = result_body;
business_demand_info.area = coverage_area_ta_list.map(item => {
item = item.split(';').join('-');
@@ -52,7 +52,7 @@ export class SlicingBusinessModelComponent implements OnInit {
nzOkText: null,
nzCancelText: null,
nzComponentParams:{
- businessId:data.nsi_id
+ nsiId:data.nsi_id
}
});
}
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 1cee88d8..834f0c92 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
@@ -23,6 +23,7 @@ export class SlicingBusinessTableComponent implements OnInit {
this.progressingTimer.forEach((item) => {
clearInterval(item.timer);
})
+ this.progressingTimer = [];
}
selectedValue:string = BUSINESS_STATUS[0];
listOfData: any[] = [];
@@ -72,9 +73,17 @@ export class SlicingBusinessTableComponent implements OnInit {
getListOfProcessingStatus(){
this.pageIndex = 1;
this.pageSize = 10;
+ this.progressingTimer.forEach((item) => {
+ clearInterval(item.timer);
+ });
+ this.progressingTimer = [];
this.getBusinessList();
}
searchData(reset: boolean = false) {
+ this.progressingTimer.forEach((item) => {
+ clearInterval(item.timer);
+ });
+ this.progressingTimer = [];
this.getBusinessList();
}
switchChange(slicing,i){