Skip to content

J
jumpserver
Commit 0f63eadf authored by guanghongwei's avatar guanghongwei
Browse files
Options

bugfix

parent 4844f786
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
webroot/AutoSa/static/js/main.js
View file @ 0f63eadf
...@@ -29,7 +29,7 @@ $.fn.webSocket = function(opt){ ...@@ -29,7 +29,7 @@ $.fn.webSocket = function(opt){
var init = function(e){ 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); var node = $(e.target);
message.id = genUid(); message.id = genUid();
message.filename = node.attr('filename'); message.filename = node.attr('filename');
...@@ -47,7 +47,6 @@ $.fn.webSocket = function(opt){ ...@@ -47,7 +47,6 @@ $.fn.webSocket = function(opt){
//去除log中的颜色控制字符 //去除log中的颜色控制字符
var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g; var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g;
tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>'); tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>');
tag.animate({ scrollTop: tag[0].scrollHeight}, 1000);
}); });
return tag[0]; return tag[0];
} , } ,
......
webroot/AutoSa/templates/base.html
View file @ 0f63eadf
...@@ -18,8 +18,9 @@ ...@@ -18,8 +18,9 @@
<!-- 最新的 Bootstrap 核心 JavaScript 文件 --> <!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
<script src="/static/js/bootstrap.min.js"></script> <script src="/static/js/bootstrap.min.js"></script>
<script src="/static/js/bootstrap-dialog.js"></script> <script src="/static/js/bootstrap-dialog.js"></script>
<script src="http://172.10.10.9:3000/socket.io/socket.io.js"></script>
<script src="/static/js/main.js"></script> <script src="/static/js/main.js"></script>
</head> </head>
<body> <body>
...@@ -145,6 +146,7 @@ ...@@ -145,6 +146,7 @@
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
webroot/AutoSa/templates/logView.html
View file @ 0f63eadf
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load mytags %} {% load mytags %}
{% block content %} {% block content %}
<form method="post" action=""> <form method="post" action="">
<table class="table table-striped table-hover table-condensed"> <table class="table table-striped table-hover table-condensed">
<thead> <thead>
...@@ -38,6 +39,9 @@ ...@@ -38,6 +39,9 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<script src="http://{{ web_socket_host }}:3000/socket.io/socket.io.js"></script>
<script > <script >
$('.log_command').on('click',function(){ $('.log_command').on('click',function(){
var url = $(this).attr('href'); var url = $(this).attr('href');
...@@ -46,7 +50,11 @@ ...@@ -46,7 +50,11 @@
}}); }});
return false; return false;
}) })
globalConfig = {
SOCKET_HOST: "{{ web_socket_host }}"
}
$(".monitor").webSocket() $(".monitor").webSocket()
</script> </script>
<!--<button class="btn btn-primary">删除</button>--> <!--<button class="btn btn-primary">删除</button>-->
</form> </form>
......
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