feat:drawing 42/118842/1
authorwangyuerg <wangyuerg@chinamobile.com>
Fri, 5 Mar 2021 08:59:51 +0000 (16:59 +0800)
committerwangyuerg <wangyuerg@chinamobile.com>
Fri, 5 Mar 2021 09:00:29 +0000 (17:00 +0800)
Signed-off-by: wangyuerg <wangyuerg@chinamobile.com>
Change-Id: Ifef7f2e08a18220f0464227352993479b3db0d70
Issue-ID: USECASEUI-527

usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
usecaseui-portal/src/assets/images/an-img.png [new file with mode: 0644]
usecaseui-portal/src/assets/images/ask-img.png [new file with mode: 0644]
usecaseui-portal/src/assets/images/cn-cloud-img.jpg [new file with mode: 0644]
usecaseui-portal/src/assets/images/cn-img.jpg [new file with mode: 0644]
usecaseui-portal/src/assets/images/tn-edge-img.png [new file with mode: 0644]

index e95e245..7fd459c 100644 (file)
@@ -18,7 +18,7 @@
                                <p>Note: If coverageArea is not at all provided by the user (as it is an optional input, and also optional in Service Profile), we will assume that the entire network is required to be covered. For Coverage Area Number, please enter the rectangle grid numbers corresponding to the physical coverage areas that you see on the map image. The following image shows the rectangular grid numbers for a coverage area, you can take it as an example:</p> 
                                 <img src="../../../../../../assets/images/coverageAreaMap.png" class="detail-img"/>
                             </div>
-                            <span class="detail-icon" *ngIf="item.key === 'coverageAreaNumber'" (mouseover)="detailFn(item.coverflag)" (mouseleave)="detailFn(item.coverflag)" >?</span>
+                            <img src="../../../../../../assets/images/ask-img.png" alt="" class="detail-icon" *ngIf="item.key === 'coverageAreaNumber'" (mouseover)="detailFn(item.coverflag)" (mouseleave)="detailFn(item.coverflag)" />
                     </nz-tooltip>
                     <nz-radio-group [name]="item.key" [(ngModel)]="slicing_order_info[item.key]"
                         *ngIf="item.type === 'radio'">
index c0b15eb..4feac5d 100644 (file)
@@ -40,7 +40,7 @@
   text-indent: 2em;
   position: absolute;
   right: -200px;
-  top: -458px;
+  top: -430px;
   color:#ffffff;
   p{
     padding: 10px 10px 0 10px;
 }
 .detail-icon{
   position: absolute;
-   right: -16px;
+   right: -26px;
+   bottom:-2px;
+   width:20px;
+   height:20px;
 cursor: pointer;
 
 }
@@ -58,7 +61,7 @@ cursor: pointer;
   content: '';
     display: block;
     position: absolute;
-    right: 178px;
+    right: 175px;
     bottom: -16px;
     border: 20px solid transparent;
     border: 8px solid transparent;
index 217e8bb..3195783 100644 (file)
     </nz-list>
     <nz-list class="taskmodel_list" nzBordered [nzHeader]="'End to End Topology:'" [nzFooter]="null">
         <div>status:{{status}}</div>
-        <img style="width: 100%;" src="assets/images/slicing-business-management/example.png" alt="example" />
+        <!-- <img style="width: 100%;" src="assets/images/slicing-business-management/example.png" alt="example" /> -->
         <!-- <img src="assets/images/slicing-business-management/server.svg" /> -->
+        <div class="warp">
+            <div class="header">
+                <p>AN</p>
+                <p>TN</p>
+                <p>CN</p>
+            </div>
+            <ul class="list-box">
+                <li>
+                    <p>
+                        <img src="../../../../../../../assets/images/an-img.png" class="anImg"/>
+                    </p>
+                    <p>{{outerData.anVersion}}</p>
+                </li>
+                <li class="vLan-line">
+                    <p >
+                       vLan:{{outerData.vLanText}}
+                    </p>
+                    <p class="online-vlan"></p>
+                </li>
+                <li>
+                    <p>{{outerData.tnVersion}}</p>
+                    <p>
+                        <img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg"/>
+                    </p>
+                    <p>{{outerData.tnText}}<br/>Gateway</p>
+                </li>
+                <li class="three-box" >
+                    <p>{{outerData.mbps}} Mbps/yyyG</p>
+                    <p>
+                       {{outerData.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>
+                </li>
+                <li>
+                    <p>{{outerData.tnEndVersion}}</p>
+                    <p>
+                        <img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg"/>
+                    </p>
+                    <p>{{outerData.tnEndText}}<br/>Gateway</p>
+                </li>
+                <li class="vLan-line">
+                    <p >
+                       vLan:{{outerData.cnVlan}}
+                    </p>
+                    <p class="online-vlan"></p>
+                </li>
+                <li>
+                    <p>
+                        <img src="../../../../../../../assets/images/cn-cloud-img.jpg" class="cnCloud"/>
+                    </p>
+                    <p>{{outerData.cnVersion}}</p>
+                </li>
+            </ul>
+        </div>
     </nz-list>
 </nz-spin>
\ No newline at end of file
index afccd61..60dc8e5 100644 (file)
@@ -1,3 +1,62 @@
 .taskmodel_list{
     margin-top: 20px;
 }
+a{
+    text-decoration: none;
+}
+.header{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    height: 40px;
+    line-height: 40px;
+    color:#000;
+    margin:10px 20px;
+}
+.anImg{
+    width: 60px;
+    height: 85px;
+}
+.list-box{
+    display: flex;
+    justify-content:center;
+    align-items: center;
+   
+}
+.list-box li{
+    position: relative;
+}
+.clear{
+    clear: both;
+}
+.online-vlan{
+  width: 100px;
+  height: 1px;
+  background: #000;
+}
+.online-type{
+  width: 200px;
+  height: 3px;
+  background: #6a9bd0;
+}
+.offline-type{
+    width: 200px;
+    height: 3px;
+    background: #7e848a;
+}
+.vLan-line{
+    text-align: center;
+    top:-20px;
+}
+.tnImg{
+    width: 85px;
+    height: 85px;
+}
+.three-box{
+  text-align: center;
+    top:-20px;
+}
+.cnCloud{
+    width: 230px;
+    height: 160px;
+}
\ No newline at end of file
index b0207fd..0bffccf 100644 (file)
@@ -24,9 +24,24 @@ export class SlicingBusinessModelComponent implements OnInit {
     nsiInfo: any[] = [];
     taskModel: boolean = false;
     isSpinning: boolean = true;
-    status: string = ""
+    status: string = "";
     ngOnInit() {
         console.log(this.businessId, "id",this.outerData);
+        const param = {
+            anVersion:'10.2.3.4.5',
+            vLanText:'111',
+            tnVersion:'10.0.1.1.1',
+            tnText:'TN EDGEText',
+            mbps:'333',
+            msText:'555',
+            linkType:'p2p/mp2p',
+            tnEndVersion:'10.1.1.1',
+            tnEndText:'TN EDGEText',
+            cnVlan:'66',
+            cnVersion:'1.1.2.3'
+        }
+        this.outerData = {...this.outerData,...param}
+        console.log('new',this.outerData)
         this.status = this.outerData.orchestration_status
         this.getDetail()
     }
@@ -46,6 +61,7 @@ export class SlicingBusinessModelComponent implements OnInit {
             });
             this.businessRequirement = [{ ...business_demand_info, area }];
             this.NSTinfo = [nst_info];
+            console.log('ngs',this.NSTinfo)
             if (nsi_info.nsi_id !== null) {
                 this.nsiInfo = [nsi_info];
             }
index 640ba3b..bcd024e 100644 (file)
@@ -61,8 +61,9 @@
                             </div>
                         </td>
                         <td>
+                            <!-- [ngClass]="{'cannotclick':data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100'}" -->
                             <a (click)="showdetail(data)"
-                                [ngClass]="{'cannotclick':data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100'}">View
+                               >View
                                 Detail</a>
                         </td>
                     </tr>
diff --git a/usecaseui-portal/src/assets/images/an-img.png b/usecaseui-portal/src/assets/images/an-img.png
new file mode 100644 (file)
index 0000000..1543497
Binary files /dev/null and b/usecaseui-portal/src/assets/images/an-img.png differ
diff --git a/usecaseui-portal/src/assets/images/ask-img.png b/usecaseui-portal/src/assets/images/ask-img.png
new file mode 100644 (file)
index 0000000..76a74eb
Binary files /dev/null and b/usecaseui-portal/src/assets/images/ask-img.png differ
diff --git a/usecaseui-portal/src/assets/images/cn-cloud-img.jpg b/usecaseui-portal/src/assets/images/cn-cloud-img.jpg
new file mode 100644 (file)
index 0000000..4a484db
Binary files /dev/null and b/usecaseui-portal/src/assets/images/cn-cloud-img.jpg differ
diff --git a/usecaseui-portal/src/assets/images/cn-img.jpg b/usecaseui-portal/src/assets/images/cn-img.jpg
new file mode 100644 (file)
index 0000000..dbf5ed5
Binary files /dev/null and b/usecaseui-portal/src/assets/images/cn-img.jpg differ
diff --git a/usecaseui-portal/src/assets/images/tn-edge-img.png b/usecaseui-portal/src/assets/images/tn-edge-img.png
new file mode 100644 (file)
index 0000000..c4093e3
Binary files /dev/null and b/usecaseui-portal/src/assets/images/tn-edge-img.png differ