From e64eb88fdb13c6e679d1c88305bf190c4c3c2500 Mon Sep 17 00:00:00 2001 From: zhangab Date: Thu, 1 Nov 2018 15:25:20 +0800 Subject: Fix VNF Performance Query Bugs Change-Id: Iffdb5e556ee94f1d7584b767d16ab35687a895cc Issue-ID: USECASEUI-165 Signed-off-by: zhangab --- usecaseui-portal/src/app/myhttp.service.ts | 52 +++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-) (limited to 'usecaseui-portal/src/app/myhttp.service.ts') diff --git a/usecaseui-portal/src/app/myhttp.service.ts b/usecaseui-portal/src/app/myhttp.service.ts index 00e6bc42..1c36d881 100644 --- a/usecaseui-portal/src/app/myhttp.service.ts +++ b/usecaseui-portal/src/app/myhttp.service.ts @@ -40,7 +40,8 @@ export class MyhttpService { // connectivity:this.baseUrl + "/sotn-connectivity2.json?", // vpnBinding:this.baseUrl + "/vpnbinding.json?", // alarmFormData:this.baseUrl + "/alarmFormData.json?", - // alarmFormDetailData:this.baseUrl + "/alarmFormDetailData.json?" + // alarmFormDetailData:this.baseUrl + "/alarmFormDetailData.json?", + // sourceName:this.baseUrl+ "/SorceName.json?" // } // baseUrl = 'http://172.19.44.223/api/usecaseui-server/v1'; @@ -256,27 +257,48 @@ export class MyhttpService { } // Alarm table data - getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){ - return this.http.post(this.url.alarmFormData,{ - pageNumber:pageNumber, - pageSaze:pageSaze, - name:name, - Priority:Priority, - Status:Status, - Report:Report - }); - } + // getAlarmFormData(currentPage:number,pageSize:number,sourceName?:string,priority?:string,startTime?:string,endTime?:string,vfStatus?:string){ + // return this.http.post(this.url.alarmFormData,{ + // currentPage:currentPage, + // pageSize:pageSize, + // sourceName:sourceName, + // priority:priority, + // startTime:startTime, + // endTime:endTime , + // vfStatus:vfStatus + // }); + // } getSourceNames(){ - return this.http.get('/alarm/getSourceNames/'); + return this.http.get('http://192.168.43.12:8082/alarm/getSourceNames/'); } - // getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){ - // return this.http.get(this.url.alarmFormData+'?pageNumber='+pageNumber+'?pageSaze'+pageSaze+'?name'+name+'?Priority'+Priority+'?Status'+Status+'?Report'+Report); + + getstatuscount(){ + let httpurl = 'http://192.168.43.12:8082/alarm/statusCount'; + return this.http.get(httpurl); + } + // getSourceNames(){ + // let httpurl = this.baseUrl + "/SourceName.json?"; + // console.log(httpurl); + // return this.http.get(httpurl); + // } + + // getAlarmFormData(currentPage:number,pageSize:number,sourceName?:string,priority?:string,startTime?:string,endTime?:string,vfStatus?:string){ + // return this.http.get(this.url.alarmFormData+'?currentPage='+currentPage+'?pageSize='+pageSize+'?sourceName='+sourceName+'?priority='+priority+'?startTime='+startTime+'?endTime='+endTime+'?vfStatus='+vfStatus); // } + getAlarmFormData(currentPage:number,pageSize:number,sourceName?:string,priority?:string,startTime?:string,endTime?:string,vfStatus?:string){ + return this.http.get('http://192.168.43.12:8082/alarm/'+'/'+currentPage+'/'+pageSize+'/'+sourceName+'/'+priority+'/'+startTime+'/'+endTime+'/'+vfStatus); + } + // Alarm Detail page data + // getAlarmDetailData(id){ + // let httpurl = this.baseUrl + "/alarmFormDetailData.json?id/" +id; + // console.log(httpurl) + // return this.http.get(httpurl); + // } getAlarmDetailData(id){ - let httpurl = this.baseUrl + "/alarmFormDetailData.json?id/" +id; + let httpurl = 'http://192.168.43.12:8082/alarm/getAlarmsHeaderDetail/'+id; console.log(httpurl) return this.http.get(httpurl); } -- cgit 1.2.3-korg