Home Explore Help
Register Sign In
kerryzhang
/
xxl-job
Watch 1
Star 1
Fork 1
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Rolling log

xueli.xue 8 years ago
parent
7679403170
commit
3456945860
5 changed files with 15 additions and 17 deletions
Unified View Show Diff Stats
  1. 5 5
      xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
  2. 3 7
      xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
  3. 1 1
      xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
  4. 4 3
      xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
  5. 2 1
      xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js

+ 5 - 5
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl View File

170
170
171 
 <#macro commonFooter >
171 
 <#macro commonFooter >
172 
 	<footer class="main-footer">
172 
 	<footer class="main-footer">
173 
+        Powered by <b>XXL-JOB</b> 1.6
173 
 		<div class="pull-right hidden-xs">
174 
 		<div class="pull-right hidden-xs">
174 
-			<b>Version</b> 1.6
175 
+            <strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
176 
+                <a href="https://github.com/xuxueli/xxl-job" target="_blank" >github</a>&nbsp;
177 
+                <a href="http://my.oschina.net/xuxueli/blog/690978" target="_blank" >oschina</a>
178 
+            </strong><!-- All rights reserved. -->
175 
 		</div>
179 
 		</div>
176 
-		<strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
177 
-			<a href="https://github.com/xuxueli/xxl-job" target="_blank" >github</a>&nbsp;
178 
-			<a href="http://my.oschina.net/xuxueli/blog/690978" target="_blank" >oschina</a>
179 
-		</strong><!-- All rights reserved. -->
180 
 	</footer>
180 
 	</footer>
181 
 </#macro>
 181 
 </#macro>

+ 3 - 7
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl View File

4 
     <title>任务调度中心</title>
 4 
     <title>任务调度中心</title>
5 
 <#import "/common/common.macro.ftl" as netCommon>
 5 
 <#import "/common/common.macro.ftl" as netCommon>
6 
 <@netCommon.commonStyle />
 6 
 <@netCommon.commonStyle />
7 
-    <style>
8 
-        html{  background-color: whitesmoke;  }
9 
-        .skin-blue .wrapper {  background-color: whitesmoke;  }
10 
-    </style>
11 
 </head>
 7 
 </head>
12 
 <body class="hold-transition skin-blue layout-top-nav">
 8 
 <body class="hold-transition skin-blue layout-top-nav">
13
9
47 
         </nav>
 43 
         </nav>
48 
     </header>
 44 
     </header>
49
45
50 
-    <div>
51 
-        <pre>
46 
+    <div class="content-wrapper" >
47 
+        <pre style="font-size:12px;position: absolute; height:100%;width:100%;" id="logConsolePre" >
52 
             <div id="logConsole"></div>
 48 
             <div id="logConsole"></div>
53 
             <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
 49 
             <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
54 
-            <div style="margin-top: 50px;" ></div>
50 
+            <div><hr><i class="fa fa-fw fa-hand-pointer-o"></i><hr></div>
55 
         </pre>
 51 
         </pre>
56 
     </div>
 52 
     </div>
57
53

File diff suppressed because it is too large
+ 1 - 1
xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map


File diff suppressed because it is too large
+ 4 - 3
xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css


+ 2 - 1
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js View File

58 
                     pullFailCount = 0;
 58 
                     pullFailCount = 0;
59
59
60 
                     // scroll to bottom
 60 
                     // scroll to bottom
61 
-                    scrollTo(0, document.body.scrollHeight);
61 
+                    //scrollTo(0, document.body.scrollHeight);
62 
+                    $('#logConsolePre').scrollTop( document.body.scrollHeight + 300 );
62
63
63 
                 } else {
 64 
                 } else {
64 
                     console.log('pullLog fail:'+data.msg);
 65 
                     console.log('pullLog fail:'+data.msg);