summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxu ran <xuranyjy@chinamobile.com>2021-03-09 03:41:14 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-09 03:41:14 +0000
commit837dc1e53312f0e100399c3564d71d51ea43943c (patch)
tree3070aec1586766845819d3dcaceb83385e9f3f84
parentfe0373c48edc239b3c69a923be17d1d4dc34143f (diff)
parentb7c682d8800a96600bf55db39e5dabfb60c6bab6 (diff)
Merge "feat:Modify picture"
-rw-r--r--usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json11
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_business_list.json33
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html20
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less1
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts4
-rw-r--r--usecaseui-portal/src/assets/images/cn-cloud-img.jpgbin5855 -> 7485 bytes
6 files changed, 28 insertions, 41 deletions
diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
index 37e6bbe3..134f85c5 100644
--- a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
+++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
@@ -44,6 +44,17 @@
"nsi_name": "slicing-01-eMBB",
"nsi_type": "eMBB",
"nsi_orchestration-status": "activated"
+ },
+ "business_detail_info":{
+ "anVersion":"10.2.3.4.5",
+ "vLanText":"11111",
+ "tnVersion":"10.0.1.1.1",
+ "mbps":"11111",
+ "msText":"11111",
+ "linkType":"p2p/mp2p",
+ "tnEndVersion":"10.1.1.1",
+ "cnVlan":"11",
+ "cnVersion":"1.1.2.3"
}
}
} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
index 7f599794..224f8035 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
@@ -13,16 +13,7 @@
"service_snssai": "1-010101",
"orchestration_status": "processing",
"last_operation_type": "processing",
- "last_operation_progress": 80,
- "anVersion":"10.2.3.4.5",
- "vLanText":"111",
- "tnVersion":"10.0.1.1.1",
- "mbps":"111",
- "msText":"111",
- "linkType":"p2p/mp2p",
- "tnEndVersion":"10.1.1.1",
- "cnVlan":"11",
- "cnVersion":"1.1.2.3"
+ "last_operation_progress": 80
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9267",
@@ -31,16 +22,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activated",
- "last_operation_progress": 10,
- "anVersion":"10.2.3.4.5",
- "vLanText":"222",
- "tnVersion":"10.0.1.1.1",
- "mbps":"222",
- "msText":"222",
- "linkType":"p2p/mp2p",
- "tnEndVersion":"10.1.1.1",
- "cnVlan":"22",
- "cnVersion":"1.1.2.3"
+ "last_operation_progress": 10
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9271",
@@ -49,16 +31,7 @@
"service_snssai": "1-010101",
"orchestration_status": "deactivated",
"last_operation_type": "deactivated",
- "last_operation_progress": 100,
- "anVersion":"10.2.3.4.5",
- "vLanText":"333",
- "tnVersion":"10.0.1.1.1",
- "mbps":"333",
- "msText":"333",
- "linkType":"p2p/mp2p",
- "tnEndVersion":"10.1.1.1",
- "cnVlan":"33",
- "cnVersion":"1.1.2.3"
+ "last_operation_progress": 100
}
]
}
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
diff --git a/usecaseui-portal/src/assets/images/cn-cloud-img.jpg b/usecaseui-portal/src/assets/images/cn-cloud-img.jpg
index 4a484db1..444f0044 100644
--- a/usecaseui-portal/src/assets/images/cn-cloud-img.jpg
+++ b/usecaseui-portal/src/assets/images/cn-cloud-img.jpg
Binary files differ