From 429b1841f1a9156a479c69dd3323fa4ad01a2589 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 4 Jan 2019 20:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E8=B7=83IP=E7=BB=9F=E8=AE=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=94=B1=E6=B5=81=E9=87=8F=E6=94=B9=E4=B8=BALinknum?= =?UTF-8?q?=E2=80=94=E2=80=94=E8=BF=9E=E6=8E=A5=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/dashboard/DashboardController.java | 4 ++-- src/main/webapp/static/pages/scripts/echart.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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);