From d467d7f2b4844dad38f01431ae9403f9d3ce2da2 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Thu, 7 Jan 2016 11:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=97=A5=E5=BF=97=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/webapp/static/js/joblog.index.1.js   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
index 92ff43ae..6cde6c1b 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
@@ -12,7 +12,7 @@ $(function() {
                 d.jobName = $('#jobName').val()
             }
 	    },
-	    "scrollX": true,
+	    //"scrollX": true,	// X轴滚动条，取消自适应
 	    "columns": [
 	                { "data": 'id', "bSortable": false, "visible" : false},
 	                { "data": 'jobName', "bSortable": false},
@@ -27,7 +27,11 @@ $(function() {
 	                	}
 	                },
 	                { "data": 'triggerStatus', "bSortable": false},
-	                { "data": 'triggerMsg',"bSortable": false},
+	                { "data": 'triggerMsg',"bSortable": false,
+	                	"render": function ( data, type, row ) {
+	                		return data?'<a class="logTips" title="'+ data +'">调度日志</a>':"无";
+	                	}
+	                },
 	                { 
 	                	"data": 'handleTime',
 	                	"bSortable": false,
@@ -36,7 +40,11 @@ $(function() {
 	                	}
 	                },
 	                { "data": 'handleStatus',"bSortable": false},
-	                { "data": 'handleMsg' , "bSortable": false}
+	                { "data": 'handleMsg' , "bSortable": false,
+	                	"render": function ( data, type, row ) {
+	                		return data?'<a class="logTips" title="'+ data +'">执行日志</a>':"无";
+	                	}
+	                }
 	            ],
 	    "searching": false,
 	    "ordering": true,
@@ -66,6 +74,12 @@ $(function() {
 		}
 	});
 	
+	// 日志弹框提示
+	$('#joblog_list').on('click', '.logTips', function(){
+		var title = $(this).attr('title');
+		ComAlert.show(2, title);
+	});
+	
 	// 过滤时间
 	$('#filterTime').daterangepicker({
 		timePicker: true, 			//是否显示小时和分钟