From 2540860e201deacee68b7e8719bd29b671601d60 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 8 Jan 2016 13:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=97=A5=E5=BF=97=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xxl/job/controller/JobLogController.java  | 10 +++++++
 .../WEB-INF/template/common/common.macro.ftl  | 28 +++++++++++++++++++
 .../main/webapp/static/js/joblog.index.1.js   |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java
index 7a4214db..3122a421 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java
@@ -1,6 +1,7 @@
 package com.xxl.job.controller;
 
 import java.text.ParseException;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -47,6 +48,15 @@ public class JobLogController {
 	
 	@RequestMapping
 	public String index(Model model, String jobName, String filterTime) {
+		
+		// 默认filterTime
+		Calendar todayz = Calendar.getInstance();
+		todayz.set(Calendar.HOUR_OF_DAY, 0);
+		todayz.set(Calendar.MINUTE, 0);
+		todayz.set(Calendar.SECOND, 0);
+		model.addAttribute("triggerTimeStart", todayz.getTime());
+		model.addAttribute("triggerTimeEnd", Calendar.getInstance().getTime());
+				
 		model.addAttribute("jobName", jobName);
 		model.addAttribute("filterTime", filterTime);
 		return "joblog/index";
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
index 93d741cd..c69d574b 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
@@ -191,6 +191,19 @@
 			</div>
 		</div>
 	</div>
+	<!-- ComAlertTec.模态框Modal-科技感 -->
+	<div class="modal fade" id="ComAlertTec" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content-tec">
+	         	<div class="modal-body"><div class="alert" style="color:#fff;"></div></div>
+	         	<div class="modal-footer">
+	         		<div class="text-center" >
+	            		<button type="button" class="btn btn-info ok" data-dismiss="modal" >确认</button>
+	            	</div>
+	         	</div>
+			</div>
+		</div>
+	</div>
 	<script>
 		// 通用提示
 		var ComAlert = {
@@ -237,5 +250,20 @@
 				});
 			}
 		};
+		// 提示-科技主题
+		var ComAlertTec = {
+			show:function(msg, callback){
+				// 弹框初始
+				$('#ComAlertTec .alert').html(msg);
+				$('#ComAlertTec').modal('show');
+				
+				$('#ComAlertTec .ok').click(function(){
+					$('#ComAlertTec').modal('hide');
+					if(typeof callback == 'function') {
+						callback();
+					}
+				});
+			}
+		};
 	</script>
 </#macro>
\ No newline at end of file
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 6cde6c1b..d1e4c28d 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
@@ -77,7 +77,7 @@ $(function() {
 	// 日志弹框提示
 	$('#joblog_list').on('click', '.logTips', function(){
 		var title = $(this).attr('title');
-		ComAlert.show(2, title);
+		ComAlertTec.show(title);
 	});
 	
 	// 过滤时间