Browse Source

调度日志弹框显示

xueli.xue 10 years ago
parent
commit
d467d7f2b4
1 changed files with 17 additions and 3 deletions
  1. 17 3
      xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js

+ 17 - 3
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js View File

12
                 d.jobName = $('#jobName').val()
12
                 d.jobName = $('#jobName').val()
13
             }
13
             }
14
 	    },
14
 	    },
15
-	    "scrollX": true,
15
+	    //"scrollX": true,	// X轴滚动条,取消自适应
16
 	    "columns": [
16
 	    "columns": [
17
 	                { "data": 'id', "bSortable": false, "visible" : false},
17
 	                { "data": 'id', "bSortable": false, "visible" : false},
18
 	                { "data": 'jobName', "bSortable": false},
18
 	                { "data": 'jobName', "bSortable": false},
27
 	                	}
27
 	                	}
28
 	                },
28
 	                },
29
 	                { "data": 'triggerStatus', "bSortable": false},
29
 	                { "data": 'triggerStatus', "bSortable": false},
30
-	                { "data": 'triggerMsg',"bSortable": false},
30
+	                { "data": 'triggerMsg',"bSortable": false,
31
+	                	"render": function ( data, type, row ) {
32
+	                		return data?'<a class="logTips" title="'+ data +'">调度日志</a>':"无";
33
+	                	}
34
+	                },
31
 	                { 
35
 	                { 
32
 	                	"data": 'handleTime',
36
 	                	"data": 'handleTime',
33
 	                	"bSortable": false,
37
 	                	"bSortable": false,
36
 	                	}
40
 	                	}
37
 	                },
41
 	                },
38
 	                { "data": 'handleStatus',"bSortable": false},
42
 	                { "data": 'handleStatus',"bSortable": false},
39
-	                { "data": 'handleMsg' , "bSortable": false}
43
+	                { "data": 'handleMsg' , "bSortable": false,
44
+	                	"render": function ( data, type, row ) {
45
+	                		return data?'<a class="logTips" title="'+ data +'">执行日志</a>':"无";
46
+	                	}
47
+	                }
40
 	            ],
48
 	            ],
41
 	    "searching": false,
49
 	    "searching": false,
42
 	    "ordering": true,
50
 	    "ordering": true,
66
 		}
74
 		}
67
 	});
75
 	});
68
 	
76
 	
77
+	// 日志弹框提示
78
+	$('#joblog_list').on('click', '.logTips', function(){
79
+		var title = $(this).attr('title');
80
+		ComAlert.show(2, title);
81
+	});
82
+	
69
 	// 过滤时间
83
 	// 过滤时间
70
 	$('#filterTime').daterangepicker({
84
 	$('#filterTime').daterangepicker({
71
 		timePicker: true, 			//是否显示小时和分钟
85
 		timePicker: true, 			//是否显示小时和分钟