feat:Fix bug

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

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
index 2418c90..f637203 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
@@ -93,9 +93,8 @@ export class BusinessOrderComponent implements OnInit {
        handleOk(): void {
                const coverage_list: string[] = [];
                let coverageAreas;
-
                COMMUNICATION_FORM_ITEMS.forEach((item, index) => {
-                       if (item.required && item.type === "input") {
+                       if (item.required && item.type === "input" ) {
                                this.Util.validator(
                                        item.title,
                                        item.key,
@@ -109,14 +108,26 @@ export class BusinessOrderComponent implements OnInit {
                if (this.validateRulesShow.indexOf(true) > -1) {
                        return;
                }
-
-               this.areaList.forEach((item) => {
+               for(var i=0;i<this.areaList.length;i++){
+                       const _item = this.areaList[i]
                        let str = "";
-                       item.forEach((area) => {
+                       for(var j=0;j<_item.length;j++){
+                               const area = _item[j]
                                str += area.selected + ";";
-                       });
+                               if(!area.selected){
+                                       this.message.error("Please Area the form");
+                                       return;
+                                  }
+                       }
                        coverage_list.push(str.substring(0, str.length - 1));
-               });
+               }
+               // this.areaList.forEach((item) => {
+               //      let str = "";
+               //      item.forEach((area) => {
+               //              str += area.selected + ";";
+               //      });
+               //      coverage_list.push(str.substring(0, str.length - 1));
+               // });
                if (coverage_list.length > 1) {
                        coverageAreas = coverage_list.join("|");
                } else {
@@ -130,6 +141,7 @@ export class BusinessOrderComponent implements OnInit {
                } else {
                        this.slicing_order_info.coverageArea = `${coverageAreas}`;
                }
+               console.log('jjjjkkk',this.slicing_order_info.coverageArea)
                delete this.slicing_order_info.coverageAreaNumber;
 
                const paramsObj = {
@@ -138,6 +150,7 @@ export class BusinessOrderComponent implements OnInit {
                const csmfSlicingPurchaseFailedCallback = () => {
                        this.handleCancel();
                };
+               
                this.myhttp
                        .csmfSlicingPurchase(paramsObj, csmfSlicingPurchaseFailedCallback)
                        .then((res) => {

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
index 687cd8f..b577fd9 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
@@ -77,6 +77,7 @@ a{
 }
 .ran_text{
     width: 200px;
+    padding:0 6px;
     height:auto;
     background: rgba(0, 0, 0, .8);
     line-height: 40px;
@@ -106,6 +107,7 @@ a{
 }
 .cor_text{
     width: 200px;
+    padding:0 6px;
     height:auto;
     background: rgba(0, 0, 0, .8);
     line-height: 40px;