diff options
Diffstat (limited to 'usecaseui-portal/src')
7 files changed, 227 insertions, 159 deletions
diff --git a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json index d931854d..b9756724 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json +++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json @@ -32,8 +32,20 @@ "suggest_nsi_name": "eMBB instance1",
"an_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411a",
"an_suggest_nssi_name": "eMBB ANinstance1",
+ "an_service_snssai": "an_1-010101",
+ "an_resource_sharing_level": "shared",
+ "an_ue_mobility_level": "stationary",
"an_latency": "10",
- "an_5qi": "8",
+ "an_max_number_of_ues": "10000",
+ "an_activity_factor": "60",
+ "an_exp_data_rate_dl": "300",
+ "an_exp_data_rate_ul": "300",
+ "an_area_traffic_cap_dl": "300",
+ "an_area_traffic_cap_ul": "300",
+ "an_overalluser_density":"test_an_overalluser_density_01",
+ "an_ip_address":"test_cn_ip_address_01",
+ "an_logical_link":"test_cn_logical_link_01",
+ "an_nexthop_info":"test_cn_nexthop_info_01",
"an_script_name":"test_an_01",
"an_coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"],
"tn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411b",
@@ -45,7 +57,7 @@ "tn_service_snssai":"test_tn_service_snssai_01",
"cn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411c",
"cn_suggest_nssi_name": "eMBB CNinstance3",
- "cn_service_snssai": "1-010101",
+ "cn_service_snssai": "cn_1-010101",
"cn_resource_sharing_level": "shared",
"cn_ue_mobility_level": "stationary",
"cn_latency": "10",
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts index 3ad730fb..0f530d7d 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, HostBinding } from '@angular/core'; -import { slideToRight } from '../../../shared/utils/animates'; +import { slideToRight } from '@src/app/shared/utils/animates'; @Component({ selector: 'app-slicing-management', 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 d5cda96c..34cd4451 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 @@ -1,7 +1,7 @@ import {Component, OnInit, Input, SimpleChanges} from '@angular/core'; import { NzMessageService } from 'ng-zorro-antd'; -import { SlicingTaskServices } from '.././../../../core/services/slicingTaskServices'; -import { TASK_PROCESSING_STATUS } from '../../../../../constants/constants'; +import { SlicingTaskServices } from '@src/app/core/services/slicingTaskServices'; +import { TASK_PROCESSING_STATUS } from '@src/constants/constants'; @Component({ selector: 'app-slicing-task-management', 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 4c60cd9a..7868114d 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 @@ -1,6 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core'; import { NzMessageService } from 'ng-zorro-antd'; -import { SlicingTaskServices } from '../../../../../core/services/slicingTaskServices'; +import { SlicingTaskServices } from '@src/app/core/services/slicingTaskServices'; @Component({ selector: 'app-slicing-task-model', @@ -143,11 +143,26 @@ export class SlicingTaskModelComponent implements OnInit { let subnetData = this.pick(nsi_nssi_info, ['an_suggest_nssi_id', 'an_suggest_nssi_name', 'tn_suggest_nssi_id', 'tn_suggest_nssi_name', 'cn_suggest_nssi_id', 'cn_suggest_nssi_name']); this.subnetDataFormatting(subnetData, 0); // 前端模拟数据 - let area = ["Beijing;Beijing;Haidian District", "Beijing;Beijing;Xicheng District", "Beijing;Beijing;Changping District"] - // this.slicingSubnet[0].params = { an_latency, an_5qi, an_coverage_area_ta_list } - // this.slicingSubnet[0].params = { an_latency, an_5qi, an_script_name, an_coverage_area_ta_list: area } + let area = ["Beijing;Beijing;Haidian District", "Beijing;Beijing;Xicheng District", "Beijing;Beijing;Changping District"]; + this.slicingSubnet[0].params = {...this.pick(nsi_nssi_info, [ + 'an_service_snssai', + 'an_resource_sharing_level', + 'an_ue_mobility_level', + 'an_latency', + 'an_max_number_of_ues', + 'an_activity_factor', + 'an_exp_data_rate_dl', + 'an_exp_data_rate_ul', + 'an_area_traffic_cap_dl', + 'an_area_traffic_cap_ul', + 'an_script_name', + 'an_overalluser_density', + // an_ip_address, + // an_logical_link, + // an_nexthop_info, + ]), an_coverage_area_ta_list: area}; this.slicingSubnet[1].params = this.pick(nsi_nssi_info, ['tn_latency', 'tn_bandwidth', 'tn_script_name', 'tn_jitter', 'tn_service_snssai']); - this.slicingSubnet[0].params = this.slicingSubnet[2].params = {...this.pick(nsi_nssi_info, [ + this.slicingSubnet[2].params = {...this.pick(nsi_nssi_info, [ 'cn_service_snssai', 'cn_resource_sharing_level', 'cn_ue_mobility_level', diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html index 990e5638..552523c0 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html @@ -1,39 +1,6 @@ <nz-modal [(nzVisible)]="showModel" [nzTitle]="title + 'Parameter'" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()" nzWidth="700px"> <div class="subnet_params_container"> - <!--<form nz-form *ngIf="title === 'An'">--> - <!--<nz-form-item *ngFor="let item of wirelessFormItems">--> - <!--<nz-form-label [nzSpan]="6" nzRequired [nzFor]="item.key">--> - <!--{{ item.title }}--> - <!--</nz-form-label>--> - <!--<nz-form-control [nzSpan]="10" *ngIf="item.key !== 'an_coverage_area_ta_list'">--> - <!--<input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key" />--> - <!--</nz-form-control>--> - <!--<div *ngIf="item.key === 'an_coverage_area_ta_list'">--> - <!--<div *ngFor="let area of areaList; let i = index">--> - <!--<nz-form-control [nzSpan]="!ind ? 4 : 5" [nzOffset]="i && !ind ? 6 : 0" class="subnet_params_area"--> - <!--*ngFor="let item of area; let ind = index">--> - <!--<nz-select [(ngModel)]="item.selected" [name]="'area' + i + ind"--> - <!--(nzOpenChange)="handleChange(area, item)"--> - <!--(ngModelChange)=" handleChangeSelected(area, item) ">--> - <!--<nz-option [nzValue]="op.name" [nzLabel]="op.name" *ngFor="let op of item.options">--> - <!--</nz-option>--> - <!--</nz-select>--> - <!--</nz-form-control>--> - <!--<nz-form-control [nzSpan]="1" [nzOffset]="1">--> - <!--<button nz-button nzType="primary" nzSize="small" class="subnet_params_button" *ngIf="!i"--> - <!--(click)="creatAreaList()">--> - <!--<i nz-icon class="anticon anticon-plus subnet_params_icon"></i>--> - <!--</button>--> - <!--<button nz-button nzType="primary" nzSize="small" class="subnet_params_button" *ngIf="i"--> - <!--(click)="deleteAreaList(i)">--> - <!--<i nz-icon class="anticon anticon-minus subnet_params_icon"></i>--> - <!--</button>--> - <!--</nz-form-control>--> - <!--</div>--> - <!--</div>--> - <!--</nz-form-item>--> - <!--</form>--> <form nz-form *ngIf="title === 'Tn'"> <nz-form-item *ngFor="let item of transferFormItems"> <nz-form-label [nzSpan]="7" nzRequired [nzFor]="item.key"> @@ -52,7 +19,7 @@ </form> <form nz-form *ngIf="title === 'An' || title === 'Cn'"> <nz-form-item *ngFor="let item of coreFormItems"> - <nz-form-label [nzSpan]="(item.key === 'an_coverage_area_ta_list' && title === 'An')?7:13" nzRequired *ngIf="!(item.key === 'an_coverage_area_ta_list' && title === 'Cn')"> + <nz-form-label [nzSpan]="(item.key === 'an_coverage_area_ta_list' && title === 'An')?7:13" nzRequired> {{ item.title }} </nz-form-label> <nz-form-control [nzSpan]="8" *ngIf="item.key !== 'an_coverage_area_ta_list'"> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts index a0b5df21..d279d037 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '@src/constants/constants' +import { TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '@src/constants/constants' @Component({ selector: 'app-subnet-params-model', @@ -15,8 +15,7 @@ export class SubnetParamsModelComponent implements OnInit { @Output() paramsDataChange = new EventEmitter<any>(); transferFormItems = TRANSFRER_FORM_ITEMS; - coreFormItems = CORE_FORM_ITEMS; - wirelessFormItems = WIRELESS_FORM_ITEMS; + coreFormItems :object ={}; areaList: any[] = []; constructor() { } @@ -24,6 +23,7 @@ export class SubnetParamsModelComponent implements OnInit { ngOnInit() { } ngOnChanges() { + this.coreFormItems = this.title === 'An'?CORE_FORM_ITEMS.An:CORE_FORM_ITEMS.Cn; if (this.title === 'An') { this.AreaFormatting(); } diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index dea02d39..8d8af354 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -89,24 +89,6 @@ export const BUSINESS_REQUIREMENT = [ ]
-export const WIRELESS_FORM_ITEMS = [
- {
- title: 'Latency (ms)',
- key: 'an_latency'
- },
- {
- title: '5QI',
- key: 'an_5qi'
- },
- {
- title: 'Script Name',
- key: 'an_script_name'
- },
- {
- title: 'Coverage Area Ta List',
- key: 'an_coverage_area_ta_list'
- }
-]
export const TRANSFRER_FORM_ITEMS = [
{
@@ -131,100 +113,192 @@ export const TRANSFRER_FORM_ITEMS = [ },
]
-export const CORE_FORM_ITEMS = [
- {
- title: 'S-NSSAI',
- key: 'cn_service_snssai'
- },
- {
- title: 'Resource Sharing Level',
- key: 'cn_resource_sharing_level',
- options: [
- {
- title: 'Shared',
- key: 'shared'
- },
- {
- title: 'Non-shared',
- key: 'non-shared'
- }
- ]
- },
- {
- title: 'Mobility',
- key: 'cn_ue_mobility_level',
- options: [
- {
- title: 'Stationary',
- key: 'stationary'
- },
- {
- title: 'Nomadic',
- key: 'nomadic'
- },
- {
- title: 'Spatially Restricted Mobility',
- key: 'spatially restricted mobility'
- },
- {
- title: 'Fully Mobility',
- key: 'fully mobility'
- }
- ]
- },
- {
- title: 'Latency (ms)',
- key: 'cn_latency'
- },
- {
- title: 'Max Number of UEs',
- key: 'cn_max_number_of_ues'
- },
- {
- title: 'Activity Factor (%)',
- key: 'cn_activity_factor'
- },
- {
- title: 'User Downlink Experience Rate（Mbps）',
- key: 'cn_exp_data_rate_dl'
- },
- {
- title: 'User Uplink Experience Rate（Mbps）',
- key: 'cn_exp_data_rate_ul'
- },
- {
- title: 'Downlink Regional Traffic Density（Mbps/km ）',
- key: 'cn_area_traffic_cap_dl'
- },
- {
- title: 'Uplink Regional Traffic Density（Mbps/km ）',
- key: 'cn_area_traffic_cap_ul'
- },
- {
- title: 'Script Name',
- key: 'cn_script_name'
- },
- {
- title: 'overallUserDensity',
- key: 'cn_overalluser_density'
- },
- // {
- // title: 'IP Address',
- // key: 'cn_ip_address'
- // },
- // {
- // title: 'Logical Link',
- // key: 'cn_logical_link'
- // },
- // {
- // title: 'Nexthop Info',
- // key: 'cn_nexthop_info'
- // },
- {
- title: 'Coverage Area Ta List',
- key: 'an_coverage_area_ta_list'
- }
-]
+export const CORE_FORM_ITEMS = {
+ "An": [
+ {
+ title: 'S-NSSAI',
+ key: 'an_service_snssai'
+ },
+ {
+ title: 'Resource Sharing Level',
+ key: 'an_resource_sharing_level',
+ options: [
+ {
+ title: 'Shared',
+ key: 'shared'
+ },
+ {
+ title: 'Non-shared',
+ key: 'non-shared'
+ }
+ ]
+ },
+ {
+ title: 'Mobility',
+ key: 'an_ue_mobility_level',
+ options: [
+ {
+ title: 'Stationary',
+ key: 'stationary'
+ },
+ {
+ title: 'Nomadic',
+ key: 'nomadic'
+ },
+ {
+ title: 'Spatially Restricted Mobility',
+ key: 'spatially restricted mobility'
+ },
+ {
+ title: 'Fully Mobility',
+ key: 'fully mobility'
+ }
+ ]
+ },
+ {
+ title: 'Latency (ms)',
+ key: 'an_latency'
+ },
+ {
+ title: 'Max Number of UEs',
+ key: 'an_max_number_of_ues'
+ },
+ {
+ title: 'Activity Factor (%)',
+ key: 'an_activity_factor'
+ },
+ {
+ title: 'User Downlink Experience Rate（Mbps）',
+ key: 'an_exp_data_rate_dl'
+ },
+ {
+ title: 'User Uplink Experience Rate（Mbps）',
+ key: 'an_exp_data_rate_ul'
+ },
+ {
+ title: 'Downlink Regional Traffic Density（Mbps/km ）',
+ key: 'an_area_traffic_cap_dl'
+ },
+ {
+ title: 'Uplink Regional Traffic Density（Mbps/km ）',
+ key: 'an_area_traffic_cap_ul'
+ },
+ {
+ title: 'Script Name',
+ key: 'an_script_name'
+ },
+ {
+ title: 'overallUserDensity',
+ key: 'an_overalluser_density'
+ },
+ // {
+ // title: 'IP Address',
+ // key: 'an_ip_address'
+ // },
+ // {
+ // title: 'Logical Link',
+ // key: 'an_logical_link'
+ // },
+ // {
+ // title: 'Nexthop Info',
+ // key: 'an_nexthop_info'
+ // },
+ {
+ title: 'Coverage Area Ta List',
+ key: 'an_coverage_area_ta_list'
+ }
+ ],
+ "Cn": [
+ {
+ title: 'S-NSSAI',
+ key: 'cn_service_snssai'
+ },
+ {
+ title: 'Resource Sharing Level',
+ key: 'cn_resource_sharing_level',
+ options: [
+ {
+ title: 'Shared',
+ key: 'shared'
+ },
+ {
+ title: 'Non-shared',
+ key: 'non-shared'
+ }
+ ]
+ },
+ {
+ title: 'Mobility',
+ key: 'cn_ue_mobility_level',
+ options: [
+ {
+ title: 'Stationary',
+ key: 'stationary'
+ },
+ {
+ title: 'Nomadic',
+ key: 'nomadic'
+ },
+ {
+ title: 'Spatially Restricted Mobility',
+ key: 'spatially restricted mobility'
+ },
+ {
+ title: 'Fully Mobility',
+ key: 'fully mobility'
+ }
+ ]
+ },
+ {
+ title: 'Latency (ms)',
+ key: 'cn_latency'
+ },
+ {
+ title: 'Max Number of UEs',
+ key: 'cn_max_number_of_ues'
+ },
+ {
+ title: 'Activity Factor (%)',
+ key: 'cn_activity_factor'
+ },
+ {
+ title: 'User Downlink Experience Rate（Mbps）',
+ key: 'cn_exp_data_rate_dl'
+ },
+ {
+ title: 'User Uplink Experience Rate（Mbps）',
+ key: 'cn_exp_data_rate_ul'
+ },
+ {
+ title: 'Downlink Regional Traffic Density（Mbps/km ）',
+ key: 'cn_area_traffic_cap_dl'
+ },
+ {
+ title: 'Uplink Regional Traffic Density（Mbps/km ）',
+ key: 'cn_area_traffic_cap_ul'
+ },
+ {
+ title: 'Script Name',
+ key: 'cn_script_name'
+ },
+ {
+ title: 'overallUserDensity',
+ key: 'cn_overalluser_density'
+ },
+ // {
+ // title: 'IP Address',
+ // key: 'an_ip_address'
+ // },
+ // {
+ // title: 'Logical Link',
+ // key: 'an_logical_link'
+ // },
+ // {
+ // title: 'Nexthop Info',
+ // key: 'an_nexthop_info'
+ // }
+ ]
+}
export const ADDRESS = [
{
|