diff --git a/plugins/simpleping/js/simpleping.js b/plugins/simpleping/js/simpleping.js index e37f2d32c..68a195fed 100755 --- a/plugins/simpleping/js/simpleping.js +++ b/plugins/simpleping/js/simpleping.js @@ -101,7 +101,13 @@ function getBeforeDate(n){ return s; } -function pingDataGraphRender(day){ + +function pingDataGraphPosData(){ + console.log(chartPingData.length); +} + + +function pingDataGraphData(day){ var now = (new Date().getTime())/1000; if(day==0){ var start = (new Date(getToday() + " 00:00:01").getTime())/1000; @@ -121,54 +127,63 @@ function pingDataGraphRender(day){ // console.log(start,end); pingPostCallbak('pingData', {'type':'range', 'start':start, 'end':end}, function(data){ - var xData = []; - var yData = []; - - var rdata = data.data; - - for(var i = 0; i < rdata.length; i++){ - xData.push(toCommonTime(rdata[i].created_unix)); - yData.push(rdata[i].speed/1000000); - } - var option = { - tooltip: { - trigger: 'axis', - axisPointer: { type: 'cross' }, - formatter: '{b}
{a}: {c}' - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: xData, - axisLine:{ lineStyle:{ color:"#666"} } - }, - yAxis: { - type: 'value', - name: "PING延迟(ms)", - // boundaryGap: [0, '100%'], - // min:0, - // max: 100, - splitLine:{ lineStyle:{ color:"#ddd" } }, - axisLine:{ lineStyle:{ color:"#666" } } - }, - series: [ - { - name:'PING', - type:'line', - smooth:true, - symbol: 'none', - sampling: 'average', - itemStyle: { normal: { color: 'rgb(0, 153, 238)' } }, - data: yData - } - ] - }; - chartPing.setOption(option); + chartPingData = data.data; + pingDataGraphRender(); + + setInterval(function() { + pingDataGraphPosData(); + }, 3000); }); } +function pingDataGraphRender(){ + var xData = []; + var yData = []; + var rdata = chartPingData; + for(var i = 0; i < rdata.length; i++){ + xData.push(toCommonTime(rdata[i].created_unix)); + yData.push(rdata[i].speed/1000000); + } + var option = { + tooltip: { + trigger: 'axis', + axisPointer: { type: 'cross' }, + formatter: '{b}
{a}: {c}' + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: xData, + axisLine:{ lineStyle:{ color:"#666"} } + }, + yAxis: { + type: 'value', + name: "PING延迟(ms)", + // boundaryGap: [0, '100%'], + // min:0, + // max: 100, + splitLine:{ lineStyle:{ color:"#ddd" } }, + axisLine:{ lineStyle:{ color:"#666" } } + }, + series: [ + { + name:'PING', + type:'line', + smooth:true, + symbol: 'none', + sampling: 'average', + itemStyle: { normal: { color: 'rgb(0, 153, 238)' } }, + data: yData + } + ] + }; + chartPing.setOption(option); + +} + // console.log('pingDataGraph'); var chartPing; +var chartPingData = []; function pingDataGraph(){ var tpl = '\
\ @@ -178,9 +193,9 @@ function pingDataGraph(){

连通性

\
\ 区间检索:\ - 昨天\ - 今天\ - 最近7天\ + 昨天\ + 今天\ + 最近7天\
\
\
\ @@ -244,7 +259,7 @@ function pingDataGraph(){ chartPing.resize(); }); - pingDataGraphRender(0); + pingDataGraphData(0); }