Merge "feat:Modify picture"

3 files changed, 14 insertions, 11 deletions

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
index bc5a9298..951e5096 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
@@ -43,31 +43,31 @@
                     <p>
                         <img src="../../../../../../../assets/images/an-img.png" class="anImg"/>
                     </p>
-                    <p>{{outerData.anVersion}}</p>
+                    <p>{{businessDetailInfo.anVersion}}</p>
                 </li>
                 <li class="vLan-line">
                     <p >
-                       vLan:{{outerData.vLanText}}
+                       vLan:{{businessDetailInfo.vLanText}}
                     </p>
                     <p class="online-vlan"></p>
                 </li>
                 <li>
-                    <p>{{outerData.tnVersion}}</p>
+                    <p>{{businessDetailInfo.tnVersion}}</p>
                     <p>
                         <img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg"/>
                     </p>
                     <p>TN EDGEText<br/>Gateway</p>
                 </li>
                 <li class="three-box" >
-                    <p>{{outerData.mbps}} Mbps/yyyG</p>
+                    <p>{{businessDetailInfo.mbps}} Mbps/yyyG</p>
                     <p>
-                       {{outerData.msText}} ms
+                       {{businessDetailInfo.msText}} ms
                     </p>
-                    <p  [ngClass]="{'online-type':outerData.orchestration_status!=='deactivated','offline-type':outerData.orchestration_status=='deactivated'}"></p>
-                    <p class="">Link Type:{{outerData.linkType}}</p>
+                    <p  [ngClass]="{'online-type':businessDetailInfo.orchestration_status!=='deactivated','offline-type':businessDetailInfo.orchestration_status=='deactivated'}"></p>
+                    <p class="">Link Type:{{businessDetailInfo.linkType}}</p>
                 </li>
                 <li>
-                    <p>{{outerData.tnEndVersion}}</p>
+                    <p>{{businessDetailInfo.tnEndVersion}}</p>
                     <p>
                         <img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg"/>
                     </p>
@@ -75,7 +75,7 @@
                 </li>
                 <li class="vLan-line">
                     <p >
-                       vLan:{{outerData.cnVlan}}
+                       vLan:{{businessDetailInfo.cnVlan}}
                     </p>
                     <p class="online-vlan"></p>
                 </li>
@@ -83,7 +83,7 @@
                     <p>
                         <img src="../../../../../../../assets/images/cn-cloud-img.jpg" class="cnCloud"/>
                     </p>
-                    <p>{{outerData.cnVersion}}</p>
+                    <p>{{businessDetailInfo.cnVersion}}</p>
                 </li>
             </ul>
         </div>
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 b1e5c5c6..21c68524 100644
--- 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
@@ -21,6 +21,7 @@ a{
     display: flex;
     justify-content:center;
     align-items: center;
+    text-align: center;
    
 }
 .list-box li{
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
index 8ce9a39f..0072378a 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
@@ -25,6 +25,7 @@ export class SlicingBusinessModelComponent implements OnInit {
     taskModel: boolean = false;
     isSpinning: boolean = true;
     status: string = "";
+    businessDetailInfo : any = {}
     ngOnInit() {
         this.status = this.outerData.orchestration_status
         this.getDetail()
@@ -33,7 +34,8 @@ export class SlicingBusinessModelComponent implements OnInit {
     getDetail() {
         this.myhttp.getSlicingBusinessDetail(this.businessId).then(res => {
             this.isSpinning = false;
-            const { business_demand_info, business_demand_info: { coverage_area_ta_list }, nst_info, nsi_info } = res.result_body;
+            const { business_demand_info, business_demand_info: { coverage_area_ta_list }, nst_info, nsi_info ,business_detail_info} = res.result_body;
+            this.businessDetailInfo = business_detail_info
             business_demand_info.area = coverage_area_ta_list.map(item => {
                 item = item.split(';').join('-');
                 return item