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: ':{series.name} :{point.y}
' + }, yAxis: { title: { text: 'bytes'