diff options
Diffstat (limited to 'usecaseui-portal/src/app')
| -rw-r--r-- | usecaseui-portal/src/app/core/services/serviceList.service.ts | 4 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/views/fcaps/monitor-5g/monitor-5g.component.ts | 34 |
2 files changed, 27 insertions, 11 deletions
diff --git a/usecaseui-portal/src/app/core/services/serviceList.service.ts b/usecaseui-portal/src/app/core/services/serviceList.service.ts index 475e1868..1ada669f 100644 --- a/usecaseui-portal/src/app/core/services/serviceList.service.ts +++ b/usecaseui-portal/src/app/core/services/serviceList.service.ts @@ -34,8 +34,8 @@ export class ServiceListService { templateParameters: this.baseUrl + "/uui-lcm/fetchCCVPNTemplateData/*_*", e2etemplateParameters: this.baseUrl + "/uui-lcm/service-templates/*_*",//no mock Sample Data json nstemplateParameters: this.baseUrl + "/uui-lcm/fetchNsTemplateData", - vimInfo: this.baseUrl + "/uui-lcm/locations", - sdnControllers: this.baseUrl + "/uui-lcm/sdnc-controllers", + vimInfo: this.baseUrl + "/uui-lcm/locations/", + sdnControllers: this.baseUrl + "/uui-lcm/sdnc-controllers/", createService: this.baseUrl + "/uui-lcm/services", ns_createService: this.baseUrl + "/uui-lcm/createNetworkServiceInstance", ns_createService2: this.baseUrl + "/uui-lcm/instantiateNetworkServiceInstance", diff --git a/usecaseui-portal/src/app/views/fcaps/monitor-5g/monitor-5g.component.ts b/usecaseui-portal/src/app/views/fcaps/monitor-5g/monitor-5g.component.ts index 5ba444c8..f7771d13 100644 --- a/usecaseui-portal/src/app/views/fcaps/monitor-5g/monitor-5g.component.ts +++ b/usecaseui-portal/src/app/views/fcaps/monitor-5g/monitor-5g.component.ts @@ -102,11 +102,13 @@ export class Monitor5gComponent implements OnInit { this.trafficData = []; this.trafficLegend = []; slicing_usage_traffic_list.forEach((item) => { - this.trafficData.push({ - name: item.service_id, - value: item.traffic_data - }); - this.trafficLegend.push(item.service_id) + if(item.service_id !==null){ + this.trafficData.push({ + name: item.service_id, + value: item.traffic_data + }); + this.trafficLegend.push(item.service_id) + } }); this.trafficChartData = { legend: { @@ -136,11 +138,13 @@ export class Monitor5gComponent implements OnInit { this.onlineuserXAxis = []; this.onlineusersData = []; this.onlineuserLegend = []; - slicing_online_user_list[0].online_user_list.map((key) => { + let filterList = []; + filterList = this.filterData(slicing_online_user_list); + filterList[0].online_user_list.map((key) => { let date = moment(Number(key.timestamp)).format('YYYY-MM-DD/HH:mm').split("/")[1]; this.onlineuserXAxis.push(date) }); - slicing_online_user_list.forEach((item) => { + filterList.forEach((item) => { this.onlineuserLegend.push(item.service_id); this.onlineusersData.push({ name: item.service_id, @@ -170,11 +174,14 @@ export class Monitor5gComponent implements OnInit { this.bandwidthXAxis = []; this.bandwidthData = []; this.bandwidthLegend = []; - slicing_total_bandwidth_list[0].total_bandwidth_list.map((key) => { + let filterList = []; + filterList = this.filterData(slicing_total_bandwidth_list); + console.log(filterList,"filterList----slicing_total_bandwidth"); + filterList[0].total_bandwidth_list.map((key) => { let date = moment(Number(key.timestamp)).format('YYYY-MM-DD/HH:mm').split("/")[1]; this.bandwidthXAxis.push(date) }); - slicing_total_bandwidth_list.forEach((item) => { + filterList.forEach((item) => { this.bandwidthLegend.push(item.service_id); this.bandwidthData.push({ name: item.service_id, @@ -210,4 +217,13 @@ export class Monitor5gComponent implements OnInit { }) return datas } + filterData(data){ + let filter = []; + data.map((item,index) => { + if(item.service_id !== null){ + filter.push(item) + } + }); + return filter + } } |