diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index d6f6cdc97..bf19c862e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -963,4 +963,22 @@ ip_multiplex_policy=IP Reuse Policy target_ip_protect=Target IP Protect ip_multiplex_pool_config=IP Reuse Addr Pool letter=Request Info -show_more=Show More \ No newline at end of file +show_more=Show More +#===============dashboard begin=================================== +dashboard=Dashboard +traffic_chart=Traffic Chart +os_type=OS Type +browser_type=Browser Type +traffic_protocol_chart=Traffic Protocol Chart +traffic_ipactive_chart=Traffic IpActive Chart +traffic_app_chart=Traffic App Chart +traffic_ua_list=Traffic UA List +traffic_ua_chart=Traffic UA Chart +ranking=Ranking +os=OS +browser=Browser +trend=Trend +traffic_website_list=Traffic Website List +traffic_website_type_chart=Traffic Website Type Chart +website=Website +#===============dashboard end=================================== \ 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 9e621964e..60e1877bb 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -959,3 +959,21 @@ dest_ip_report=\u76EE\u7684\u56FD\u5BB6IP\u62A5\u8868 isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868 #=============about report=================== show_more=\u5C55\u793A\u66F4\u591A +#===============dashboard begin=================================== +dashboard=\u7EDF\u8BA1\u56FE\u8868 +traffic_chart=\u6D41\u91CF\u7EDF\u8BA1 +os_type=\u64CD\u4F5C\u7CFB\u7EDF\u5206\u7C7B +browser_type=\u6D4F\u89C8\u5668\u5206\u7C7B +traffic_protocol_chart=\u534F\u8BAE\u7C7B\u578B\u7EDF\u8BA1\u56FE +traffic_ipactive_chart=\u6D3B\u8DC3IP\u7EDF\u8BA1\u56FE +traffic_app_chart=APP\u6D41\u91CF\u7EDF\u8BA1\u56FE +traffic_ua_list=\u7EC8\u7AEF\u7528\u6237\u7EDF\u8BA1\u5217\u8868 +traffic_ua_chart=\u7EC8\u7AEF\u7528\u6237\u7EDF\u8BA1\u56FE +ranking=\u6392\u540D +os=\u7CFB\u7EDF +browser=\u6D4F\u89C8\u5668 +trend=\u8D8B\u52BF +traffic_website_list=\u7F51\u7AD9\u6D41\u91CF\u7EDF\u8BA1\u5217\u8868 +traffic_website_type_chart=\u7F51\u7AD9\u5206\u7C7B\u6D41\u91CF\u7EDF\u8BA1\u56FE +website=\u7F51\u7AD9\u540D\u79F0 +#===============dashboard end=================================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index d9a682239..c41521d97 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -34,7 +34,7 @@
- 协议类型统计 +
@@ -44,7 +44,7 @@
- 活跃IP统计图 +
@@ -53,7 +53,7 @@
- APP流量分析 +
- 终端用户TOP10 +
- + - + @@ -148,7 +148,7 @@
- 终端用户图 +
@@ -157,15 +157,15 @@
- 网站流量TOP10 +
排名
数量
- - - + + + @@ -227,7 +227,7 @@
- 网站流量分析 +
@@ -332,10 +332,10 @@ function systemList(){ async:true, beforeSend: function () { - var msg = "重新加载数据,请稍候..."; + var msg = "Reloading..."; var trLen = $("#tbodyData1 tr").length; if(trLen<=0) { - msg = "数据加载中,请稍候..."; + msg = "OnLoading..."; }else { $("#tbodyData1").html("") } @@ -409,10 +409,10 @@ function browserList() { async:true, beforeSend: function () { - var msg = "重新加载数据,请稍候..."; + var msg = "Reloading..."; var trLen = $("#tbodyData1 tr").length; if(trLen<=0) { - msg = "onLoading..."; + msg = "OnLoading..."; }else { $("#tbodyData1").html("") } @@ -455,10 +455,10 @@ function websiteList() { async:true, beforeSend: function () { - var msg = "重新加载数据,请稍候..."; + var msg = "ReLoading..."; var trLen = $("#tbodyData2 tr").length; if(trLen<=0) { - msg = "数据加载中,请稍候..."; + msg = "OnLoading..."; }else { $("#tbodyData2").html("") } diff --git a/src/main/webapp/static/global/plugins/highcharts/echart.js b/src/main/webapp/static/global/plugins/highcharts/echart.js index dfc432e17..3898dd9a9 100644 --- a/src/main/webapp/static/global/plugins/highcharts/echart.js +++ b/src/main/webapp/static/global/plugins/highcharts/echart.js @@ -391,7 +391,7 @@ function echart_2(rs){ }, colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#0035f9','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], title: { - text: '操作系统分类', + text: '', style: {//设置字体颜色 color: '#fff', fontSize:'18px', @@ -498,7 +498,7 @@ function echart_5(rs){ }, colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#0035f9','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], title: { - text: '浏览器分类列表', + text: '', style: {//设置字体颜色 color: '#fff', fontSize:'18px', @@ -596,15 +596,7 @@ function echart_4(rs){ colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#0035f9','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], title: { - text: '网站统计分析', - y:30, - overflow: 'justify', - style: {//设置字体颜色 - color: '#fff', - fontSize:'18px', - fontFamily:'Microsoft YaHei' - }, - + text: null, }, plotOptions: { series: { @@ -617,7 +609,7 @@ function echart_4(rs){ pie:{ point: { events: { - mouseOver: function(e) { // 鼠标滑过时动态更新标题 + mouseOver: function(e) { this.slice(); }, // 鼠标移出时,收回突出显示 @@ -694,15 +686,7 @@ function echart_6(rs){ colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#0035f9','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'], title: { - text: '网站分类', - y:30, - overflow: 'justify', - style: {//设置字体颜色 - color: '#fff', - fontSize:'18px', - fontFamily:'Microsoft YaHei' - }, - + text: null, }, plotOptions: { series: {
排名网站名称数量