From 0e3c79fb7966f216d05272f1545132caa5cbee86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=BF=E5=8F=AC=E9=98=B3?= <zhaoyang.su@yolu-inc.com>
Date: Fri, 7 Nov 2014 15:18:52 +0800
Subject: [PATCH] bug fix

---
 webroot/AutoSa/static/js/main.js      | 26 +++++++++++++++-----------
 webroot/AutoSa/templates/logView.html |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/webroot/AutoSa/static/js/main.js b/webroot/AutoSa/static/js/main.js
index fd765c7de..a5b383bdf 100644
--- a/webroot/AutoSa/static/js/main.js
+++ b/webroot/AutoSa/static/js/main.js
@@ -28,20 +28,23 @@ $.fn.webSocket = function(opt){
     };
 
     var init = function(e){
+
+        var socket = io.connect('ws://172.10.10.9:3000');
         var node = $(e.target);
         message.id = genUid();
         message.filename = node.attr('filename');
-
-        BootstrapDialog.show({message:'<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.on('message',function(obj){
-            $('#log').append(this.escape(obj.content));
-        });
+        BootstrapDialog.show({message:function(){
+            var tag = $('<div id="log" style="height:300px;"></div>');
+            //告诉服务器端有用户登录
+            socket.emit('login', {userid:message.id, filename:message.filename});
+            socket.on('message',function(obj){
+                tag.append(this.escape(obj.content));
+            });
+        } ,
+            title:'日志',
+            onhide:function(){
+                socket.emit('disconnect');
+        }});
     }
 
     var escape = function (html){
@@ -52,6 +55,7 @@ $.fn.webSocket = function(opt){
     }
     $this.on("click",function(e){
         init(e);
+        return false;
     });
 
 }
diff --git a/webroot/AutoSa/templates/logView.html b/webroot/AutoSa/templates/logView.html
index 109441073..51ea713b3 100644
--- a/webroot/AutoSa/templates/logView.html
+++ b/webroot/AutoSa/templates/logView.html
@@ -28,7 +28,7 @@
                 <td><a href="/logHistory/?id={{ log.id }}" class="log_command">统计</a></td>
                 <td>阻断</td>
                 {% else %}
-                <td><span class='monitor' filename="{{ log.logfile }}">监控</span></td>
+                <td><a class='monitor' filename="{{ log.logfile }}">监控</a></td>
                 <td>命令统计</td>
                 <td><a href="/killSession/?id={{ log.id }}">阻断</a> </td>
                 {% endif %}