diff --git a/route/static/app/crontab.js b/route/static/app/crontab.js index 5fe03df1b..c6aa4989e 100755 --- a/route/static/app/crontab.js +++ b/route/static/app/crontab.js @@ -1,33 +1,66 @@ var num = 0; //查看任务日志 function getLogs(id){ - layer.msg('正在获取,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); - var data='&id='+id; - $.post('/crontab/logs', data, function(rdata){ - layer.closeAll(); - if(!rdata.status) { - layer.msg(rdata.msg,{icon:2, time:2000}); - return; - }; - layer.open({ - type:1, - title:lan.crontab.task_log_title, - area: ['60%','500px'], - shadeClose:false, - closeBtn:1, - content:'
' - +'
'
-				+'
' - +'' - +'' - +'
' - +'
' - }); - setTimeout(function(){ - $("#crontab-log").html(rdata.msg); - },200); - },'json'); + var reqTimer = null; + var reqCount = 0; + + var tips = layer.msg('正在获取,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); + var req_log_args = 'id='+id; + function requestLogs(){ + + $.post('/crontab/logs', req_log_args, function(rdata){ + + if (reqCount == 0){ + layer.close(tips); + } + + if(!rdata.status) { + layer.msg(rdata.msg,{icon:2, time:2000}); + clearInterval(reqTimer); + return; + }; + + $("#crontab_log").html(rdata.msg); + //滚动到最低 + var ob = document.getElementById('crontab_log'); + ob.scrollTop = ob.scrollHeight; + reqCount++; + },'json'); + + } + + + layer.open({ + type:1, + title:"任务执行日志", + area: ['60%','500px'], + shadeClose:false, + btn:["关闭","清空"], + closeBtn:1, + end: function(){ + if (reqTimer){ + clearInterval(reqTimer); + } + }, + content:'
' + +'
'
+			// +'
' + // +'' + // +'' + // +'
' + +'
', + success:function(){ + requestLogs(); + reqTimer = setInterval(function(){ + requestLogs(); + },3000); + }, + + yes:function(index){ + closeLogs(id); + }, + }); }