From f8b8a1918cfa2e7b0dc49bb70113c2c785fbd638 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Mon, 27 Mar 2017 11:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97Console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/template/joblog/joblog.detail.ftl     | 15 ++++++++++-----
 .../src/main/webapp/static/js/joblog.detail.1.js  |  3 +--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
index dc738a89..c392ebda 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
@@ -44,13 +44,18 @@
     </header>
 
     <div class="content-wrapper" >
-        <pre style="font-size:12px;position: absolute; height:100%;width:100%;" id="logConsolePre" >
-            <div id="logConsole"></div>
-            <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
-            <div><hr><hr></div>
-        </pre>
+        <section class="content">
+            <pre style="font-size:12px;position:relative;" >
+                <div id="logConsole"></div>
+                <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
+                <div><hr><hr></div>
+            </pre>
+        </section>
     </div>
 
+    <!-- footer -->
+    <@netCommon.commonFooter />
+
 </div>
 
 <@netCommon.commonScript />
diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
index 192aee65..af09ccf5 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
@@ -58,8 +58,7 @@ $(function() {
                     pullFailCount = 0;
 
                     // scroll to bottom
-                    //scrollTo(0, document.body.scrollHeight);
-                    $('#logConsolePre').scrollTop( document.body.scrollHeight + 300 );
+                    scrollTo(0, document.body.scrollHeight);        // $('#logConsolePre').scrollTop( document.body.scrollHeight + 300 );
 
                 } else {
                     console.log('pullLog fail:'+data.msg);