diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java index a85f0886a..df57ed452 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -267,8 +267,8 @@ public class DashboardController extends BaseController{ if(o1==o2&&o1==null){ return 0; } - Long ob1 = o1.getC2sByteLen()+o1.getS2cByteLen(); - Long ob2 = o2.getC2sByteLen()+o2.getS2cByteLen(); + Long ob1 = o1.getLinkNum(); + Long ob2 = o2.getLinkNum(); return -(ob1).compareTo(ob2); } }); diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js index 28e80b01f..f700613f6 100644 --- a/src/main/webapp/static/pages/scripts/echart.js +++ b/src/main/webapp/static/pages/scripts/echart.js @@ -282,11 +282,11 @@ var data=new Array(); var xData=new Array(); var drillData=new Array(); - var unit="bytes"; + var unit="Link Times"; $(rs).each(function(i, d) { var inoctetsNum=d.linkNum; - unit=changeUnit(inoctetsNum); - inoctetsNum=changeNum(inoctetsNum); +// unit=changeUnit(inoctetsNum); +// inoctetsNum=changeNum(inoctetsNum); /*var pktNum=new Array(); var byteLen=new Array();*/ xData.push(d.ipAddr);