fix the bug of create-model

Signed-off-by: wangyuerg <wangyuerg@chinamobile.com>
Change-Id: Ic74397429fa99ed477b9ccdfe154f0453cb7d743
Issue-ID: USECASEUI-505

diff --git a/usecaseui-portal/src/app/core/models/dataInterface.ts b/usecaseui-portal/src/app/core/models/dataInterface.ts
index 0017a60..d367fe1 100644 (file)
--- a/usecaseui-portal/src/app/core/models/dataInterface.ts
+++ b/usecaseui-portal/src/app/core/models/dataInterface.ts
@@ -1,6 +1,6 @@
 enum baseUrl{
     baseUrl = '/api/usecaseui-server/v1'  //online
-    // baseUrl = 'https://192.168.235.77:30283'    //local two
+    // baseUrl = 'https://192.168.235.25:30283/api/usecaseui-server/v1'    //local two
 }
 
 interface servicesTableData {

diff --git a/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts b/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts
index 48b2061..9d0dd61 100644 (file)
--- a/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/create-model/create-model.component.ts
@@ -145,7 +145,12 @@ export class CreateModelComponent implements OnInit {
     this.http.getTemplateParameters(types, chosedtemplates)
         .subscribe((data) => {
           this.loadingAnimateShow = false;
-          if (data.status == "FAILED") {
+          if (!data || !data.status) {
+            this.temParametersTips = true;
+            this.isVisible = true;
+            this.msg.error('Back end data format error')
+          }
+          else if (data.status == "FAILED") {
             this.temParametersTips = true;
             this.isVisible = true;
           } else {

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 649b5eb..119f87d 100644 (file)
--- 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
@@ -283,7 +283,18 @@ export class SubnetParamsModelComponent implements OnInit {
                        params = {...this.formData};
                }
                // Verify that each item is not empty, include special handeling of area_list
-               if (this.Util.deepCheck(params) && this.areaCheckBeforeSubmit(params)) {
+               console.log(params)
+               let checkParams = params
+               if (this.title === 'An' || this.title === 'Cn') {
+                       checkParams = this.coreFormItems.filter((item) => {
+                               return item.required === true
+                       })
+               } else if (this.title = 'Tn') {
+                       checkParams = this.transferFormItems.filter((item) => {
+                               return item.required === true
+                       })
+               }
+               if (this.Util.deepCheck(checkParams) && this.areaCheckBeforeSubmit(params)) {
                        this.paramsDataChange.emit(params);
                        this.handleCancel();
                } else {

diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index 951af26..48f9aeb 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -230,22 +230,22 @@ export const CORE_FORM_ITEMS = {
         {\r
             title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
             key: 'sliceProfile_AN_areaTrafficCapDL',\r
-            required: true\r
+            required: false\r
         },\r
         {\r
             title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
             key: 'sliceProfile_AN_areaTrafficCapUL',\r
-            required: true,\r
+            required: false\r
         },\r
         {\r
             title: 'Script Name',\r
             key: 'an_script_name',\r
-            required: true\r
+            required: false\r
         },\r
         {\r
             title: 'Overall User Density',\r
             key: 'sliceProfile_AN_overallUserDensity',\r
-            required: true\r
+            required: false\r
         },\r
         {\r
             title:'Endpoint',\r
@@ -365,17 +365,17 @@ export const CORE_FORM_ITEMS = {
         {\r
             title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
             key: 'cn_area_traffic_cap_dl',\r
-            required: true\r
+            required: false\r
         },\r
         {\r
             title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
             key: 'cn_area_traffic_cap_ul',\r
-            required: true\r
+            required: false\r
         },\r
         {\r
             title: 'Script Name',\r
             key: 'cn_script_name',\r
-            required: true\r
+            required: false\r
         },\r
         {\r
             title: 'Max Number of PUD Session',\r
@@ -385,7 +385,7 @@ export const CORE_FORM_ITEMS = {
         {\r
             title: 'OverAll User Density',\r
             key: 'sliceProfile_CN_overallUserDensity',\r
-            required: true\r
+            required: false\r
         },\r
         // {\r
         //     title: 'ip-address',\r