浏览代码

调度日志,弹出框优化

xueli.xue 10 年前
父节点
当前提交
2540860e20

+ 10 - 0
xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java 查看文件

@@ -1,6 +1,7 @@
1 1
 package com.xxl.job.controller;
2 2
 
3 3
 import java.text.ParseException;
4
+import java.util.Calendar;
4 5
 import java.util.Date;
5 6
 import java.util.HashMap;
6 7
 import java.util.List;
@@ -47,6 +48,15 @@ public class JobLogController {
47 48
 	
48 49
 	@RequestMapping
49 50
 	public String index(Model model, String jobName, String filterTime) {
51
+		
52
+		// 默认filterTime
53
+		Calendar todayz = Calendar.getInstance();
54
+		todayz.set(Calendar.HOUR_OF_DAY, 0);
55
+		todayz.set(Calendar.MINUTE, 0);
56
+		todayz.set(Calendar.SECOND, 0);
57
+		model.addAttribute("triggerTimeStart", todayz.getTime());
58
+		model.addAttribute("triggerTimeEnd", Calendar.getInstance().getTime());
59
+				
50 60
 		model.addAttribute("jobName", jobName);
51 61
 		model.addAttribute("filterTime", filterTime);
52 62
 		return "joblog/index";

+ 28 - 0
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl 查看文件

@@ -191,6 +191,19 @@
191 191
 			</div>
192 192
 		</div>
193 193
 	</div>
194
+	<!-- ComAlertTec.模态框Modal-科技感 -->
195
+	<div class="modal fade" id="ComAlertTec" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
196
+		<div class="modal-dialog">
197
+			<div class="modal-content-tec">
198
+	         	<div class="modal-body"><div class="alert" style="color:#fff;"></div></div>
199
+	         	<div class="modal-footer">
200
+	         		<div class="text-center" >
201
+	            		<button type="button" class="btn btn-info ok" data-dismiss="modal" >确认</button>
202
+	            	</div>
203
+	         	</div>
204
+			</div>
205
+		</div>
206
+	</div>
194 207
 	<script>
195 208
 		// 通用提示
196 209
 		var ComAlert = {
@@ -237,5 +250,20 @@
237 250
 				});
238 251
 			}
239 252
 		};
253
+		// 提示-科技主题
254
+		var ComAlertTec = {
255
+			show:function(msg, callback){
256
+				// 弹框初始
257
+				$('#ComAlertTec .alert').html(msg);
258
+				$('#ComAlertTec').modal('show');
259
+				
260
+				$('#ComAlertTec .ok').click(function(){
261
+					$('#ComAlertTec').modal('hide');
262
+					if(typeof callback == 'function') {
263
+						callback();
264
+					}
265
+				});
266
+			}
267
+		};
240 268
 	</script>
241 269
 </#macro>

+ 1 - 1
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js 查看文件

@@ -77,7 +77,7 @@ $(function() {
77 77
 	// 日志弹框提示
78 78
 	$('#joblog_list').on('click', '.logTips', function(){
79 79
 		var title = $(this).attr('title');
80
-		ComAlert.show(2, title);
80
+		ComAlertTec.show(title);
81 81
 	});
82 82
 	
83 83
 	// 过滤时间