diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp index d2da130d6..3cbd508de 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp @@ -190,7 +190,6 @@ function rankItemChanged3(beginDate,endDate){ timeout:40000, success:function (data){ if(data!=null){ - console.log(4444); result=data; } closeTip(); @@ -220,26 +219,29 @@ function changeBandwidth(unitType,beginDate,endDate){ var ipv6data2=null; var tcpdata2=null; var udpdata2=null; - if(Object.keys(data).length>0){ - xdata=data.ipv4Type1[0].statTime; - if(unitType=="Gbps"){ - ipv4data=data.ipv4Type1[0].gbps; - ipv6data=data.ipv6Type1[0].gbps; - tcpdata=data.trans6Type1[0].gbps; - udpdata=data.trans17Type1[0].gbps; - } - if(unitType=="pps"){ - ipv4data=data.ipv4Type1.pps; - ipv6data=data.ipv6Type1.pps; - tcpdata=data.trans6Type1.pps; - udpdata=data.trans17Type1.pps; - - } - if(unitType=="linkNumber"){ - ipv4data=data.ipv4Type1.linkNum; - ipv6data=data.ipv6Type1.linkNum; - tcpdata=data.trans6Type1.linkNum; - udpdata=data.trans17Type1.linkNum; + if(data!=null&&Object.keys(data).length>0){ + if(data.ipv4Type1!=undefined&&data.ipv4Type1!=null){ + console.log(2222) + xdata=data.ipv4Type1[0].statTime; + if(unitType=="Gbps"){ + ipv4data=data.ipv4Type1[0].gbps; + ipv6data=data.ipv6Type1[0].gbps; + tcpdata=data.trans6Type1[0].gbps; + udpdata=data.trans17Type1[0].gbps; + } + if(unitType=="pps"){ + ipv4data=data.ipv4Type1.pps; + ipv6data=data.ipv6Type1.pps; + tcpdata=data.trans6Type1.pps; + udpdata=data.trans17Type1.pps; + + } + if(unitType=="linkNumber"){ + ipv4data=data.ipv4Type1.linkNum; + ipv6data=data.ipv6Type1.linkNum; + tcpdata=data.trans6Type1.linkNum; + udpdata=data.trans17Type1.linkNum; + } } } var series=new Array(); @@ -258,25 +260,29 @@ function changeBandwidth(unitType,beginDate,endDate){ }); showBandwidthChart("chart1",unitType,xdata,series,"Astana"); - if(Object.keys(data).length>0){ - if(unitType=="Gbps"){ - ipv4data2=data.ipv4Type2[0].gbps; - ipv6data2=data.ipv6Type2[0].gbps; - tcpdata2=data.trans6Type2[0].gbps; - udpdata2=data.trans17Type2[0].gbps; - } - if(unitType=="pps"){ - ipv4data2=data.ipv4Type2.pps; - ipv6data2=data.ipv6Type2.pps; - tcpdata2=data.trans6Type2.pps; - udpdata2=data.trans17Type2.pps; - - } - if(unitType=="linkNumber"){ - ipv4data2=data.ipv4Type2.linkNum; - ipv6data2=data.ipv6Type2.linkNum; - tcpdata2=data.trans6Type2.linkNum; - udpdata2=data.trans17Type2.linkNum; + if(data!=null&&Object.keys(data).length>0){ + if(data.ipv4Type2!=undefined&&data.ipv4Type2!=null){ + console.log(3333) + xdata=data.ipv4Type2[0].statTime; + if(unitType=="Gbps"){ + ipv4data2=data.ipv4Type2[0].gbps; + ipv6data2=data.ipv6Type2[0].gbps; + tcpdata2=data.trans6Type2[0].gbps; + udpdata2=data.trans17Type2[0].gbps; + } + if(unitType=="pps"){ + ipv4data2=data.ipv4Type2.pps; + ipv6data2=data.ipv6Type2.pps; + tcpdata2=data.trans6Type2.pps; + udpdata2=data.trans17Type2.pps; + + } + if(unitType=="linkNumber"){ + ipv4data2=data.ipv4Type2.linkNum; + ipv6data2=data.ipv6Type2.linkNum; + tcpdata2=data.trans6Type2.linkNum; + udpdata2=data.trans17Type2.linkNum; + } } } var series=new Array();