diff options
| author |   Tao Shen <shentao@chinamobile.com> | 2019-05-16 02:37:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-16 02:37:56 +0000 |
| commit | 5d9a85c43a3a77688961352a8b127506c4d23b89 (patch) | |
| tree | 534f4d977a7ff049c240c092e8b97632db9564d3 /usecaseui-portal/src/app/components | |
| parent | 11d2ec986be2c53da9bb4fecd49af0ccf4e6103c (diff) | |
| parent | c3e2270c9694e0cbd2835d0d1ae7d14405ba0e8e (diff) | |
Merge "Fix instance instantiation for e2e/NS"
Diffstat (limited to 'usecaseui-portal/src/app/components')
| -rw-r--r-- | usecaseui-portal/src/app/components/customer/customer.component.ts | 2 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts | 4 |
2 files changed, 4 insertions, 2 deletions
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){ |