summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app/performance
diff options
context:
space:
mode:
authorzhangab <zhanganbing@chinamobile.com>2018-11-08 17:34:00 +0800
committerzhangab <zhanganbing@chinamobile.com>2018-11-08 17:34:13 +0800
commit5a45365c037a43d2c0a04ffb96b3f91f7e49b6ac (patch)
treea5d1730dcb5ed5b6c8b819854476394879da42d9 /usecaseui-portal/src/app/performance
parentaf41cf8c45aad0a940c45141cb9d5572423d60b9 (diff)
Fix VNF Performance Query Bugs
Change-Id: Ibc9c8cbd5425bff5b0158bb7ee2a3a8f25a05e89 Issue-ID: USECASEUI-166 Signed-off-by: zhangab <zhanganbing@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/performance')
-rw-r--r--usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.html8
-rw-r--r--usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.ts45
2 files changed, 26 insertions, 27 deletions
diff --git a/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.html b/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.html
index d308d808..2899b6a6 100644
--- a/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.html
+++ b/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.html
@@ -33,17 +33,17 @@
</div>
<div class="content" [@showHideAnimate]="state">
<div class="vnfs">
- <div class="vnf" *ngFor="let item of vnfsData">
+ <div class="vnf" *ngFor="let item of totalRecords">
<img src="../../../assets/images/VNF3.png" title="VF" (click)="graphicShow2(item)">
- <h3>{{item.name}}</h3>
+ <h3>{{item}}</h3>
<div class="intro">
- {{item.text}}
+ {{item}}
</div>
</div>
<div class="empty" *ngFor="let empty of emptys"></div>
</div>
<div class="pages">
- <nz-pagination [(nzPageIndex)]="namecurrentPage" [nzTotal]="vnfsdataTotal" [nzSize]="'small'" [(nzPageSize)]="namepageSize" [nzPageSizeOptions]="[10,15,20,25,30]" nzShowSizeChanger nzShowQuickJumper></nz-pagination>
+ <nz-pagination [(nzPageIndex)]="currentPage" [nzTotal]="vnfsdataTotal" [nzSize]="'small'" [(nzPageSize)]="pageSize" [nzPageSizeOptions]="[10,15,20,25,30]" nzShowSizeChanger nzShowQuickJumper></nz-pagination>
</div>
</div>
<div [@showHideAnimate]="state2">
diff --git a/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.ts b/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.ts
index 3e08c2d4..934cfd16 100644
--- a/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.ts
+++ b/usecaseui-portal/src/app/performance/performance-vnf/performance-vnf.component.ts
@@ -26,24 +26,26 @@ import { MyhttpService } from '../../myhttp.service';
export class PerformanceVnfComponent implements OnInit {
@HostBinding('@routerAnimate') routerAnimateState;
public sourceNameList: Array<any> = ['---auto---'];
- public namecurrentPage: number = 1;
- public namepageSize: number = 10;
public sourceName: string = '';
public vnfsdataTotal: number;
+ public startTime: string = '';
+ public endTime: string = '';
+ public currentPage: number = 1;
+ public pageSize: number = 10;
+ list: any;
constructor(
private myhttp: MyhttpService) { }
ngOnInit() {
this.getqueryAllSourceNames();
- this.getperformanceSsourceNames()
+ this.getperformanceSsourceNames();
}
sourceNameSelected = this.sourceNameList[0];
getqueryAllSourceNames() {
this.myhttp.getqueryAllSourceNames().subscribe((data) => {
- // console.log(data)
for (let i = 0; i < data.length; i++) {
this.sourceNameList.push(data[i]);
}
@@ -51,7 +53,6 @@ export class PerformanceVnfComponent implements OnInit {
})
}
choseSourceName(item) {
- console.log(item);
this.sourceNameSelected = item;
if (item == "---auto---") {
this.sourceName = '';
@@ -59,23 +60,22 @@ export class PerformanceVnfComponent implements OnInit {
this.sourceName = item;
}
}
+ // vnfs data
+ totalRecords = [];
+ //Fill the box
+ emptys = [];
getperformanceSsourceNames() {
- this.myhttp.getperformanceSsourceNames(this.namecurrentPage, this.namepageSize, this.sourceName).subscribe((data) => {
- this.vnfsData = data.vnfdata;
- this.vnfsdataTotal = data.total;
- if (Number.isInteger(this.vnfsData.length / 5)) {
+ this.myhttp.getperformanceSourceNames(this.currentPage, this.pageSize, this.sourceName).subscribe((data) => {
+ this.totalRecords = data.totalRecords;
+ this.vnfsdataTotal = data.names;
+ if (Number.isInteger(this.totalRecords.length / 5)) {
this.emptys = new Array(0);
} else {
- this.emptys = new Array(5 - this.vnfsData.length % 5);
+ this.emptys = new Array(5 - this.totalRecords.length % 5);
}
- // console.log(this.emptys);
})
}
- // vnfs data
- vnfsData = [];
- emptys = []; //Fill the box
-
//Detail page title display
graphicshow = false;
detailshow = false;
@@ -91,32 +91,31 @@ export class PerformanceVnfComponent implements OnInit {
this.detailshow = false;
}
// Selected name
-
- graphicShow(item) {
+
+ graphicShow() {
this.state = 'hide';
this.state2 = 'show';
this.state3 = 'hide';
this.graphicshow = true;
this.detailshow = false;
}
- vnfname: number;
- graphicShow2(item){
+ vnfname: string;
+ graphicShow2(item) {
this.state = 'hide';
this.state2 = 'show';
this.state3 = 'hide';
this.graphicshow = true;
this.detailshow = false;
- this.vnfname = item.name;
+ this.vnfname = item;
}
// Selected id
- detailId: number;
+ detailId: string;
detailShow(item) {
this.state = 'hide';
this.state2 = 'hide';
this.state3 = 'show';
this.graphicshow = true;
this.detailshow = true;
- this.detailId = item.id;
+ this.detailId = item.id.id;
}
-
}