Skip to content

熊鹏飞 / xxljob220

Go to a project
Commit 34569458 by xueli.xue
Options

Rolling log

parent 76794031
Inline Side-by-side
Showing with 10 additions and 14 deletions
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
...@@ -170,12 +170,12 @@ ...@@ -170,12 +170,12 @@
<#macro commonFooter > <#macro commonFooter >
<footer class="main-footer"> <footer class="main-footer">
Powered by <b>XXL-JOB</b> 1.6
<div class="pull-right hidden-xs"> <div class="pull-right hidden-xs">
<b>Version</b> 1.6 <strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
<a href="https://github.com/xuxueli/xxl-job" target="_blank" >github</a>&nbsp;
<a href="http://my.oschina.net/xuxueli/blog/690978" target="_blank" >oschina</a>
</strong><!-- All rights reserved. -->
</div> </div>
<strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
<a href="https://github.com/xuxueli/xxl-job" target="_blank" >github</a>&nbsp;
<a href="http://my.oschina.net/xuxueli/blog/690978" target="_blank" >oschina</a>
</strong><!-- All rights reserved. -->
</footer> </footer>
</#macro> </#macro>
\ No newline at end of file
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
<title>任务调度中心</title> <title>任务调度中心</title>
<#import "/common/common.macro.ftl" as netCommon> <#import "/common/common.macro.ftl" as netCommon>
<@netCommon.commonStyle /> <@netCommon.commonStyle />
<style>
html{ background-color: whitesmoke; }
.skin-blue .wrapper { background-color: whitesmoke; }
</style>
</head> </head>
<body class="hold-transition skin-blue layout-top-nav"> <body class="hold-transition skin-blue layout-top-nav">
...@@ -47,11 +43,11 @@ ...@@ -47,11 +43,11 @@
</nav> </nav>
</header> </header>
<div> <div class="content-wrapper" >
<pre> <pre style="font-size:12px;position: absolute; height:100%;width:100%;" id="logConsolePre" >
<div id="logConsole"></div> <div id="logConsole"></div>
<li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li> <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
<div style="margin-top: 50px;" ></div> <div><hr><i class="fa fa-fw fa-hand-pointer-o"></i><hr></div>
</pre> </pre>
</div> </div>
......
xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map 100644 → 100755
This diff could not be displayed because it is too large.
xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css 100644 → 100755
This diff could not be displayed because it is too large.
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
...@@ -58,7 +58,8 @@ $(function() { ...@@ -58,7 +58,8 @@ $(function() {
pullFailCount = 0; pullFailCount = 0;
// scroll to bottom // scroll to bottom
scrollTo(0, document.body.scrollHeight); //scrollTo(0, document.body.scrollHeight);
$('#logConsolePre').scrollTop( document.body.scrollHeight + 300 );
} else { } else {
console.log('pullLog fail:'+data.msg); console.log('pullLog fail:'+data.msg);
......
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 sign in to comment