feat: Business Requirement Info Add some parameters of 5g task

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

diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
index 018799c..cafeeeb 100644 (file)
--- a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
+++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
@@ -6,7 +6,7 @@
   "result_body": {
     "business_demand_info": {
       "service_name": "5GSliceeMMB",
-      "service_snssai": "1-010101",
+      "service_snssai": "",
       "exp_data_rate_dl": "300",
       "exp_data_rate_ul": "300",
       "ue_mobility_level": "stageary",

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 687ec52..6065be0 100644 (file)
--- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
@@ -11,17 +11,21 @@
         "business_demand_info": {\r
             "service_name": "5G Slice eMMB",\r
             "service_snssai": "",\r
-            "exp_data_rate_dl": "300",\r
-            "exp_data_rate_ul": "300",\r
             "ue_mobility_level": "stationary",\r
             "latency": "20",\r
             "use_interval": "12",\r
             "coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"],\r
             "activity_factor": "60",\r
             "resource_sharing_level": "shared",\r
-            "area_traffic_cap_ul": "300",\r
-            "area_traffic_cap_dl": "300",\r
-            "max_number_of_ues": "10000"\r
+            "max_number_of_ues": "10000",\r
+            "uLThptPerUE":"1000",\r
+            "dLThptPerUE":"2000",\r
+            "uLThptPerSlice":"3000",\r
+            "dLThptPerSlice":"4000",\r
+            "maxPktSize":"10000",\r
+            "termDensity":"500",\r
+            "jitter":"10",\r
+            "survivalTime":"10"\r
         },\r
         "nst_info": {\r
             "nst_id": "46da8cf8-0878-48ac-bea3-f2200959411a",\r

diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts
index 538b08c..6539bbd 100644 (file)
--- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts
+++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts
@@ -27,6 +27,20 @@ export class BasicInfoComponent implements OnInit {
         this.businessListAfterSorting = [];
         this.businessList = BUSINESS_REQUIREMENT.concat([]);
         if(this.businessRequirement && this.businessRequirement.length !== 0){
+            let businessListkeysList = [];
+            this.businessList.map(ite=>{
+                if(!Array.isArray(ite)){businessListkeysList.push(ite["key"])}
+            })
+             // Filter the difference between the local businessList and the requirement data returned by the backend.
+             // When the key is missing in the data returned by the backend, the local businessList data is deleted and filtered
+            let filterSubtractionKeysList = businessListkeysList.filter(item=>Object.keys(this.businessRequirement[0]).indexOf(item)==-1);
+            filterSubtractionKeysList.map(key=>{
+                this.businessList.map((item,k)=>{
+                    if(Array.isArray(item) === false && item["key"] === key){
+                        this.businessList.splice(k,1)
+                    }
+                })
+            });
             Object.keys(this.businessRequirement[0]).map((item,index)=>{
                 if(this.businessRequirement[0][item] !== '' && this.businessRequirement[0][item] !== null){
                     this.requirement[0][item] = this.businessRequirement[0][item];

diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index 9d5554d..2d8abd9 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -31,14 +31,14 @@ export const BUSINESS_REQUIREMENT = [
                        title: 'S-NSSAI',\r
                        key: 'service_snssai'\r
                },\r
-               {\r
-                       title: 'Data Rate Downlink (Mbps) ',\r
-                       key: 'exp_data_rate_dl'\r
-               },\r
-               {\r
-                       title: 'Data Rate Uplink (Mbps) ',\r
-                       key: 'exp_data_rate_ul'\r
-               },\r
+               // {\r
+               //      title: 'Data Rate Downlink (Mbps) ',\r
+               //      key: 'exp_data_rate_dl'\r
+               // },\r
+               // {\r
+               //      title: 'Data Rate Uplink (Mbps) ',\r
+               //      key: 'exp_data_rate_ul'\r
+               // },\r
                {\r
                        title: 'Mobility',\r
                        key: 'ue_mobility_level'\r
@@ -64,14 +64,46 @@ export const BUSINESS_REQUIREMENT = [
                        title: 'Max Number of UEs',\r
                        key: 'max_number_of_ues'\r
                },\r
-               {\r
-                       title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
-                       key: 'area_traffic_cap_ul'\r
-               },\r
-               {\r
-                       title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
-                       key: 'area_traffic_cap_dl'\r
-               },\r
+               // {\r
+               //      title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
+               //      key: 'area_traffic_cap_ul'\r
+               // },\r
+               // {\r
+               //      title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
+               //      key: 'area_traffic_cap_dl'\r
+        // },\r
+        {\r
+                       title: 'Uplink throughput per UE',\r
+                       key: 'uLThptPerUE'\r
+        },\r
+        {\r
+                       title: 'Downlink throughput per UE',\r
+                       key: 'dLThptPerUE'\r
+        },\r
+        {\r
+                       title: 'Uplink throughput per network slice',\r
+                       key: 'uLThptPerSlice'\r
+        },\r
+        {\r
+                       title: 'Downlink throughput per network slice',\r
+                       key: 'dLThptPerSlice'\r
+        },\r
+        {\r
+                       title: 'Maximum Number of Connections',\r
+                       key: 'maxPktSize'\r
+        },\r
+        {\r
+                       title: 'Terminal density',\r
+                       key: 'termDensity'\r
+        },\r
+        {\r
+                       title: 'Jitter',\r
+                       key: 'jitter'\r
+        },\r
+        {\r
+                       title: 'SurvivalTime',\r
+                       key: 'survivalTime'\r
+        },\r
                [\r
             {\r
                 title: 'Area',\r