pull/617/head
Mr Chen 10 months ago
parent 3b1fcac0aa
commit 8ca63c0396
  1. 39
      plugins/simpleping/js/simpleping.js
  2. 2
      plugins/simpleping/simpleping_index.py

@ -53,6 +53,25 @@ function pingPostCallbak(method, args, callback){
},'json'); },'json');
} }
function pingPostCallbakN(method, args, callback){
var req_data = {};
req_data['name'] = 'simpleping';
req_data['script'] = 'simpleping_index';
req_data['func'] = method;
if (typeof(args) == 'string'){
req_data['args'] = JSON.stringify(toArrayObject(args));
} else {
req_data['args'] = JSON.stringify(args);
}
$.post('/plugins/callback', req_data, function(data) {
if(typeof(callback) == 'function'){
callback(data);
}
},'json');
}
function appReadme(){ function appReadme(){
@ -103,7 +122,19 @@ function getBeforeDate(n){
function pingDataGraphPosData(){ function pingDataGraphPosData(){
console.log(chartPingData.length); if (chartPingData.length>0){
var dlen = chartPingData.length;
last_pos = chartPingData[dlen-1];
// console.log(start,end);
pingPostCallbakN('pingData', {'type':'pos', 'pos':last_pos['created_unix']}, function(data){
var tmp_data = data.data;
for (x in tmp_data){
chartPingData.push(tmp_data[x]);
}
pingDataGraphRender();
});
}
} }
@ -130,9 +161,10 @@ function pingDataGraphData(day){
chartPingData = data.data; chartPingData = data.data;
pingDataGraphRender(); pingDataGraphRender();
setInterval(function() { clearInterval(posTimer);
posTimer = setTimeout(function() {
pingDataGraphPosData(); pingDataGraphPosData();
}, 3000); }, 2000);
}); });
} }
@ -184,6 +216,7 @@ function pingDataGraphRender(){
// console.log('pingDataGraph'); // console.log('pingDataGraph');
var chartPing; var chartPing;
var chartPingData = []; var chartPingData = [];
var posTimer;
function pingDataGraph(){ function pingDataGraph(){
var tpl = '\ var tpl = '\
<div class="col-xs-12 col-sm-12 col-md-12 pull-left pd0 view1">\ <div class="col-xs-12 col-sm-12 col-md-12 pull-left pd0 view1">\

@ -33,7 +33,7 @@ def pingData(args = ()):
atype = args['type'] atype = args['type']
if atype == 'pos': if atype == 'pos':
pos = args['pos'] pos = args['pos']
data = conn.where('created_unix>=?',pos).select() data = conn.where('created_unix>?',(pos,)).select()
elif atype == 'range': elif atype == 'range':
start = args['start'] start = args['start']
end = args['end'] end = args['end']

Loading…
Cancel
Save