From e978667f57e600c89e7ee421366dc37ef2685121 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Tue, 28 Apr 2020 11:31:21 +0800
Subject: fix: Fix bugs image for services-list
Change-Id: Ic7b3240781509a892a01cd3dbc8ba53cae96bba0
Issue-ID: USECASEUI-305
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
.../ccvpn-creation/ccvpn-creation.component.ts | 4 ++--
.../services-list/e2e-detail/e2e-detail.component.ts | 8 ++++----
.../services/services-list/services-list.component.ts | 16 +++++++++-------
3 files changed, 15 insertions(+), 13 deletions(-)
(limited to 'usecaseui-portal/src/app')
diff --git a/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts
index abbe6d6a..7ac17b65 100644
--- a/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts
@@ -521,8 +521,8 @@ export class CcvpnCreationComponent implements OnInit {
siteImage = [];
tpImage = [];
imgmap = {
- '1': '../../../assets/images/domain1.png',
- '2': '../../../assets/images/site.png'
+ '1': 'assets/images/domain1.png',
+ '2': 'assets/images/site.png'
};
drawImage(sitelist) {
diff --git a/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts
index ca49a6b9..ddfac403 100644
--- a/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts
@@ -68,9 +68,9 @@ export class E2eDetailComponent implements OnInit {
};
imgmap = {
- '1': '../../../../assets/images/create-e2e.png',
- '2': '../../../../assets/images/create-ns.png',
- '3': '../../../../assets/images/create-vnf.png',
+ '1': 'assets/images/create-e2e.png',
+ '2': 'assets/images/create-ns.png',
+ '3': 'assets/images/create-vnf.png',
};
getKeys(item) {
@@ -83,7 +83,6 @@ export class E2eDetailComponent implements OnInit {
if (this.detailParams.serviceDomain == 'E2E Service') {
this.input_parameters = JSON.stringify(this.detailParams['input-parameters']);
this.input_parameters = JSON.parse(this.input_parameters);
-
this.service = {
name: this.input_parameters.service.name,
description: this.input_parameters.service.description,
@@ -121,6 +120,7 @@ export class E2eDetailComponent implements OnInit {
}
} else if (this.detailParams.serviceDomain == 'Network Service') {
+ console.log(this.detailParams,"---this.detailParams--ns");
this.ns_service = {
name: this.detailParams.name || this.detailParams['service-instance-name'],
description: this.detailParams.description || null
diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
index e354b7ae..4ee4eba8 100644
--- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
@@ -479,13 +479,15 @@ export class ServicesListComponent implements OnInit {
service["customer"] = this.customerSelected;
service["serviceType"] = this.serviceTypeSelected;
- service.childServiceInstances.forEach((item) => {
- if (item.serviceDomain === "SITE") {
- service.siteSer.push(item);
- } else if (item.serviceDomain === "SDWAN") {
- service.sdwanSer.push(item);
- }
- })
+ if(service.childServiceInstances !== undefined){
+ service.childServiceInstances.forEach((item) => {
+ if (item.serviceDomain === "SITE") {
+ service.siteSer.push(item);
+ } else if (item.serviceDomain === "SDWAN") {
+ service.sdwanSer.push(item);
+ }
+ })
+ }
if (service["serviceDomain"] === 'CCVPN' || service["serviceDomain"] === 'SOTN') {
this.detailCCVPNShow = true;
if (typeNum === 1) {
--
cgit