xueli.xue 8 gadus atpakaļ
vecāks
revīzija
f8b8a1918c

+ 10 - 5
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl Parādīt failu

44
     </header>
44
     </header>
45
 
45
 
46
     <div class="content-wrapper" >
46
     <div class="content-wrapper" >
47
-        <pre style="font-size:12px;position: absolute; height:100%;width:100%;" id="logConsolePre" >
48
-            <div id="logConsole"></div>
49
-            <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
50
-            <div><hr><hr></div>
51
-        </pre>
47
+        <section class="content">
48
+            <pre style="font-size:12px;position:relative;" >
49
+                <div id="logConsole"></div>
50
+                <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
51
+                <div><hr><hr></div>
52
+            </pre>
53
+        </section>
52
     </div>
54
     </div>
53
 
55
 
56
+    <!-- footer -->
57
+    <@netCommon.commonFooter />
58
+
54
 </div>
59
 </div>
55
 
60
 
56
 <@netCommon.commonScript />
61
 <@netCommon.commonScript />

+ 1 - 2
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js Parādīt failu

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