summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2019-05-15 18:05:18 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2019-05-15 18:05:29 +0800
commitc3e2270c9694e0cbd2835d0d1ae7d14405ba0e8e (patch)
tree10ae29b577e798b631961f5db339a6b14a93c090
parent4ae5d325db70282d453a27c6790433e3ff0ed2f9 (diff)
Fix instance instantiation for e2e/NS
Change-Id: Ib3813f16b208422492c6b8f4763d7b3660c735f6 Issue-ID: USECASEUI-255 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
-rw-r--r--usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.html2
-rw-r--r--usecaseui-portal/src/app/components/customer/customer.component.ts2
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts4
-rw-r--r--usecaseui-portal/src/app/services/services-list/services-list.component.ts1
-rw-r--r--usecaseui-portal/src/assets/i18n/en.json2
-rw-r--r--usecaseui-portal/src/assets/images/loadingdonghua.gifbin0 -> 493071 bytes
-rw-r--r--usecaseui-portal/src/assets/images/no-network-available.png (renamed from usecaseui-portal/src/assets/images/no-network available.png)bin50933 -> 50933 bytes
7 files changed, 7 insertions, 4 deletions
diff --git a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.html b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.html
index c7eae608..1a1a2a46 100644
--- a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.html
+++ b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.html
@@ -33,7 +33,7 @@
</h2>
</div>
<div class="no-network" *ngIf="nonetwork">
- <img src="assets/images/no-network available.png" alt="No network available">
+ <img src="assets/images/no-network-available.png" alt="No network available">
<p>No network available</p>
</div>
</div>
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){
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
index 1cf8cb98..06323fac 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
@@ -227,6 +227,7 @@ export class ServicesListComponent implements OnInit {
handleCancel(): void {
// console.log('Button cancel clicked!');
this.isVisible = false;
+ this.temParametersTips = false;
}
diff --git a/usecaseui-portal/src/assets/i18n/en.json b/usecaseui-portal/src/assets/i18n/en.json
index 6683ff94..cfd40ec2 100644
--- a/usecaseui-portal/src/assets/i18n/en.json
+++ b/usecaseui-portal/src/assets/i18n/en.json
@@ -4,7 +4,7 @@
"i18nTextDefine_Customer":"Customer",
"i18nTextDefine_Monitor":"Monitor",
"i18nTextDefine_Services":"Services",
- "i18nTextDefine_ServicesList":"Services List",
+ "i18nTextDefine_ServicesList":"Lifecycle Management",
"i18nTextDefine_PackageManagement":"Package Management",
"i18nTextDefine_Alarm":"Alarm",
"i18nTextDefine_Performance":"Performance",
diff --git a/usecaseui-portal/src/assets/images/loadingdonghua.gif b/usecaseui-portal/src/assets/images/loadingdonghua.gif
new file mode 100644
index 00000000..7845fc9c
--- /dev/null
+++ b/usecaseui-portal/src/assets/images/loadingdonghua.gif
Binary files differ
diff --git a/usecaseui-portal/src/assets/images/no-network available.png b/usecaseui-portal/src/assets/images/no-network-available.png
index 23040ef7..23040ef7 100644
--- a/usecaseui-portal/src/assets/images/no-network available.png
+++ b/usecaseui-portal/src/assets/images/no-network-available.png
Binary files differ