From 27f241a7c7c9741d1834fbb13dd7250cb51de8c9 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Wed, 11 Dec 2019 09:16:41 +0800 Subject: feat: Optimize code and add English fields Change-Id: Id61ab33f0bb612f8ae3a1debbc4c2d4887cf2b2d Issue-ID: USECASEUI-368 Signed-off-by: cyuamber --- .../src/app/mock/json/slicing_task_auditInfo.json | 4 +- .../basic-info/basic-info.component.html | 4 +- .../slicing-task-management.component.html | 62 +++++-- .../slicing-task-management.component.ts | 8 +- .../subnet-params-model.component.html | 181 +++++++++++++++------ usecaseui-portal/src/constants/constants.ts | 64 ++++---- 6 files changed, 217 insertions(+), 106 deletions(-) (limited to 'usecaseui-portal') 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 a3b97c82..0b444646 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json +++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json @@ -13,7 +13,7 @@ "service_snssai": "1-010101", "exp_data_rate_dl": "300", "exp_data_rate_ul": "300", - "ue_mobility_level": "stageary", + "ue_mobility_level": "stationary", "latency": "20", "use_interval": "12", "coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"], @@ -43,7 +43,7 @@ "cn_suggest_nssi_name": "eMBB CNinstance3", "cn_service_snssai": "1-010101", "cn_resource_sharing_level": "shared", - "cn_ue_mobility_level": "stageary", + "cn_ue_mobility_level": "stationary", "cn_latency": "10", "cn_max_number_of_ues": "10000", "cn_activity_factor": "60", diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html index f659bd47..9a11ca2e 100644 --- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html +++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html @@ -54,10 +54,10 @@ [nzSpan]="list.length === 1 ? '24' : '8'" *ngFor="let ite of list" > - + {{ ite.title }} :  {{ item[ite.key] }} - + {{ ite.title }} :   {{value}} diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html index c4aeb72e..81f4c961 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html @@ -2,17 +2,35 @@
Status : - - + +
- + Task ID @@ -33,19 +51,33 @@ {{ data.create_time | date: "yyyy-MM-dd HH:mm:ss"}} {{ data.processing_status }} - {{ data.operation }} - {{ data.operation }} + {{ data.operation }} + {{ data.operation }}
- + - + \ No newline at end of file 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 6c4d9041..944f4a25 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 @@ -14,7 +14,7 @@ export class SlicingTaskManagementComponent implements OnInit { showDetail: boolean = false; showProcess: boolean = false; - selectedValue = null; + selectedValue = 'all'; taskId: string; moduleTitle: string = ""; listOfData: any[] = []; @@ -47,7 +47,7 @@ export class SlicingTaskManagementComponent implements OnInit { processingStatusChange(): void { this.pageSize = '10'; this.pageNum = '1'; - if (this.selectedValue) { + if (this.selectedValue && this.selectedValue !== 'all') { this.getListOfProcessingStatus(); } else { this.getTaskList(); @@ -73,7 +73,7 @@ export class SlicingTaskManagementComponent implements OnInit { pageSizeChange(pageSize: number): void { this.pageSize = pageSize + ''; const { selectedValue } = this; - if (selectedValue) { + if (selectedValue && selectedValue !== 'all') { this.getListOfProcessingStatus(); } else { this.getTaskList(); @@ -83,7 +83,7 @@ export class SlicingTaskManagementComponent implements OnInit { pageNumChange(pageNum: number): void { this.pageNum = pageNum + ''; const { selectedValue } = this; - if (selectedValue) { + if (selectedValue && selectedValue !== 'all') { this.getListOfProcessingStatus(); } else { this.getTaskList(); 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 1dfc6338..127a5b98 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,54 +1,129 @@ - -
-
- - {{item.title}} - - - -
-
- - - - - - - - - -
- -
- -
-
- - {{item.title}} - - - - -
-
- - {{item.title}} - - - - - - - - - - - -
- -
+ +
+
+ + + {{ item.title }} + + + + +
+
+ + + + + + + + + +
+
+ +
+
+ + + {{ item.title }} + + + + + +
+
+ + + {{ item.title }} + + + + + + + + + + + +
+
diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 160a3282..667c3014 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -1,18 +1,22 @@ export const TASK_PROCESSING_STATUS = [ { - title: '规划阶段', + title: 'All', + value: 'all' + }, + { + title: 'Planning', value: 'Planning' }, { - title: '审核阶段', + title: 'Waiting to Confirm', value: 'Waiting to Confirm' }, { - title: '切片创建中', + title: 'Creating', value: 'Creating' }, { - title: '创建完成', + title: 'Completed', value: 'Completed' } ] @@ -20,7 +24,7 @@ export const TASK_PROCESSING_STATUS = [ export const BUSINESS_REQUIREMENT = [ [ { - title: '切片业务名称', + title: 'Slicing Business Name', key: 'service_name' }, { @@ -28,42 +32,42 @@ export const BUSINESS_REQUIREMENT = [ key: 'service_snssai' }, { - title: '用户下行带宽（Mbps）', + title: 'Data Rate Downlink (Mbps) ', key: 'exp_data_rate_dl' }, ], [ { - title: '用户上行带宽（Mbps）', + title: 'Data Rate Uplink (Mbps) ', key: 'exp_data_rate_ul' }, { - title: '游牧性', + title: 'Mobility', key: 'ue_mobility_level' }, { - title: '时延（ms）', + title: 'Latency (ms)', key: 'latency' }, ], [ { - title: '使用期限（月）', + title: 'Use Interval (Moon) ', key: 'use_interval' }, { - title: '激活因子（%）', + title: 'Activity Factor（%）', key: 'activity_factor' }, { - title: '共享等级', + title: 'Resource Sharing Level', key: 'resource_sharing_level' }, ], [ { - title: '连接规模数', + title: 'Max Number of UEs', key: 'max_number_of_ues' }, { @@ -77,7 +81,7 @@ export const BUSINESS_REQUIREMENT = [ ], [ { - title: '区域', + title: 'Area', key: 'area' }, ], @@ -87,7 +91,7 @@ export const BUSINESS_REQUIREMENT = [ export const WIRELESS_FORM_ITEMS = [ { - title: '时延（ms）', + title: 'Latency (ms)', key: 'an_latency' }, { @@ -95,18 +99,18 @@ export const WIRELESS_FORM_ITEMS = [ key: 'an_5qi' }, { - title: '覆盖小区列表', + title: 'Coverage Area Ta List', key: 'an_coverage_area_ta_list' } ] export const TRANSFRER_FORM_ITEMS = [ { - title: '时延（ms）', + title: 'Latency (ms)', key: 'tn_latency' }, { - title: '带宽', + title: 'Bandwidth', key: 'tn_bandwidth' } ] @@ -117,51 +121,51 @@ export const CORE_FORM_ITEMS = [ key: 'cn_service_snssai' }, { - title: '共享等级', + title: 'Resource Sharing Level', key: 'cn_resource_sharing_level', options: [ { - title: '共享', + title: 'Shared', key: 'shared' }, { - title: '独享', + title: 'Non-shared', key: 'no-shared' } ] }, { - title: '游牧性', + title: 'Mobility', key: 'cn_ue_mobility_level', options: [ { - title: '不可游牧', - key: 'stageary' + title: 'Stationary', + key: 'stationary' }, { - title: '固定接入', + title: 'Nomadic', key: 'nomadic' }, { - title: '限定范围内可游牧', + title: 'Spatially Restricted Mobility', key: 'spatially restricted mobility' }, { - title: '自由游牧', + title: 'Fully Mobility', key: 'fully mobility' } ] }, { - title: '时延（ms）', + title: 'Latency (ms)', key: 'cn_latency' }, { - title: '连接规模数', + title: 'Max Number of UEs', key: 'cn_max_number_of_ues' }, { - title: '活动因子（%）', + title: 'Activity Factor (%)', key: 'cn_activity_factor' }, { -- cgit 1.2.3-korg