feat:Merge master

Change-Id: I6fcad85d3270f2090da2a1a18733c3d0d896ab99
Issue-ID: USECASEUI-527
Signed-off-by: xuran <xuranyjy@chinamobile.com>

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 4d3c797..44c8f5e 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
@@ -86,9 +86,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,
@@ -102,14 +101,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 {
@@ -123,6 +134,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 = {
@@ -131,6 +143,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 afccd61..f7f3227 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
@@ -1,3 +1,144 @@
 .taskmodel_list{
     margin-top: 20px;
 }
+a{
+    text-decoration: none;
+}
+.warp{
+    width: 100%;
+}
+.header{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 40px;
+    line-height: 40px;
+    color:#000;
+    margin:10px 8%;
+    text-align: center;
+}
+.anImg{
+    width: 80px;
+    height: auto;
+    margin-top: 20px;
+}
+.list-box{
+     width: 90%;
+    display: flex;
+    justify-content:center;
+    align-items: center;
+    text-align: center;
+    margin:0 5%;
+}
+.list-box li{
+    position: relative;
+}
+.clear{
+    clear: both;
+}
+.online-vlan{
+    flex:1;
+  height: 1px;
+  background: #000;
+}
+.online-type{
+  height: 3px;
+  background: #1DA57A;
+  margin: 0 15px;
+}
+.offline-type{
+ 
+    height: 3px;
+    background: #7e848a;
+    margin: 0 15px;
+}
+.vLan-line{
+    text-align: center;
+    top:-20px;
+    flex:1;
+}
+.tnImg{
+    width: 40px;
+    height:auto;
+}
+.three-box{
+  text-align: center;
+  flex:1;
+    top:-20px;
+}
+.cnCloud{
+    margin-left:10px;
+    width: 80px;
+    height: auto;
+    margin-top: 20px;
+}
+.fantask{
+    height: 20px;
+}
+.ran_text{
+    width: 200px;
+    padding:0 6px;
+    height:auto;
+    background: rgba(0, 0, 0, .8);
+    line-height: 40px;
+    border-radius: 4px;
+    position: absolute;
+    right: -118px;
+    top: 44px;
+    color:#ffffff;
+    z-index:99;
+}
+.detail-icon{
+     position: absolute;
+     right: -22px;
+     width:20px;
+     height:20px;
+     cursor: pointer;
+  }
+.ran_text::before{
+    content: '';
+    display: block;
+    position: absolute;
+    right: 96px;
+    bottom: -16px;
+    border: 20px solid transparent;
+    border: 8px solid transparent;
+    border-top: 8px solid  rgba(0, 0, 0, .8);
+}
+.cor_text{
+    width: 200px;
+    padding:0 6px;
+    height:auto;
+    background: rgba(0, 0, 0, .8);
+    line-height: 40px;
+    border-radius: 4px;
+    position: absolute;
+    right: -98px;
+    top: 26px;
+    color:#ffffff;
+}
+.cor_text::before{
+    content: '';
+    display: block;
+    position: absolute;
+    right: 82px;
+    bottom: -16px;
+    border: 20px solid transparent;
+    border: 8px solid transparent;
+    border-top: 8px solid  rgba(0, 0, 0, .8);
+}
+.core_icon{
+    position: absolute;
+    right:-18px;
+    width:20px;
+    height:20px;
+    cursor: pointer;
+}
+.ran_adrress{
+    width:80px;
+    height:22px;
+}
+.cn_adrress{
+    width:90px;
+    height:22px;
+}