diff --git a/webroot/AutoSa/static/js/main.js b/webroot/AutoSa/static/js/main.js index 4e7e4768e..bcf2d5761 100644 --- a/webroot/AutoSa/static/js/main.js +++ b/webroot/AutoSa/static/js/main.js @@ -29,7 +29,7 @@ $.fn.webSocket = function(opt){ var init = function(e){ - var socket = io.connect('ws://172.10.10.9:3000'); + var socket = io.connect('ws://'+globalConfig.SOCKET_HOST); var node = $(e.target); message.id = genUid(); message.filename = node.attr('filename'); @@ -47,7 +47,6 @@ $.fn.webSocket = function(opt){ //去除log中的颜色控制字符 var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g; tag.append('

'+escapeString(obj.content.replace(regx,''))+'

'); - tag.animate({ scrollTop: tag[0].scrollHeight}, 1000); }); return tag[0]; } , diff --git a/webroot/AutoSa/templates/base.html b/webroot/AutoSa/templates/base.html index 9305e4c47..40dfe7f75 100644 --- a/webroot/AutoSa/templates/base.html +++ b/webroot/AutoSa/templates/base.html @@ -18,8 +18,9 @@ - + + @@ -145,6 +146,7 @@ {% block content %}{% endblock %} + diff --git a/webroot/AutoSa/templates/logView.html b/webroot/AutoSa/templates/logView.html index 7a3806aee..3312005dd 100644 --- a/webroot/AutoSa/templates/logView.html +++ b/webroot/AutoSa/templates/logView.html @@ -2,6 +2,7 @@ {% load mytags %} {% block content %} +
@@ -38,6 +39,9 @@ {% endfor %}
+ + +