diff --git a/plugins/webstats/index.html b/plugins/webstats/index.html index 4fbee69a8..2c0b7f2c7 100755 --- a/plugins/webstats/index.html +++ b/plugins/webstats/index.html @@ -52,7 +52,7 @@ vertical-align: top; } .overview_list .ov_num{ - font-size: 20px; + font-size: 14px; margin-top: 7px; color: #333; } diff --git a/plugins/webstats/js/stats.js b/plugins/webstats/js/stats.js index 94f49a50f..6bd026911 100644 --- a/plugins/webstats/js/stats.js +++ b/plugins/webstats/js/stats.js @@ -90,11 +90,17 @@ function wsOverviewRequest(page){ console.log(statData, data); - $('.overview_list .overview_box:eq(0) .ov_num').text(statData['pv']); - $('.overview_list .overview_box:eq(1) .ov_num').text(statData['uv']); - $('.overview_list .overview_box:eq(2) .ov_num').text(statData['ip']); - $('.overview_list .overview_box:eq(3) .ov_num').text(toSize(statData['length'])); - $('.overview_list .overview_box:eq(4) .ov_num').text(statData['req']); + var stat_pv = statData['pv'] == null?0:statData['pv']; + var stat_uv = statData['uv'] == null?0:statData['uv']; + var stat_ip = statData['ip'] == null?0:statData['ip']; + var stat_length = statData['length'] == null?0:statData['length']; + var stat_req = statData['req'] == null?0:statData['req']; + + $('.overview_list .overview_box:eq(0) .ov_num').text(stat_pv); + $('.overview_list .overview_box:eq(1) .ov_num').text(stat_uv); + $('.overview_list .overview_box:eq(2) .ov_num').text(stat_ip); + $('.overview_list .overview_box:eq(3) .ov_num').text(toSize(stat_length)); + $('.overview_list .overview_box:eq(4) .ov_num').text(stat_req); var list = []; for (var i = 0; i < data.length; i++) { @@ -104,6 +110,7 @@ function wsOverviewRequest(page){ console.log("list",list); var chat = {}; + var is_compare = false; var chatSeriesVal = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14','15', '16', '17', '18', '19', '20', '21', '22', '23']; @@ -113,56 +120,143 @@ function wsOverviewRequest(page){ areaStyle: {} } + chat['yAxis'] = [{ + type: 'value', + splitNumber: 5, + axisLabel: { + textStyle: { + color: '#a8aab0', + fontStyle: 'normal', + fontFamily: '微软雅黑', + fontSize: 12, + }, + }, + axisLine:{ + show: false + }, + axisTick:{ + show: false + }, + splitLine: { + show: true, + lineStyle: { + color: '#E5E9ED' + } + } + }]; + + data['tooltip'] = { + trigger: 'axis', + backgroundColor: 'rgba(255,255,255,0.8)', + axisPointer: { // 坐标轴指示器,坐标轴触发有效 + type: 'line', // 默认为直线,可选为:'line' | 'shadow' + lineStyle: { + color: 'rgba(150,150,150,0.2)' + } + }, + textStyle: { + color: '#666', + fontSize: '14px', + }, + extraCssText: 'width:220px;height:'+(is_compare?'30%':'22%')+';padding:0;box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);"', + formatter: function (params) { + var htmlStr = ""; + for (var i = 0; i < params.length; i++) { + var tem = params[i].name; + var val = params[i].value; + if(that.template_config.period_time == 'hour'){ + if (tem.indexOf('/') < 0) { + tem > 9 ? tem = tem + ":00 - " + tem + ":59" : tem = "0" + tem + ":00 - " + + "0" + tem + ":59"; + } + val > 0 ? val = val : val = '--' + } + + htmlStr += + '
' + } + var res ='