From 19b190ce4d1042c769b93c50882b91e748af061d Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Thu, 5 Dec 2019 12:24:47 +0800
Subject: feat:  Modify the html structure of the task processing dialog

Change-Id: I117c5d5cf6b5a7ab4f2251836c13ce2ee986b9c0
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../src/app/mock/json/slicing_task_auditInfo.json  |   2 +-
 .../slicing-task-model.component.html              |   6 +-
 usecaseui-portal/src/constants/constants.ts        | 103 +++++++++++++--------
 3 files changed, 67 insertions(+), 44 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 0682c16b..4e570cc9 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
@@ -6,7 +6,7 @@
     "result_body": {
         "task_id": "b1bb0ce7-ebca-4fa7-95ed-4840d70a1177",
         "task_name": "5G Slice service eMMB",
-        "create_timer": "1454171445000",
+        "create_time": "1454171445000",
         "processing_status": "Waiting to Confirm",
         "business_demand_info": {
             "service_name": "5G Slice eMMB",
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 5e6914ab..e2c5561e 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
@@ -16,7 +16,7 @@
       </nz-list-item>
       <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8">
         <div nz-col nzSpan="10">
-          <span>Arrived Time： {{ check.create_timer }}</span>
+          <span>Arrived Time： {{ check.create_time | date: 'yyyy-MM-dd HH:mm:ss' }}</span>
         </div>
         <div nz-col nzSpan="8">
           <span>Status： {{ check.processing_status }}</span>
@@ -28,8 +28,8 @@
   <nz-list class="taskmodel_list" [nzDataSource]="businessRequirement" nzBordered [nzHeader]="'业务需求信息：'"
     [nzFooter]="null" [nzRenderItem]="businessItem">
     <ng-template #businessItem let-item>
-      <nz-list-item *ngFor="let ite of businessList " nz-row>
-        <div nz-col nz-Span='10'>
+      <nz-list-item  nz-row nzType="flex" nzJustify="start" [nzGutter]="8" *ngFor="let list of businessList ">
+        <div nz-col [nzSpan]="list.length === 1 ? '24' : '8'" *ngFor="let ite of list">
           <span class="ant-typography">{{ ite.title }} : &nbsp;{{ item[ite.key] }}</span>
         </div>
       </nz-list-item>
diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index 11bcb9f3..d4a91ea1 100644
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -99,46 +99,69 @@ export const TRANSFRER_FORM_ITEMS = [
 ]
 
 export const CORE_FORM_ITEMS = 	[
-	{
-		title: 'S-NSSAI',
-		key: 'cn_service_snssai'
-	},
-	{
-		title: '共享等级',
-		key: 'cn_resource_sharing_level'
-	},
-	{
-		title: '游牧性',
-		key: 'cn_ue_mobility_level'
-	},
-	{
-		title: '时延（ms）',
-		key: 'cn_latency'
-	},
-	{
-		title: '连接规模数',
-		key: 'cn_max_number_of_ues'
-	},
-	{
-		title: '活动因子（%）',
-		key: 'cn_activity_factor'
-	},
-	{
-		title: '用户下行体验速率（Mbps）',
-		key: 'cn_exp_data_rate_dl'
-	},
-	{
-		title: '用户上行体验速率（Mbps）',
-		key: 'cn_exp_data_rate_ul'
-	},
-	{
-		title: '下行区域流量密度（Mbps/km ）',
-		key: 'cn_area_traffic_cap_dl'
-	},
-	{
-		title: '下行区域流量密度（Mbps/km ）',
-		key: 'cn_area_traffic_cap_ul'
-	}
+	[
+		{
+			title: '切片业务名称',
+			key: 'service_name'
+		},
+		{
+			title: 'S-NSSAI',
+			key: 'service_snssai'
+		},
+		{
+			title: '用户下行带宽（Mbps）',
+			key: 'exp_data_rate_dl'
+		},
+	],
+	[
+		{
+			title: '用户上行带宽（Mbps）',
+			key: 'exp_data_rate_ul'
+		},
+		{
+			title: '游牧性',
+			key: 'ue_mobility_level'
+		},
+		{
+			title: '时延（ms）',
+			key: 'latency'
+		},
+	],
+	[
+		{
+			title: '使用期限（月）',
+			key: 'use_interval'
+		},
+		
+		{
+			title: '激活因子（%）',
+			key: 'activity_factor'
+		},
+		{
+			title: '共享等级',
+			key: 'resource_sharing_level'
+		},
+	],
+	[
+		{
+			title: '连接规模数',
+			key: 'max_number_of_ues'
+		},
+		{
+			title: '上行区域流量密度（Mbps/km ）',
+			key: 'area_traffic_cap_ul'
+		},
+		{
+			title: '下行区域流量密度（Mbps/km ）',
+			key: 'area_traffic_cap_dl'
+		}
+	],
+	[
+		{
+			title: '区域',
+			key: 'coverage_area_ta_list'
+		},
+	]
 ]
 
 export const ADDRESS = {
-- 
cgit 1.2.3-korg