Fix VNF Performance Query Bugs

Change-Id: Ibc9c8cbd5425bff5b0158bb7ee2a3a8f25a05e89
Issue-ID: USECASEUI-166
Signed-off-by: zhangab <zhanganbing@chinamobile.com>

3 files changed, 20 insertions, 22 deletions

diff --git a/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.html b/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.html
index 3789c598..c5c3a3ed 100644
--- a/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.html
+++ b/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.html
@@ -34,8 +34,8 @@
                     <th nzWidth="20%">Source Name</th>
                     <th nzWidth="20%">Event Name</th>
                     <th nzWidth="20%">ReportingEntityName</th>
-                    <!-- <th nzWidth="20%">Report Time</th> -->
-                    <th nzWidth="10%">Action</th>
+                    <th nzWidth="15%">Report Time</th>
+                    <th nzWidth="5%">Action</th>
                 </tr>
             </thead>
             <tbody>
@@ -45,7 +45,7 @@
                     <td>{{item.sourceName}}</td>
                     <td>{{item.eventName}}</td>
                     <td>{{item.reportingEntityName}}</td>
-                    <!-- <td>{{item.sequence}}</td> -->
+                    <td>{{item.startEpochMicrosec | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                     <td><a class="action" (click)="detailShow(item)"><i class="details"></i></a></td>
                 </tr>
                 <!-- </ng-template> -->
diff --git a/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.ts b/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.ts
index c3153c8e..01e716db 100644
--- a/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.ts
+++ b/usecaseui-portal/src/app/components/graphiclist/graphiclist.component.ts
@@ -25,7 +25,7 @@ import { DatePipe } from "@angular/common"
   providers: [DatePipe]
 })
 export class GraphiclistComponent implements OnInit {
-  public startTime: string = '';
+  public startTime: string ='';
   public endTime: string = '';
   public currentPage: number = 1;
   public pageSize: number = 10;
@@ -46,28 +46,23 @@ export class GraphiclistComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.getPerformanceFormData();
   }
-  ngOnchanges(changes){
+  ngOnChanges(changes){
     this.getPerformanceFormData();
-    console.log(this.vnfname)
-   
   }
   getPerformanceFormData() {
-    this.myhttp.getAlarmFormData(this.currentPage, this.pageSize, this.vnfname, this.startTime, this.endTime).subscribe((data) => {
-      console.log(data)
-      this.list = data.alarms;
+    this.myhttp.getPerformanceFormData(this.currentPage, this.pageSize, this.vnfname, this.startTime, this.endTime).subscribe((data) => {
+      this.list = data.performances;
     })
   }
  // Date screening
  dateRange =  [ addDays(new Date(), -30), new Date() ];
 
  onChange(result: Date): void {
-  this.startTime = this.datePipe.transform(result[0], 'yyyy-MM-dd-HH:mm:ss');
-  this.endTime = this.datePipe.transform(result[1], 'yyyy-MM-dd-HH:mm:ss');
+  this.startTime = this.datePipe.transform(result[0], 'yyyy-MM-dd HH:mm:ss');
+  this.endTime = this.datePipe.transform(result[1], 'yyyy-MM-dd HH:mm:ss');
 }
   sort(e){
-
   }
   @Input () vnfname;
   @Output() detailData = new EventEmitter();
diff --git a/usecaseui-portal/src/app/components/performance-details/performance-details.component.ts b/usecaseui-portal/src/app/components/performance-details/performance-details.component.ts
index 2e174474..83467172 100644
--- a/usecaseui-portal/src/app/components/performance-details/performance-details.component.ts
+++ b/usecaseui-portal/src/app/components/performance-details/performance-details.component.ts
@@ -14,20 +14,23 @@ export class PerformanceDetailsComponent implements OnInit {
   constructor(private myhttp:MyhttpService) { }
 
   ngOnInit() {
-    this.getAlarmDetailData(this.detailId);
+    
   }
 
   ngOnChanges(changes){
-    // console.log(changes);
+    console.log(this.detailId)
+    this.getPerformanceHeaderDetail(this.detailId);
   }
   datailheaderdata: any = {};
   dataillistdata: any = [];
-  getAlarmDetailData(id){
-    this.myhttp.getAlarmDetailData(id).subscribe((data)=>{
-      console.log(data)
-      this.datailheaderdata = data.alarmsHeader;
-      this.dataillistdata = data.list;
-    })
+  getPerformanceHeaderDetail(id){
+    if(id){
+      this.myhttp.getPerformanceHeaderDetail(id).subscribe((data)=>{
+        console.log(data)
+        this.datailheaderdata = data.performanceHeader;
+        this.dataillistdata = data.list;
+      })
+    }
   }
   moredetailShow = false;
   @Input() detailId;