diff options
author | Tao Shen <shentao@chinamobile.com> | 2019-05-31 10:35:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-05-31 10:35:26 +0000 |
commit | 53eb419c84adf52c321883bf33af949016a9db2a (patch) | |
tree | 1a01f2ee5395194704a08a83a10dc0f079f2c1e2 /usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts | |
parent | de16e84e7119f4f414306fea6c84f8f0d86520a5 (diff) | |
parent | cf119161cc81a9a6eceaef288ff33c2a6a43349d (diff) |
Merge "Service instance topology front-end development"2.0.1
Diffstat (limited to 'usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts')
-rw-r--r-- | usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts index c11b159e..d0ef7d1b 100644 --- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts +++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts @@ -87,7 +87,11 @@ export class CcvpnDetailComponent implements OnInit { console.log(this.detailParams) console.log(this.upDateShow) // this.input_parameters = JSON.stringify(this.detailParams['input-parameters']) - this.input_parameters = JSON.parse(this.detailParams['input-parameters']); + if(this.detailParams['input-parameters']){ + this.input_parameters = JSON.parse(this.detailParams['input-parameters']); + }else { + return false; + } console.log(this.input_parameters); this.templateParameters.service = { name: this.input_parameters.service.name, @@ -557,6 +561,8 @@ export class CcvpnDetailComponent implements OnInit { console.log(this.localSite); console.log(this.outerSite); + if(this.localSite.length>0){ + this.detailLines = [].concat(this.detailLiness); this.localSite.forEach((site)=>{ let obj = { customerId: this.detailParams.customer.id, @@ -571,6 +577,10 @@ export class CcvpnDetailComponent implements OnInit { res("sites-domain"); }) }) + }else { + console.log("localSite []"); + return false; + } }) } @@ -707,7 +717,8 @@ export class CcvpnDetailComponent implements OnInit { } detailSites = false; - detailLines = [ //Details of the topology map connection coordinates + detailLines = []; + detailLiness = [ //Details of the topology map connection coordinates { "x1": "9%", "y1": "40%", "x2": "21%", "y2": "40%"//site1--tp1 }, |