Merge remote-tracking branch 'remotes/github/master'

templates/jlog/log_offline.html

@@ -127,7 +127,7 @@
        var end_time = $('#end_time')[0].innerText;
        var div_username = ' 用户名: '+'<span class="text-info">'+username+'' + '</span>';
        var div_ip = ' 主机: '+'<span class="text-info">' + ip + '</span>';
-       var div_time = ' 开始时间: ' + '<span class="text-info">'+start_time +'</span>' + ' 结束时间: ' +'<span class="text-info">' + end_time + '</span'
+       var div_time = ' 开始时间: ' + '<span class="text-info">'+start_time +'</span>' + ' 结束时间: ' +'<span class="text-info">' + end_time + '</span>'
        var title = 'JumpServer命令统计 '+ div_username + div_ip + div_time;
         $.ajax({url:url,success:function(data){
         var tag = $('<div style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>').html(data.replace(/\n/g,"<br />"));
@@ -157,4 +157,4 @@
     })
 
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}