From cd7079b452eb67c04240bdc7d0f5269f935f1901 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Wed, 12 Aug 2020 19:06:06 +0800 Subject: feat: Parameter modification and adding new parameters of 5g slicing tast Change-Id: Idd8552f71a51e32b239642ef4e3d2b9f8ccbeacd Issue-ID: USECASEUI-368 Signed-off-by: cyuamber --- .../src/app/mock/json/slicing_task_auditInfo.json | 8 +- .../slicing-task-model.component.ts | 20 +++- .../subnet-params-model.component.html | 105 +++++++++++++-------- .../subnet-params-model.component.ts | 2 +- usecaseui-portal/src/constants/constants.ts | 36 ++++++- usecaseui-portal/src/tsconfig.app.json | 5 +- usecaseui-portal/tsconfig.json | 8 +- 7 files changed, 134 insertions(+), 50 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 3b48acb6..d931854d 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json +++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json @@ -41,6 +41,8 @@ "tn_latency": "10", "tn_bandwidth": "300", "tn_script_name":"test_tn_01", + "tn_jitter":"test_tn_jitter_01", + "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", @@ -53,7 +55,11 @@ "cn_exp_data_rate_ul": "300", "cn_area_traffic_cap_dl": "300", "cn_area_traffic_cap_ul": "300", - "cn_script_name":"test_cn_01" + "cn_script_name":"test_cn_01", + "cn_overalluser_density":"test_cn_overalluser_density_01", + "cn_ip_address":"test_cn_ip_address_01", + "cn_logical_link":"test_cn_logical_link_01", + "cn_nexthop_info":"test_cn_nexthop_info_01" } } 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 5e28f2d6..764ff207 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 @@ -117,6 +117,8 @@ export class SlicingTaskModelComponent implements OnInit { tn_latency, tn_bandwidth, tn_script_name, + tn_jitter, + tn_service_snssai, cn_service_snssai, cn_resource_sharing_level, cn_ue_mobility_level, @@ -127,7 +129,11 @@ export class SlicingTaskModelComponent implements OnInit { cn_exp_data_rate_ul, cn_area_traffic_cap_dl, cn_area_traffic_cap_ul, - cn_script_name + cn_script_name, + cn_overalluser_density, + cn_ip_address, + cn_logical_link, + cn_nexthop_info, } = nsi_nssi_info; // 处理配置审核详情数据 this.checkDetail = [{ task_id, task_name, create_time, processing_status, service_snssai }]; @@ -167,9 +173,9 @@ export class SlicingTaskModelComponent implements OnInit { // 前端模拟数据 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 } + // this.slicingSubnet[0].params = { an_latency, an_5qi, an_script_name, an_coverage_area_ta_list: area } this.slicingSubnet[1].params = { tn_latency, tn_bandwidth, tn_script_name }; - this.slicingSubnet[2].params = { + this.slicingSubnet[0].params = this.slicingSubnet[2].params = { cn_service_snssai, cn_resource_sharing_level, cn_ue_mobility_level, @@ -180,7 +186,12 @@ export class SlicingTaskModelComponent implements OnInit { cn_exp_data_rate_ul, cn_area_traffic_cap_dl, cn_area_traffic_cap_ul, - cn_script_name + cn_script_name, + cn_overalluser_density, + cn_ip_address, + cn_logical_link, + cn_nexthop_info, + an_coverage_area_ta_list: area }; } else { this.message.error(result_message || 'Failed to get data') @@ -352,6 +363,7 @@ export class SlicingTaskModelComponent implements OnInit { } showParamsModel(item: any): void { + console.log(item,"------->") this.isShowParams = true; this.paramsTitle = item.title; this.params = item.params 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 227c182a..990e5638 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,57 +1,63 @@
-
- - - {{ item.title }} - - - - -
-
- - - - - - - - - - -
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ item.title }} - +
-
+ - + {{ item.title }} - + @@ -64,6 +70,29 @@ +
+
+ + + + + + + + + + +
+
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 f091667a..a0b5df21 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 '../.../../../../../../../../constants/constants' +import { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '@src/constants/constants' @Component({ selector: 'app-subnet-params-model', diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 93cdc71e..b5f2244d 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -109,12 +109,20 @@ export const WIRELESS_FORM_ITEMS = [ ] export const TRANSFRER_FORM_ITEMS = [ + { + title: 'S-NSSAI', + key: 'tn_service_snssai' + }, { - title: 'Latency (ms)', - key: 'tn_latency' - }, + title: 'Latency (ms)', + key: 'tn_latency' + }, + { + title: 'Jitter', + key: 'tn_jitter' + }, { - title: 'Bandwidth', + title: 'MaxBandwidth', key: 'tn_bandwidth' }, { @@ -195,6 +203,26 @@ export const CORE_FORM_ITEMS = [ { 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' } ] diff --git a/usecaseui-portal/src/tsconfig.app.json b/usecaseui-portal/src/tsconfig.app.json index 39ba8dba..2eb27d17 100644 --- a/usecaseui-portal/src/tsconfig.app.json +++ b/usecaseui-portal/src/tsconfig.app.json @@ -4,7 +4,10 @@ "outDir": "../out-tsc/app", "baseUrl": "./", "module": "es2015", - "types": [] + "types": [], + "paths": { + "@src/*": ["*"] + } }, "exclude": [ "test.ts", diff --git a/usecaseui-portal/tsconfig.json b/usecaseui-portal/tsconfig.json index a6c016bf..973577be 100644 --- a/usecaseui-portal/tsconfig.json +++ b/usecaseui-portal/tsconfig.json @@ -1,6 +1,7 @@ { "compileOnSave": false, "compilerOptions": { + "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, @@ -14,6 +15,11 @@ "lib": [ "es2017", "dom" - ] + ], + "paths": { + "@src/*": [ + "src/*" + ] + } } } -- cgit 1.2.3-korg