update

潘钊
1 parent ffe68954
Showing 24 changed files with 383 additions and 204 deletions
pom.xml
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/sys/SessionLog.java
src/main/java/com/bsth/entity/sys/SignControl.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/directive/thread/FirstScheduleIssuedThread.java
src/main/java/com/bsth/vehicle/gpsdata/service/GpsDataServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/static/assets/js/common.js
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/main.js
src/main/resources/static/pages/control/line/js/webSocketHandle.js
src/main/resources/static/pages/control/line/temps/home_tp.html
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/pages/mapmonitor/real/css/real.css
@@ -5,7 +5,7 @@
 	<groupId>com.bsth</groupId>
 	<artifactId>bsth_control</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -22,7 +22,7 @@
 		<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <!--<scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
 		<dependency>
@@ -93,7 +93,7 @@ public class StartCommand implements CommandLineRunner{
 			 * 每15秒从数据库抓取到离站信息和班次匹配
 			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
 			 */
-			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
+			scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
 			/**
 			 * 首个调度指令下发（2分钟运行一次）
@@ -15,6 +15,7 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 import com.google.common.base.Splitter;
@@ -24,6 +25,9 @@ import com.google.common.base.Splitter;
 public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
 	@Autowired
+	GetSchedulePlanThread getSchedulePlanThread;
+	
+	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
 	@RequestMapping(value = "/lines")
@@ -35,8 +39,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * 
 	 * @Title: registerLine @Description: TODO(注册线路，后续才能收到数据推送) @param @param
 	 * lineCodes @throws
+	 * 用GET 防止监控模式下被拦截
 	 */
-	@RequestMapping(value = "/registerLine", method = RequestMethod.POST)
+	@RequestMapping(value = "/registerLine", method = RequestMethod.GET)
 	public int registerLine(@RequestParam String lineCodes) {
 		List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(lineCodes);
 		String userName = SecurityUtils.getCurrentUser().getUserName();
@@ -253,6 +258,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> findRouteByLine(@RequestParam Integer lineId){
 		return scheduleRealInfoService.findRouteByLine(lineId);
 	}
+	
+	@RequestMapping(value = "/test/getSch")
+	public int getSch(){
+		getSchedulePlanThread.start();
+		return 1;
+	}
 	/**
 	 * 
+package com.bsth.entity.sys;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * 
+ * @ClassName: SessionLog
+ * @Description: TODO(session日志)
+ * @author PanZhao
+ * @date 2016年7月20日 下午4:46:27
+ *
+ */
+@Entity
+@Table(name = "bsth_c_sys_sessionlog")
+public class SessionLog {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	@ManyToOne
+	private SysUser user;
+
+	/** 登录时间 */
+	private Date loginDate;
+
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
+	/** 登出时间 */
+	private Date logoutDate;
+
+	/** 登出方式 0：主动登出， -1：其他 */
+	private int logoutType;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public SysUser getUser() {
+		return user;
+	}
+
+	public void setUser(SysUser user) {
+		this.user = user;
+	}
+
+	public Date getLoginDate() {
+		return loginDate;
+	}
+
+	public void setLoginDate(Date loginDate) {
+		this.loginDate = loginDate;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getLogoutDate() {
+		return logoutDate;
+	}
+
+	public void setLogoutDate(Date logoutDate) {
+		this.logoutDate = logoutDate;
+	}
+
+	public int getLogoutType() {
+		return logoutType;
+	}
+
+	public void setLogoutType(int logoutType) {
+		this.logoutType = logoutType;
+	}
+}
+package com.bsth.entity.sys;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * 
+ * @ClassName: SignControl 
+ * @Description: TODO(进出线调记录) 
+ * @author PanZhao
+ * @date 2016年7月20日 下午4:50:50 
+ *
+ */
+@Entity
+@Table(name = "bsth_c_sys_sign")
+public class SignControl {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	/** 登入线调时间 */
+	private Date signDate;
+	
+	@ManyToOne
+	private SessionLog session;
+	
+}
@@ -93,7 +93,7 @@ public class ScheduleBuffer {
 				schedul.syncTime();
 			}
-			//发车时间排序
+			//发车顺序号排序
 			Collections.sort(list, scheduleComparator);
 			String zbh;
@@ -184,7 +184,8 @@ public class ScheduleBuffer {
 		@Override
 		public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
-			return (int) (o1.getFcsjT() - o2.getFcsjT());
+			//return (int) (o1.getFcsjT() - o2.getFcsjT());
+			return o1.getFcno() - o2.getFcno();
 		}
 	}
@@ -49,7 +49,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
-	static Long schDiff = 1000 * 60 * 30L;
+	static Long schDiff = 1000 * 60 * 60L;
 	//城市代码
 	static final short cityCode = 22;
@@ -84,9 +84,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		Directive60 directive = null;
 		try {
 			//如果发车时间距当前时间较远，则不发送
-			/*if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
+			if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
 				return 0;
-			}*/
+			}
 			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getFcsjT()))
 					+ "，由" + sch.getQdzName() + "发往" + sch.getZdzName();
 package com.bsth.vehicle.directive.thread;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -129,11 +129,11 @@ public class GpsDataServiceImpl implements GpsDataService{
 		//day_of_year
 		Calendar sCal = Calendar.getInstance();
 		sCal.setTime(new Date(st * 1000));
-		int sDayOfYear = /*sCal.get(Calendar.DAY_OF_YEAR)*/200;
+		int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR)/*200*/;
 		Calendar eCal = Calendar.getInstance();
 		eCal.setTime(new Date(et * 1000));
-		int eDayOfYear = /*eCal.get(Calendar.DAY_OF_YEAR)*/200;
+		int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR)/*200*/;
 		Calendar weekCal = Calendar.getInstance();
@@ -189,7 +189,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 		inv = inv.substring(0, inv.length() - 1);
 		//查询到离站数据
-		Map<String, ArrivalInfo> arrivalMap = findArrivalByTs(/*weekOfYear*/30, st, et, inv);
+		Map<String, ArrivalInfo> arrivalMap = findArrivalByTs(weekOfYear/*30*/, st, et, inv);
 		String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id in ("+inv+") and ts > ? and ts < ?";
 		try{
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= panzhao
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -25,6 +25,6 @@ spring.datasource.validation-query=select 1
 ##
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.201:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.171:8080/transport_server/message/
+http.send.directive = http://192.168.168.201:8080/transport_server/message/
@@ -24,6 +24,7 @@ function successHandle(json, handle){
 	var status = json.status;
 	if(status == 407){
 		alert('被注销的登录');
+		location.reload(true);
 		return;
 	}
@@ -94,7 +94,7 @@ Login page
 				<div class="input-icon  right" style="display: inline-block;">
                    <i class="fa fa-key"></i>
-                	<input type="password" class="form-control " placeholder="密码" name="password" value="admin"> </div>
+                	<input type="password" class="form-control " placeholder="密码" name="password" value="" > </div>
 				&nbsp;&nbsp;
                    <button type="submit" class="btn blue buttonLogin" style="border-radius: 5px !important;
     font-family: 微软雅黑;">登&nbsp;录</button>
@@ -112,6 +112,7 @@ Login page
 	<script type="text/javascript">
 		$(function() {
+			$('input[name=password]').focus();
 			/* setCenterCss(); */
 			if ($.url().param('error')) {
 				//去session里查一下失败信息
+.portlet.light > .portlet-title.banner{
+	padding: 17px 20px 0px 20px;
+	border-bottom: none;
+	margin-bottom: 0;
+	padding-bottom: 5px;
+}
+.portlet-fullscreen.monitor #top-tabs-wrap .nav-tabs,
+.portlet.light.monitor > .portlet-title.banner{
+	background: linear-gradient(to right ,#595959, #7b7b7b,#595959);
+}
+
+.portlet.light.main > .portlet-title.banner,
+.portlet-fullscreen.main #top-tabs-wrap .nav-tabs{
+	background: linear-gradient(to right ,#082F4A, #125688,#0a3f64);
+}
+
+.portlet-fullscreen.portlet.light.monitor .nav-tabs > li > a:hover{
+	background: #656565;
+}
+
+.portlet-fullscreen.portlet.light.monitor  .nav-tabs>li.active>a{
+	background: #FFFFFF;
+}
+
 .load-anim{
 	position: fixed;z-index: 9999999;width: 100%;height: 100%;
 	background: rgba(8, 47, 74, 0.89);top: 0;left: 0;
@@ -2280,6 +2304,13 @@ tr._tr_active.active-line-no .out-badge{
 	background-color: #5d5da9 !important;
 }
+
 .pb-table tr.selected.dir_1{
 	background-color: #dc5a5a !important;
+}
+
+#tab_home .tab-pane .row.card_wrap:last-child .line_chart,
+#tab_home .tab-pane .row.card_wrap:last-child .col-lg-2 {
+	border-bottom: 1px solid #DADADA;
+	border-bottom: 1px solid #DADADA;
 }
 \ No newline at end of file
@@ -8,13 +8,13 @@
 <div class="portlet light portlet-fullscreen" style="transition: all .5s ease;padding: 0;" oncontextmenu=self.event.returnValue=false>
-    <div class="portlet-title" style="padding: 17px 20px 0px 20px;border-bottom: none;margin-bottom: 0;background: linear-gradient(to right ,#082F4A, #125688,#0a3f64);padding-bottom: 5px;">
+    <div class="portlet-title banner" >
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
 				class="caption-subject bold" style="font-size: 24px;">闵行公交线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
-			<span class="top_username"></span>，在线！ 
+			<span class="top_username"></span> <span class="operation_mode_text animated" ></span> 
 		</div>
         <div class="actions col_hide_1280" >
 	        <div class="btn-group">
@@ -64,7 +64,7 @@
 	              </div>
 	              	<button id="exitBtn" type="button" class="btn btn-danger" style="margin-left: 8px;padding: 6.5px 9px !important;" >
-	                  <i class="fa fa-close" ></i> 退出系统</button>
+	                  <!-- <i class="fa fa-close" ></i>  -->退出线路调度</button>
 	          </div>
         </div>
     </div>
@@ -237,13 +237,29 @@ var lineCodes = &#39;&#39; //全部线路编码字符串，由data.js初始化
 	,animationend = 'webkitAnimationEnd animationend';
 moment.locale('zh-cn');
-var cUser;
+var cUser
+	, storage = window.localStorage
+	, operationMode = storage.getItem('operationMode');
+
 //当前用户
 $.get('/user/currentUser', function(user){
 	cUser = user;
-	$('.portlet-fullscreen .top_username').text(cUser.userName);
+	$('.portlet-fullscreen .top_username').text(cUser.userName)
+		var t = operationMode == 0?'，<abbr title="系统将对当前的提交请求进行拦截">监控模式</abbr> 在线'
+				:'，主调模式 在线';
+	$('.portlet-fullscreen .operation_mode_text').html(t);
 });
+
+//打个标记
+storage.setItem('real_control_flag', 1);
+
 $(function() {
+	//主调和监控模式横幅颜色
+	if(operationMode == 0)
+		$('.portlet-fullscreen').addClass('monitor');
+	else
+		$('.portlet-fullscreen').addClass('main');
+	
  	//加载模板文件
  	getTemp('temps/home_tp.html');
  	getTemp('temps/tooltip_tp.html');
@@ -29,7 +29,8 @@ var _data = (function(){
 	var carDeviceIdMapp = {};
 	var fcsjSort = function(a, b){
-		return a.fcsjT - b.fcsjT;
+		//return a.fcsjT - b.fcsjT;
+		return a.fcno - b.fcno;
 	}
 	var dataObject = {
@@ -132,7 +133,7 @@ var _data = (function(){
 		}
 		//查询站点路由
 		,queryStationRoute : function(lineId,container, cb, width){
-			$get('/stationroute/all', {'line.lineCode_eq': lineId}, function(routes){
+			$get('/stationroute/all', {'line.lineCode_eq': lineId, 'destroy_eq': 0}, function(routes){
 				var svgData = analyData(routes);
 				cb && cb(lineId, svgData, container, width);
 			});
@@ -165,9 +166,7 @@ var _data = (function(){
 					});
 					//按发车时间排序
-					list.sort(function(a, b){
-						return a.fcsjT - b.fcsjT;
-					});
+					list.sort(fcsjSort);
 				}
 				cb && cb(rs);
 			});
@@ -6,6 +6,10 @@
 			icon : 3,
 			skin : 'layui-layer-cfm-delete'
 		}, function(){
+			//清除标记
+			storage.removeItem('real_control_flag');
+			//解绑事件
+			$(document).unbind('ajaxSend', interceptPOST);
 			layer.closeAll();
 			window.location.href = '/pages/control/lineallot/allot.html';
 		});
@@ -112,8 +116,19 @@ setTimeout(function(){
 		homeObject.init();
 	});
+	//监控模式下，拦截post请求
+	if(operationMode == 0){
+		$(document).on('ajaxSend', interceptPOST);
+	}
 }, 200)
+	function interceptPOST(e, xhr, t){
+		if(t && (t.method == 'POST' || t.type == 'POST')){
+			console.log(e, xhr, t);
+			xhr.abort();
+			layer.msg('监控模式！',{offset: 'ct', shift : 6});
+		}
+	}
 	function gpslistToMap(gpslist){
 		var map = {}
@@ -5,7 +5,7 @@ var reqCodeMap = {0xA1: &#39;è¯·æ±‚æ¢å¤è¿è¥&#39;, 0xA2: &#39;ç”³è¯·è°ƒæ¡£&#39;, 0xA3: &#39;å‡ºåœ
 //å°†å½“å‰ç”¨æˆ·å’Œçº¿è·¯ç»‘å®šåˆ°åŽå°
 setTimeout(function(){
-	$.post('/realSchedule/registerLine', {lineCodes: lineCodes}
+	$.get('/realSchedule/registerLine', {lineCodes: lineCodes}
 	,function(rs){
 		if(rs == 0){
 			console.log('æ³¨å†Œçº¿è·¯æˆåŠŸï¼');
@@ -8,7 +8,7 @@
 	<div class="col-lg-2 ">
 		<div class="title">
-			发往{{lineObj.startStationName}}方向 <span class="up-number" id="{{lineObj.lineCode}}_0_badge"> 0 </span>
+			发往{{lineObj.endStationName}}方向 <span class="up-number" id="{{lineObj.lineCode}}_0_badge"> 0 </span>
 			<div class="help_text dropdown">
 				<!--<span class=" blue dropdown-toggle col_hide_1440"
 					data-toggle="dropdown" aria-expanded="true"
@@ -59,7 +59,7 @@
 	<div class="col-lg-2  down">
 		<div class="title">
-			发往{{lineObj.endStationName}}方向 <span class="down-number" id="{{lineObj.lineCode}}_1_badge"> 0 </span>
+			发往{{lineObj.startStationName}}方向 <span class="down-number" id="{{lineObj.lineCode}}_1_badge"> 0 </span>
 			<div class="help_text dropdown">
 				<!--<span class=" blue dropdown-toggle col_hide_1440"
 					data-toggle="dropdown" aria-expanded="true"
@@ -78,12 +78,42 @@
     font-family: 仿宋;
 }
-.selected a{
+/* .selected a{
 	position: absolute;
 	bottom: 20px;
 }
 .selected a.btn{
 	bottom: 10px;
+} */
+
+.lb_panel{
+    position: absolute;
+    bottom: 20px;
+}
+
+.lb_panel a{
+	margin-right: 5px;
+}
+
+.gotoControl.red{
+    background: #ec7b7b;
+    border-color: #ec7b7b;
+}
+
+.gotoControl.red:hover{
+    background: #d96262;
+    border-color: #d96262;
+}
+
+#resetBtn,#historyBtn{
+	vertical-align: bottom;
+	display: inline-block;
+	margin-bottom: 3px;
+}
+
+/** 闵行没有分公司，直接隐藏 */
+.company,.sub-company{
+	display: none !important;
 }
 </style>
@@ -118,9 +148,8 @@
 		                        <input type="text" id="searchLineInput" class="form-control input-lg" placeholder="搜索线路"> </div>
 		                </div>
                 	</div>
-                
                 	<div class="line-select-cont col-md-12" >
-                		<div class="line-select-body">
+                		<div class="line-select-body" style="margin-top: 20px;">
                 			<span class="load-text">加载中...</span>
                 		</div>
                 	</div>
@@ -130,15 +159,19 @@
                 	<h5  style="font-family: 仿宋; display: block;">已选中线路</h5>
                 	<div class="selected-body"></div>
-                	<a href="javascript:;"  id="gotoControl" class="btn btn-lg blue" >
-                    	<i class="fa fa-check"></i> 确定 </a>
-                    	
-                    	
-                    <a href="javascript:;"  id="resetBtn" style="left: 120px;color: #3598DC;">
-                    	<i class="fa fa-history"></i> 重置</a>
-                    	
-                    <a href="javascript:;"  id="historyBtn" style="left: 180px;color: #f36a5a;">
-                    	<i class="fa fa-history"></i> 历史纪录 </a>
+                	<div class="lb_panel">
+	                	<a href="javascript:;"  class="btn btn-lg blue gotoControl red" data-status=1>
+	                    	<i class="fa fa-power-off"></i> 主调模式 </a>
+	                    	
+	                    <a href="javascript:;"  id="monitor" class="btn btn-lg grey gotoControl" data-status=0>
+                    		<i class="fa fa-tv"></i> 监控模式 </a>
+	                    	&nbsp;
+	                    <a href="javascript:;" id="resetBtn" style="left: 120px;color: #3598DC;">
+	                    	<i class="fa fa-history"></i> 重置</a>
+	                    	
+	                    <a href="javascript:;"  id="historyBtn" style="left: 180px;color: #f36a5a;">
+	                    	<i class="fa fa-history"></i> 历史纪录 </a>
+                	</div>
                 </div>
 			</div>
 		</div>
@@ -254,7 +287,7 @@ $(function(){
 	});
 	//确定
-	$('#gotoControl').on('click', function(){
+	$('.gotoControl').on('click', function(){
 		var lines = $('.selected-body .line');
 		if(lines.length == 0){
 			layer.alert('你还没有选择线路！',{icon: 3});
@@ -268,6 +301,8 @@ $(function(){
 			lsData.push(lineIdMap[$(e).data('id')]);
 		});
 		storage.setItem('lineControlItems', JSON.stringify(lsData));
+		//监控模式还是主调模式
+		storage.setItem('operationMode', $(this).data('status'));
 		//将线路路由缓存到localstorage
 		cacheRoute(lsData, function(cacheData){
 			for(var lineCode in cacheData){
@@ -87,11 +87,22 @@ label.BMapLabel{
 .mapRightWrap.to_playBack{
 	transform:rotateY(180deg);
-	height: 476px;
-	width: 390px
+    min-height: 454px;
+    width: 390px;
+    height: auto;
 }
-.mapRightWrap.to_playBack .alert{
+.mapRightWrap.playBack{
+    min-height: 454px;
+    width: 390px;
+    height: auto;
+}
+
+/* .mapRightWrap.playBack form select{
+	width: 100%;
+} */
+
+.mapRightWrap.playBack .alert{
     font-size: 13px;
     margin-top: 1px;
     width: calc(100% - 2px);
@@ -107,6 +118,7 @@ label.BMapLabel{
 .mapRightWrap.search{
 	height: 47px;
 	padding-top: 0;
+	background-color: #626775 !important;
 }
 .playBack form{
@@ -631,22 +643,22 @@ html{
 }
 .play-back-list{
-    display: none;
+display: none;
     position: absolute;
     width: 295px;
     right: 5px;
-    background: linear-gradient(to right ,#0d4770,#0a3f64);
     z-index: 9999;
-    
     height: calc(100% - 50px);
     top: 25px;
     padding: 15px 7px 3px;
+    background: white;
+    border-radius: 5px !important;
 }
 .progress-wrap{
     width: calc(100% - 340px);
     height: 10px;
-    bottom: 20px;
+    bottom: 33px;
     left: 20px;
     position: absolute;
     display: none;
@@ -688,7 +700,7 @@ html{
     height: 44px;
     position: absolute;
     right: 320px;
-    bottom: 40px;
+    bottom: 58px;
     padding: 9px 0 0 25px;
     border-radius: 15px !important;
 }
@@ -720,13 +732,11 @@ html{
 }
 .pback-logs{
-	height: 100%;
-	width: 100%;
-	color: #e1e1e1;
+    color: #333333;
 }
 .pback-logs-item{
     padding: 8px 12px;
-    border-bottom: 1px dashed #5a5a5a;
+    border-bottom: 1px dashed #d2d2d2;
 }
 .pback-logs-item-date{
@@ -742,19 +752,20 @@ html{
 }
 .progress-mark-info{
-    position: absolute;
+	position: absolute;
     width: 62px;
-    height: 30px;
+    height: 27px;
     z-index: 10000;
     background: #1bbc9b;
     display: none;
-    top: -35px;
-    padding: 5px 3px;
+    top: -30px;
+    padding: 4px 3px;
     color: white;
 }
 #progress-mark-time{
 	/* transition: all 1s ease; */
+	top: 12px;
 }
 #progress-mark-time-mouse{
@@ -34,7 +34,6 @@ var playBack = (function() {
 	var lineRoute;
 	//默认以第一辆车为焦点
 	var firstCar;
-	//S0I-058，S0I-055 ，隧道六线
 	function getCurrMap(){
 		return realMap[realMap.getMap().fName];
@@ -79,6 +78,7 @@ var playBack = (function() {
 		getCurrMap().clear();
 		//坐标归0
 		cIndex = 0;
+		$('.pback-logs').html('');
 		//动画
 		$('.play-back-list').removeClass('fadeInRightBig').addClass('fadeOutRightBig');
 		$('.play-back-btns,.progress-wrap').removeClass('fadeInUpBig').addClass('fadeOutDownBig');
@@ -183,6 +183,10 @@ var playBack = (function() {
 			//点击轨迹回放按钮
 			$('#playBackBtn').on('click', function(){
+				//表单校验
+				if(!customFormValidate('#playBackForm'))
+					return;
+				
 				var params = $('#playBackForm').serializeJSON();
 				//查询历史gps数据
 				var fs = 'YYYY-MM-DDHH:mm'
@@ -198,7 +202,7 @@ var playBack = (function() {
 					success:function(rs){
 						gpsArray = rs;
 						size = gpsArray.length;
-						//layer.closeAll();
+						layer.closeAll();
 						//切出轨迹回放面板
 						$('.mapRightWrap,.mapTools,.leftUtilsWrap').fadeOut();
 						$('.play-back-list,.play-back-btns,.progress-wrap').show();
@@ -214,23 +218,29 @@ var playBack = (function() {
 						getCurrMap().clear();
 						firstCar = params.nbbm[0];
-						layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3});
-						$.get('/realSchedule/findRouteByLine', {lineId: $('.mapRightWrap select[name=lineCode]').val()}
+						
+						var lineCode = $('.mapRightWrap select[name=lineCode]').val();
+						if(lineCode != -1){
+							layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3});
+							$.get('/realSchedule/findRouteByLine', {lineId: lineCode}
 							,function(route){
 								lineRoute = route;
 								getCurrMap().drawLine(lineRoute);
-								//开始播放
+								layer.closeAll();
 								play();
-						});
+							});
+						}
+						else
+							play();
 					}
 				});
 			});
 			//默认值
-			 $('input[name=sDate]').val('2016-04-24');
+			/* $('input[name=sDate]').val('2016-04-24');
 			 $('input[name=sTime]').val('04:00');
 			 $('input[name=eDate]').val('2016-04-24');
-			 $('input[name=eTime]').val('04:40');
+			 $('input[name=eTime]').val('05:40');*/
 		}
 	};
@@ -283,6 +293,36 @@ var playBack = (function() {
 		//$pmk.css('width', w);
 		play();
 	}
+	
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
 	return exports;
 })();
 \ No newline at end of file
@@ -41,9 +41,9 @@
 		}
 		var method = $(this).data('click');
-		if (!method || playAnimation)
+		/*if (!method || playAnimation)
 			return;
-		playAnimation = true;
+		playAnimation = true;*/
 		$('.mapTools').addClass('disable');
 		$('.mapTools div.item.active').removeClass('active');
@@ -58,19 +58,25 @@
 		// 车辆
 		vehicle : function() {
-			mrw.html('').addClass('to_vehicle vehicle');
-			resetRotate(null, vehiclePanel.showData);
+			/*mrw.html('').addClass('to_vehicle vehicle');
+			resetRotate(null, vehiclePanel.showData);*/
+			mrw.html('').addClass('vehicle');
+			vehiclePanel.showData();
 		},
 		search : function() {
-			mrw.html('').addClass('to_searchPanel search');
-			resetRotate(null, searchPanel.init);
+			/*mrw.html('').addClass('to_searchPanel search');
+			resetRotate(null, searchPanel.init);*/
+			mrw.html('').addClass('search');
+			searchPanel.init();
 		},
 		notice : function() {
 			alert('notice');
 		},
 		playBack : function() {
-			mrw.html('').addClass('to_playBack playBack');
-			resetRotate(null, playBack.init);
+			/*mrw.html('').addClass('to_playBack playBack');
+			resetRotate(null, playBack.init);*/
+			mrw.html('').addClass('playBack');
+			playBack.init();
 		},
 		clearStyle : function() {
@@ -26,137 +26,23 @@
 <div class="mapTools z-depth-3 ">
 	<div class="item active" data-click="vehicle">
-		<i class="fa fa-bus"></i> &nbsp;线路
+		<i class="fa fa-bus"></i> 线路
 	</div>
 	<div class="item" data-click="search">
-		<i class="fa fa-search"></i> &nbsp;搜索
+		<i class="fa fa-search"></i> 搜索
 	</div>
 	<!-- <div class="item" data-click="notice"> -->
 	<div class="item" >
-		<i class="fa fa-bell-o"></i> &nbsp;安全
+		<i class="fa fa-bell-o"></i> 安全
 	</div>
 	<div class="item" data-click="playBack">
-		<i class="fa fa-history"></i> &nbsp;回放
+		<i class="fa fa-history"></i> 回放
 	</div>
 </div>
 <!-- 轨迹回放面板 -->
-<div class="play-back-list animated fadeInRightBig">
-	<div class="pback-logs">
-		<!-- <div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div><div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012 进站 金桥路浦东大道站 
-			<span class="pback-logs-item-date">07月17 12:40</span>
-		</div>
-		<div class="pback-logs-item">
-			W2B-012  出站 金桥路浦东大道站
-			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div> -->
-		
-	</div>
+<div class="play-back-list animated fadeInRightBig z-depth-2">
+	<div class="pback-logs"></div>
 </div>
 <div class="play-back-btns z-depth-1 animated fadeInUpBig">
 	<i class="fa fa-play playBtn" data-status=0></i>
+
+<!--  W2B-083 , W2B-084 , W2B-087 85路 -->
 <script id="play_back_panel_temp" type="text/html">
 <div class="alert alert-info animated flipInX">
-<i class="fa fa-exclamation-circle" ></i> 最多跨一天回放，请尽量小范围的查询 W2B-083 , W2B-084 , W2B-087 85路</div>
+<i class="fa fa-exclamation-circle" ></i> 最多跨一天回放，请尽量小范围的查询</div>
 <form class="form-horizontal" role="form" id="playBackForm">
 	<div class="form-body">
 		<div class="form-group">
 			<label class="col-md-3 control-label">车辆编码</label>
 			<div class="col-md-9">
-				<select class="form-control" name="nbbm[]" placeholder="车辆编码" multiple="multiple"></select>
+				<select class="form-control" name="nbbm[]" placeholder="车辆编码" multiple="multiple" required=1 style="width:100%;"></select>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="col-md-3 control-label">起始时间</label>
 			<div class="col-md-9">
-				<input type="date" name="sDate" class="form-control" placeholder="日期">
-				<input type="time" name="sTime" class="form-control" placeholder="时间">
+				<input type="date" name="sDate" class="form-control" placeholder="日期" required=1>
+				<input type="time" name="sTime" class="form-control" placeholder="时间" required=1>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="col-md-3 control-label">截止时间</label>
 			<div class="col-md-9">
-				<input type="date" name="eDate" class="form-control" placeholder="截止时间">
-				<input type="time" name="eTime" class="form-control" placeholder="时间">
+				<input type="date" name="eDate" class="form-control" placeholder="截止时间" required=1>
+				<input type="time" name="eTime" class="form-control" placeholder="时间" required=1>
 			</div>
 		</div>
 	</div>
@@ -30,13 +32,13 @@
 		<div class="form-group">
 			<label class="col-md-3 control-label">线路图层</label>
 			<div class="col-md-9">
-				<select class="form-control" name="lineCode" ></select>
+				<select class="form-control" name="lineCode" style="width:100%;"></select>
 			</div>
 		</div>
 </form>
 <hr>
 	<div class="form-actions">
-		<div class="row" style="text-align: center;margin-left: 0;">
+		<div class="row" style="text-align: center;margin-left: 0;margin-bottom: 20px;">
 			<div >
 				<button type="button" class="btn green-meadow btn-lg" id="playBackBtn"> <i class="fa fa-play-circle"> </i> &nbsp;轨迹回放 </button>
 			</div>