From 11d2f1c2e659cbb2cc070a8641e13952fbd3595c Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac.cn>
Date: Sat, 22 Dec 2018 21:47:42 +0800
Subject: [PATCH] =?UTF-8?q?Ip=20top10=20=E4=BC=98=E5=8C=96=E8=B6=8B?=
 =?UTF-8?q?=E5=8A=BF=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=A9=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties  |  3 ++-
 src/main/resources/messages/message_ru.properties  |  3 ++-
 .../resources/messages/message_zh_CN.properties    |  3 ++-
 .../views/dashboard/trafficIpActiveList.jsp        | 14 ++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 0dc109172..4819e8f28 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1408,4 +1408,5 @@ country=Country
 desc=Desc
 unique_num=Unique
 import_limit_is=The maximum import size is
-upload_limit_is=The limitation of file uplaod is
\ No newline at end of file
+upload_limit_is=The limitation of file uplaod is
+count=Count
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 6f2cb1a95..37b0822be 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1412,4 +1412,5 @@ country=Country
 desc=Desc
 unique_num=Unique
 import_limit_is=The maximum import size is
-upload_limit_is=The limitation of file uplaod is
\ No newline at end of file
+upload_limit_is=The limitation of file uplaod is
+count=Count
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 5891c7aca..bcfdff079 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1408,4 +1408,5 @@ country=Country
 desc=Desc
 unique_num=Unique
 import_limit_is=\u5BFC\u5165\u9650\u5236\u6700\u5927\u6761\u6570
-upload_limit_is=\u6587\u4EF6\u4E0A\u4F20\u4E2A\u6570\u9650\u5236
\ No newline at end of file
+upload_limit_is=\u6587\u4EF6\u4E0A\u4F20\u4E2A\u6570\u9650\u5236
+count=\u6570\u91CF
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 5e6f23082..3c81febbc 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -164,6 +164,7 @@ function showIpActiveChart(rs){
 	var data=new Array();
 	var xData=new Array();
 		xData=rs[0].statTime;
+	//var tickInterval=Math.ceil(xData.length/6);
 	var series=new Array();
 	$(rs).each(function(i, d) {
 	series.push({
@@ -172,9 +173,10 @@ function showIpActiveChart(rs){
 	});
 	})
 	var chart = Highcharts.chart('chart', {
-		/* chart:{
-			type: 'area',
-		}, */
+		chart:{
+			//type: 'area',
+			zoomType: 'x'
+		},
 		exporting: {
 			filename:'IP-Active',
 			scale:1,
@@ -195,13 +197,17 @@ function showIpActiveChart(rs){
 	        text: null
 	    },
 		xAxis: {
+			//tickInterval:tickInterval,
 			type:'category',
 			categories: xData,
 			title: {
 					text: 'time',
 					align:'high',
 			},
-	},
+		},
+		tooltip: {
+	        pointFormat: '<b><spring:message code="ip"/>:</b>{series.name}  <b><spring:message code="count"/>:</b>{point.y}<br/>'
+	    },
 	    yAxis: {
 	        title: {
 	            text: 'bytes'