feat: Modify the html structure of the task processing dialog

Change-Id: I117c5d5cf6b5a7ab4f2251836c13ce2ee986b9c0
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

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 0682c16..4e570cc 100644 (file)
--- 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": {\r
         "task_id": "b1bb0ce7-ebca-4fa7-95ed-4840d70a1177",\r
         "task_name": "5G Slice service eMMB",\r
-        "create_timer": "1454171445000",\r
+        "create_time": "1454171445000",\r
         "processing_status": "Waiting to Confirm",\r
         "business_demand_info": {\r
             "service_name": "5G Slice eMMB",\r

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 5e6914a..e2c5561 100644 (file)
--- 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 11bcb9f..d4a91ea 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -99,46 +99,69 @@ export const TRANSFRER_FORM_ITEMS = [
 ]\r
 \r
 export const CORE_FORM_ITEMS =         [\r
-       {\r
-               title: 'S-NSSAI',\r
-               key: 'cn_service_snssai'\r
-       },\r
-       {\r
-               title: '共享等级',\r
-               key: 'cn_resource_sharing_level'\r
-       },\r
-       {\r
-               title: '游牧性',\r
-               key: 'cn_ue_mobility_level'\r
-       },\r
-       {\r
-               title: '时延（ms）',\r
-               key: 'cn_latency'\r
-       },\r
-       {\r
-               title: '连接规模数',\r
-               key: 'cn_max_number_of_ues'\r
-       },\r
-       {\r
-               title: '活动因子（%）',\r
-               key: 'cn_activity_factor'\r
-       },\r
-       {\r
-               title: '用户下行体验速率（Mbps）',\r
-               key: 'cn_exp_data_rate_dl'\r
-       },\r
-       {\r
-               title: '用户上行体验速率（Mbps）',\r
-               key: 'cn_exp_data_rate_ul'\r
-       },\r
-       {\r
-               title: '下行区域流量密度（Mbps/km ）',\r
-               key: 'cn_area_traffic_cap_dl'\r
-       },\r
-       {\r
-               title: '下行区域流量密度（Mbps/km ）',\r
-               key: 'cn_area_traffic_cap_ul'\r
-       }\r
+       [\r
+               {\r
+                       title: '切片业务名称',\r
+                       key: 'service_name'\r
+               },\r
+               {\r
+                       title: 'S-NSSAI',\r
+                       key: 'service_snssai'\r
+               },\r
+               {\r
+                       title: '用户下行带宽（Mbps）',\r
+                       key: 'exp_data_rate_dl'\r
+               },\r
+       ],\r
+       [\r
+               {\r
+                       title: '用户上行带宽（Mbps）',\r
+                       key: 'exp_data_rate_ul'\r
+               },\r
+               {\r
+                       title: '游牧性',\r
+                       key: 'ue_mobility_level'\r
+               },\r
+               {\r
+                       title: '时延（ms）',\r
+                       key: 'latency'\r
+               },\r
+       ],\r
+       [\r
+               {\r
+                       title: '使用期限（月）',\r
+                       key: 'use_interval'\r
+               },\r
+               \r
+               {\r
+                       title: '激活因子（%）',\r
+                       key: 'activity_factor'\r
+               },\r
+               {\r
+                       title: '共享等级',\r
+                       key: 'resource_sharing_level'\r
+               },\r
+       ],\r
+       [\r
+               {\r
+                       title: '连接规模数',\r
+                       key: 'max_number_of_ues'\r
+               },\r
+               {\r
+                       title: '上行区域流量密度（Mbps/km ）',\r
+                       key: 'area_traffic_cap_ul'\r
+               },\r
+               {\r
+                       title: '下行区域流量密度（Mbps/km ）',\r
+                       key: 'area_traffic_cap_dl'\r
+               }\r
+       ],\r
+       [\r
+               {\r
+                       title: '区域',\r
+                       key: 'coverage_area_ta_list'\r
+               },\r
+       ]\r
 ]\r
 \r
 export const ADDRESS = {\r