Commit 0e3c79fb authored by 宿召阳's avatar 宿召阳

bug fix

parent 1c9359bb
...@@ -28,20 +28,23 @@ $.fn.webSocket = function(opt){ ...@@ -28,20 +28,23 @@ $.fn.webSocket = function(opt){
}; };
var init = function(e){ var init = function(e){
var socket = io.connect('ws://172.10.10.9:3000');
var node = $(e.target); var node = $(e.target);
message.id = genUid(); message.id = genUid();
message.filename = node.attr('filename'); message.filename = node.attr('filename');
BootstrapDialog.show({message:function(){
BootstrapDialog.show({message:'<div id="log" style="height:300px;"></div>'}); var tag = $('<div id="log" style="height:300px;"></div>');
var socket = io.connect('ws://172.10.10.9:3000');
//告诉服务器端有用户登录 //告诉服务器端有用户登录
socket.emit('login', {userid:message.id, filename:message.filename}); socket.emit('login', {userid:message.id, filename:message.filename});
socket.on('message',function(obj){ socket.on('message',function(obj){
$('#log').append(this.escape(obj.content)); tag.append(this.escape(obj.content));
}); });
} ,
title:'日志',
onhide:function(){
socket.emit('disconnect');
}});
} }
var escape = function (html){ var escape = function (html){
...@@ -52,6 +55,7 @@ $.fn.webSocket = function(opt){ ...@@ -52,6 +55,7 @@ $.fn.webSocket = function(opt){
} }
$this.on("click",function(e){ $this.on("click",function(e){
init(e); init(e);
return false;
}); });
} }
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<td><a href="/logHistory/?id={{ log.id }}" class="log_command">统计</a></td> <td><a href="/logHistory/?id={{ log.id }}" class="log_command">统计</a></td>
<td>阻断</td> <td>阻断</td>
{% else %} {% else %}
<td><span class='monitor' filename="{{ log.logfile }}">监控</span></td> <td><a class='monitor' filename="{{ log.logfile }}">监控</a></td>
<td>命令统计</td> <td>命令统计</td>
<td><a href="/killSession/?id={{ log.id }}">阻断</a> </td> <td><a href="/killSession/?id={{ log.id }}">阻断</a> </td>
{% endif %} {% endif %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment