diff options
Diffstat (limited to 'usecaseui-portal/src/app/views')
2 files changed, 25 insertions, 47 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html index e3125931..6bc72029 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html @@ -1,10 +1,7 @@ -<nz-modal [nzVisible]="showDetail" nzWidth="85%" [nzTitle]="moduleTitle" [nzFooter]="modalFooter" (nzOnCancel)="handleCancel()"> +<nz-modal [nzVisible]="showDetail" nzWidth="85%" [nzTitle]="moduleTitle" [nzFooter]="modalFooter" + (nzOnCancel)="handleCancel()"> <nz-spin [nzSpinning]="isSpinning"> - <app-basic-info - [checkDetail]="checkDetail" - [businessRequirement]="businessRequirement" - [NSTinfo]="NSTinfo" - > + <app-basic-info [checkDetail]="checkDetail" [businessRequirement]="businessRequirement" [NSTinfo]="NSTinfo"> </app-basic-info> <div> <nz-list class="taskmodel_list" nzBordered [nzHeader]="nssiInfoTile" [nzFooter]="null" *ngIf="slicingInstances"> @@ -14,23 +11,14 @@ <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8"> <div nz-col nzSpan="12"> NSI ID： - <nz-select - nzShowSearch - [(ngModel)]="selectedServiceId" - (nzOpenChange)="openSlicingInstance($event)" - (nzScrollToBottom)="getNextPageData()" - (ngModelChange)="slicingInstanceChange()" - > - <nz-option - nzCustomContent - *ngFor="let item of slicingInstances.list" - [nzValue]="item.service_instance_id" - [nzLabel]="item.service_instance_id" - > - <span>{{item.service_instance_name + ' -- '}}</span> {{item.service_instance_id}} + <nz-select nzShowSearch [(ngModel)]="selectedServiceId" (nzOpenChange)="openSlicingInstance($event)" + (nzScrollToBottom)="getNextPageData()" (ngModelChange)="slicingInstanceChange()"> + <nz-option nzCustomContent *ngFor="let item of slicingInstances.list" [nzValue]="item.service_instance_id" + [nzLabel]="item.service_instance_id"> + <span>{{item.service_instance_name + ' : '}}</span> {{item.service_instance_id}} </nz-option> <nz-option *ngIf="slicingInstances.isLoading" nzDisabled nzCustomContent> - <i class="anticon anticon-loading anticon-spin loading-icon"></i> + <i class="anticon anticon-loading anticon-spin loading-icon"></i> Loading Data... </nz-option> </nz-select> @@ -50,24 +38,15 @@ <div nz-row [nzGutter]="8"> <div nz-col nzSpan="12"> NSSI ID： - <nz-select - nzShowSearch - [nzDisabled]="isDisabled" - [(ngModel)]="item.slicingId" - (ngModelChange)="slicingSubnetChange(item)" - (nzOpenChange)="openSubnetInstances($event, item)" - (nzScrollToBottom)="getNextPageSubnet(item)" - > - <nz-option - nzCustomContent - *ngFor="let item of item.instances" - [nzValue]="item.service_instance_id" - [nzLabel]="item.service_instance_id" - > - <span>{{item.service_instance_name + ' -- '}}</span> {{item.service_instance_id}} + <nz-select nzShowSearch [nzDisabled]="isDisabled" [(ngModel)]="item.slicingId" + (ngModelChange)="slicingSubnetChange(item)" (nzOpenChange)="openSubnetInstances($event, item)" + (nzScrollToBottom)="getNextPageSubnet(item)"> + <nz-option nzCustomContent *ngFor="let item of item.instances" [nzValue]="item.service_instance_id" + [nzLabel]="item.service_instance_id"> + <span>{{item.service_instance_name + ' : '}}</span> {{item.service_instance_id}} </nz-option> <nz-option *ngIf="item.isLoading" nzDisabled nzCustomContent> - <i class="anticon anticon-loading anticon-spin loading-icon"></i> + <i class="anticon anticon-loading anticon-spin loading-icon"></i> Loading Data... </nz-option> </nz-select> @@ -95,12 +74,7 @@ <button nz-button (click)="handleCancel()">Cancel</button> <button nz-button nzType="primary" [nzLoading]='loading' (click)="handleOk()">OK</button> </ng-template> -<app-subnet-params-model - [showModel]="isShowParams" - [detailData]="params" - [title]="paramsTitle" - (cancel)="isShowParams=$event" - (paramsDataChange)="changeParams($event)" -> +<app-subnet-params-model [showModel]="isShowParams" [detailData]="params" [title]="paramsTitle" + (cancel)="isShowParams=$event" (paramsDataChange)="changeParams($event)"> </app-subnet-params-model> <app-notification #notification [isServicesList]="false" [parentComponent]="'slicing'"></app-notification>
\ No newline at end of file diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts index 76a1eda4..4b19a12d 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts @@ -144,6 +144,9 @@ export class SlicingTaskModelComponent implements OnInit { // 共享切片实例 this.selectedServiceId = suggest_nsi_id; this.selectedServiceName = suggest_nsi_name; + if (!this.selectedServiceId || !this.selectedServiceName) { + this.isDisabled = false; + } this.slicingInstances = { currentPage: '1', pageSize: '10', @@ -227,14 +230,15 @@ export class SlicingTaskModelComponent implements OnInit { slicingInstanceChange(): void { this.isDisabled = true; - this.selectedServiceName = '' + this.selectedServiceName = ''; // 获取切片子网实例数据 this.http.getSlicingSubnetInstance(this.selectedServiceId).subscribe(res => { const { result_header: { result_code }, result_body, record_number } = res; if (+result_code === 200) { - this.subnetDataFormatting(result_body, record_number) + this.subnetDataFormatting(result_body, record_number); } else { - this.message.error('Failed to get slicing subnet instance ID') + this.subnetDataFormatting({}, 1); + this.message.error('Failed to get slicing subnet instance ID'); } }, ({ status, statusText }) => { this.message.error(status + ' (' + statusText + ')'); |