diff options
author | 2022-03-29 14:37:38 +0800 | |
---|---|---|
committer | 2022-03-29 14:37:52 +0800 | |
commit | 841ef0d6f86a17105c92e44683e796b829962f52 (patch) | |
tree | ff2858d18ca0debdaabf214c3b66aaafcc84cdfb /usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management | |
parent | 5d7bec14a9e18d7de0f1b228f9b396a810eb5b47 (diff) |
fix: after submit to new page
Signed-off-by: liuwh7 <liuwh7@asiainfo.com>
Change-Id: I945a645748991d13b3195f3390642bfb2ef5a3e7
Issue-ID: REQ-1075
Diffstat (limited to 'usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management')
3 files changed, 28 insertions, 25 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html index 74069f69..9ad0d4e6 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html @@ -1,4 +1,4 @@ -<nz-modal [(nzVisible)]="showModel" nzTitle="Create Communication Service" (nzOnCancel)="handleCancel()" nzWidth="80%" +<nz-modal [(nzVisible)]="showModel" nzTitle="Create Communication Service" (nzOnCancel)="handleCancel(false)" nzWidth="80%" [nzFooter]="modalFooter"> <div class="subnet_params_container"> <form nz-form> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts index 70ef4ef8..55bf386b 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts @@ -39,7 +39,7 @@ export class BusinessOrderComponent implements OnInit { @Input() showModel: boolean; @Input() modelParams: any; - @Output() cancel = new EventEmitter<boolean>(); + @Output() cancel = new EventEmitter<any>(); comunicationFormItems = COMMUNICATION_FORM_ITEMS; slicing_order_info = { name: null, @@ -83,9 +83,12 @@ export class BusinessOrderComponent implements OnInit { }); } - handleCancel(): void { + handleCancel(flag): void { this.showModel = false; - this.cancel.emit(this.showModel); + this.cancel.emit({ + closeFlag: false, + to5gPage: flag + }); this.slicing_order_info = { name: null, maxNumberofUEs: null, @@ -151,7 +154,7 @@ export class BusinessOrderComponent implements OnInit { slicing_order_info: this.slicing_order_info, }; const csmfSlicingPurchaseFailedCallback = () => { - this.handleCancel(); + this.handleCancel(true); }; this.loading = true; @@ -179,7 +182,7 @@ export class BusinessOrderComponent implements OnInit { this.message.create("error", "Network error"); } this.loading = false; - this.handleCancel(); + this.handleCancel(true); }); } @@ -198,7 +201,7 @@ export class BusinessOrderComponent implements OnInit { this.message.create("error", "Network error"); } this.loading = false; - this.handleCancel(); + this.handleCancel(true); }); } } 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 6eb5e936..40a5c252 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 @@ -1,8 +1,8 @@ import { Component, Input, OnInit, SimpleChanges } from "@angular/core"; +import * as moment from "moment"; +import { NzMessageService, NzModalService } from "ng-zorro-antd"; import { BUSINESS_STATUS } from "../../../../../constants/constants"; import { SlicingTaskServices } from ".././../../../core/services/slicingTaskServices"; -import { NzModalService, NzMessageService } from "ng-zorro-antd"; -import * as moment from "moment"; import { INTERVAL_TIME } from "../constant"; @Component({ selector: "app-csmf-slicing-business-management", @@ -234,22 +234,22 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit { } OrderModelShow(): void { - this.orderForm = null; - this.businessOrderShow = true; + this.orderForm = null; + this.businessOrderShow = true; } orderModelClose($event: any): void { - this.businessOrderShow = $event; - this.getCSMFBusinessList(); - } - inputOrderModelShow(): void { - this.inputBusinessOrderShow = true; - } - inputOrderModelClose($event: any): void { - this.inputBusinessOrderShow = false; - if ($event.cancel) { - return; - } - this.orderForm = $event.param; - this.businessOrderShow = true; - } + this.businessOrderShow = $event.closeFlag; + this.getCSMFBusinessList(); + } + inputOrderModelShow(): void { + this.inputBusinessOrderShow = true; + } + inputOrderModelClose($event: any): void { + this.inputBusinessOrderShow = false; + if ($event.cancel) { + return; + } + this.orderForm = $event.param; + this.businessOrderShow = true; + } } |