From c3e2270c9694e0cbd2835d0d1ae7d14405ba0e8e Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Wed, 15 May 2019 18:05:18 +0800 Subject: Fix instance instantiation for e2e/NS Change-Id: Ib3813f16b208422492c6b8f4763d7b3660c735f6 Issue-ID: USECASEUI-255 Signed-off-by: guochuyicmri --- usecaseui-portal/src/app/components/customer/customer.component.ts | 2 +- .../src/app/components/e2e-creation/e2e-creation.component.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'usecaseui-portal/src/app/components') diff --git a/usecaseui-portal/src/app/components/customer/customer.component.ts b/usecaseui-portal/src/app/components/customer/customer.component.ts index 8a84e1b6..51486dbf 100644 --- a/usecaseui-portal/src/app/components/customer/customer.component.ts +++ b/usecaseui-portal/src/app/components/customer/customer.component.ts @@ -94,7 +94,7 @@ export class CustomerComponent implements OnInit { normal: { position: 'center', show: false, - formatter: ' {b|{b}：{d}%} ', + formatter: ' {b|{b}：{c}%} ', backgroundColor: 'rgba(51,51,51,0.9)', borderColor: 'rgba(51,51,51,0.9)', borderWidth: 1, diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts index dc8566e0..13300eda 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts @@ -102,11 +102,13 @@ export class E2eCreationComponent implements OnInit { console.log(this.templateParameters); console.log(this.roote2e) }else if(type == "ns"){ - if(typeof data["model"]=='string'){ + if(data["model"]!=undefined && typeof data["model"]=='string'){ this.nsTemplateParameters = JSON.parse(data["model"]); + console.log(data["model"]); }else{ this.nsTemplateParameters = data; } + console.log(this.nsTemplateParameters); this.nsTemplateParameters["inputs2"] = []; let inputs = this.nsTemplateParameters.inputs; for(let key in inputs){ -- cgit