summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal
diff options
context:
space:
mode:
authorxu ran <xuranyjy@chinamobile.com>2021-03-10 07:18:19 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-10 07:18:19 +0000
commit6cff31f9341e1798e587d7cf0d8ae5c0d8cde70e (patch)
treea55594bc68c54ea4ffb7ece6b3ec4310e830a07a /usecaseui-portal
parentdc1a8e47373c972eaf04d62922baa5527e552778 (diff)
parentafdfb9cdbf08e12254eff4611e74620c785f4069 (diff)
Merge "feat:modify style"
Diffstat (limited to 'usecaseui-portal')
-rw-r--r--usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json3
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html14
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less19
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts1
-rw-r--r--usecaseui-portal/src/assets/images/tn-edge-img.pngbin1861 -> 3066 bytes
5 files changed, 22 insertions, 15 deletions
diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
index 134f85c5..32167b65 100644
--- a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
+++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
@@ -54,7 +54,8 @@
"linkType":"p2p/mp2p",
"tnEndVersion":"10.1.1.1",
"cnVlan":"11",
- "cnVersion":"1.1.2.3"
+ "cnVersion":"1.1.2.3",
+ "orchestration_status":"active"
}
}
} \ No newline at end of file
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 951e5096..3944f967 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
@@ -29,7 +29,7 @@
</nz-table>
</nz-list>
<nz-list class="taskmodel_list" nzBordered [nzHeader]="'End to End Topology:'" [nzFooter]="null">
- <div>status:{{status}}</div>
+ <!-- <div>status:{{status}}</div> -->
<!-- <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">
@@ -49,21 +49,21 @@
<p >
vLan:{{businessDetailInfo.vLanText}}
</p>
- <p class="online-vlan"></p>
+ <p [ngClass]="{'online-type':status!=='deactivated','offline-type':status=='deactivated'}"></p>
</li>
<li>
<p>{{businessDetailInfo.tnVersion}}</p>
<p>
<img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg"/>
</p>
- <p>TN EDGEText<br/>Gateway</p>
+ <p>PE</p>
</li>
<li class="three-box" >
- <p>{{businessDetailInfo.mbps}} Mbps/yyyG</p>
+ <p>{{businessDetailInfo.mbps}} Mbps</p>
<p>
{{businessDetailInfo.msText}} ms
</p>
- <p [ngClass]="{'online-type':businessDetailInfo.orchestration_status!=='deactivated','offline-type':businessDetailInfo.orchestration_status=='deactivated'}"></p>
+ <p [ngClass]="{'online-type':status!=='deactivated','offline-type':status=='deactivated'}"></p>
<p class="">Link Type:{{businessDetailInfo.linkType}}</p>
</li>
<li>
@@ -71,13 +71,13 @@
<p>
<img src="../../../../../../../assets/images/tn-edge-img.png" class="tnImg"/>
</p>
- <p>TN EDGEText<br/>Gateway</p>
+ <p>PE</p>
</li>
<li class="vLan-line">
<p >
vLan:{{businessDetailInfo.cnVlan}}
</p>
- <p class="online-vlan"></p>
+ <p [ngClass]="{'online-type':status!=='deactivated','offline-type':status=='deactivated'}"></p>
</li>
<li>
<p>
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 21c68524..38e20a72 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
@@ -6,16 +6,17 @@ a{
}
.header{
display: flex;
- justify-content: space-around;
+ justify-content: space-between;
align-items: center;
height: 40px;
line-height: 40px;
color:#000;
- margin:10px 20px;
+ margin:10px 102px;
}
.anImg{
width: 65px;
height: auto;
+ margin-top: 20px;
}
.list-box{
display: flex;
@@ -36,21 +37,23 @@ a{
background: #000;
}
.online-type{
- width: 200px;
+ width: 180px;
height: 3px;
- background: #6a9bd0;
+ background: #1DA57A;
+ margin: 0 5px;
}
.offline-type{
- width: 200px;
+ width: 180px;
height: 3px;
background: #7e848a;
+ margin: 0 5px;
}
.vLan-line{
text-align: center;
top:-20px;
}
.tnImg{
- width: 85px;
+ width: 65px;
height:auto;
}
.three-box{
@@ -58,6 +61,8 @@ a{
top:-20px;
}
.cnCloud{
- width: 90px;
+ margin-left:10px;
+ width: 88px;
height: auto;
+ margin-top: 20px;
} \ No newline at end of file
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 0072378a..2d97dc3f 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
@@ -28,6 +28,7 @@ export class SlicingBusinessModelComponent implements OnInit {
businessDetailInfo : any = {}
ngOnInit() {
this.status = this.outerData.orchestration_status
+ console.log('status',this.status)
this.getDetail()
}
diff --git a/usecaseui-portal/src/assets/images/tn-edge-img.png b/usecaseui-portal/src/assets/images/tn-edge-img.png
index c4093e30..4ca6d1c3 100644
--- a/usecaseui-portal/src/assets/images/tn-edge-img.png
+++ b/usecaseui-portal/src/assets/images/tn-edge-img.png
Binary files differ