update

潘钊
1 parent 8912e3af
Showing 15 changed files with 202 additions and 77 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/resources/static/pages/control/line/child_pages/vehicAndper_adjust.html → src/main/resources/static/pages/control/line/child_pages/car_and_persion.html
src/main/resources/static/pages/control/line/child_pages/outgo_adjust_all.html → src/main/resources/static/pages/control/line/child_pages/dfsj_batch.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/main.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
src/main/resources/static/pages/mapmonitor/real/js/real.js
src/main/resources/static/pages/mapmonitor/real/js/vehicle.js
 package com.bsth;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.security.SecurityMetadataSourceService;
 import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
 import com.bsth.service.realcontrol.buffer.SchedulePersistenceThread;
 import com.bsth.util.DateUtils;
 import com.bsth.vehicle.common.CommonRefreshThread;
+import com.bsth.vehicle.directive.service.DirectiveService;
 import com.bsth.vehicle.directive.thread.DirectivePersistenceThread;
 import com.bsth.vehicle.directive.thread.FirstScheduleIssuedThread;
 import com.bsth.vehicle.gpsdata.GpsArrivalStationThread;
@@ -16,6 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -50,6 +58,11 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	FirstScheduleIssuedThread firstScheduleIssuedThread;
+	@Autowired
+	DirectiveService directiveService;
+	@Autowired
+	CarConfigInfoRepository carConfigInfoRepository;
+	
 	static Long hourTime = 1000 * 60 * 60L;
 	@Override
@@ -104,6 +117,30 @@ public class StartCommand implements CommandLineRunner{
 			 */
 			scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
+			
+/*			//延迟一会
+			new Timer().schedule(new TimerTask() {
+				
+				@Override
+				public void run() {
+					//临时全量刷车辆线路
+					List<CarConfigInfo> ccis = carConfigInfoRepository.findAll();
+					Cars car;
+					Line line;
+					String lineCode;
+					int code;
+					for(CarConfigInfo cci : ccis){
+						car = cci.getCl();
+						line = cci.getXl();
+						lineCode = line.getLineCode();
+						System.out.println("车辆：" + car.getInsideCode() + "切换线路：" + line.getLineCode());
+						code = directiveService.lineChange(car.getInsideCode(), Integer.parseInt(lineCode));
+						//directiveService.send60Phrase(car.getInsideCode(), "");
+						System.out.println("返回值：" + code);
+					}
+				}
+			}, 1000 * 10);*/
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -4,6 +4,8 @@ import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -153,11 +155,15 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
 	public void addRemarks(String remark){
-		String newRem = this.getRemarks();
-		if(null == newRem || newRem.trim() == "")
+		if(StringUtils.isBlank(remark))
 			return;
-		newRem += remark + ";";
-		this.setRemarks(newRem);
+		String old = this.getRemarks();
+		if(StringUtils.isBlank(old))
+			old = "";
+		
+		old += remark + ";";
+		this.setRemarks(old);
+		
 	}
 	public Long getId() {
@@ -661,4 +667,27 @@ public class ScheduleRealInfo {
 	public void setRealExecDate(String realExecDate) {
 		this.realExecDate = realExecDate;
 	}
+
+	public void calcStatus() {
+		if(this.status == -1)
+			return;
+		
+		this.status = 0;
+		if(StringUtils.isNotBlank(this.fcsjActual))
+			this.status = 1;
+		if(StringUtils.isNotBlank(this.zdsjActual))
+			this.status = 2;
+	}
+	
+	public void destroy(){
+		this.status = -1;
+	}
+	
+	public boolean isDestroy(){
+		return this.status == -1;
+	}
+	
+	public boolean isNotDestroy(){
+		return this.status != -1;
+	}
 }
@@ -46,6 +46,7 @@ public class GetSchedulePlanThread  extends Thread{
 	@Override
 	public void run() {
 		try{
+			logger.info("从计划调度抓取排班数据...");
 			//清除缓存
 			ScheduleBuffer.clear();
 			//所有指令入库
@@ -204,9 +204,9 @@ public class ScheduleBuffer {
 		//重新排序
 		Collections.sort(schedulListMap.get(sch.getXlBm()), scheduleComparator);
+		//Collections.sort(vehSchListMap.get(zbh), scheduleComparator);
 		//重新计算应到时间
-		//calcArrDateQd(vehLinkedMap.get(zbh));
 		calcArrDateQd(vehSchListMap.get(zbh));
 		return 0;
 	}
 package com.bsth.service.realcontrol.impl;
-import java.io.File;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -101,7 +100,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
 			schedule.setDfsjT(sdfMinute.parse(schedule.getRealExecDate() + " " + dfsj).getTime());
 			schedule.setDfsj(dfsj);
-			schedule.addRemarks(remarks + ";");
+			schedule.addRemarks(remarks);
 			schedule.setClZbh(nbbm);
 			if(jsy != null && jsy.indexOf("/") != -1){
 				String[] jsyArray = jsy.split("/");
@@ -139,16 +138,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			ScheduleRealInfo schedule = null;
 			for (String id : idList) {
 				schedule = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(id));
-				/*if(schedule.getStatus() == -1){
+				if(schedule.isDestroy()){
 					map.put("status", ResponseCode.ERROR);
-					map.put("msg", value)
-				}*/
-				if (null != schedule) {
-					schedule.setStatus(-1);
-					schedule.addRemarks(remarks);
-
-					rsList.add(schedule);
+					map.put("msg", "不必要的重复烂班！");
+					return map;
 				}
+				
+				schedule.destroy();
+				schedule.addRemarks(remarks);
+				rsList.add(schedule);
 			}
 			// 调整间隔
@@ -276,8 +274,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> save(ScheduleRealInfo t) {
 		SysUser user = SecurityUtils.getCurrentUser();
-
-		t.setScheduleDate(new Date());
+		Date d = new Date();
+		
+		t.setScheduleDate(d);
+		t.setRealExecDate(sdfMonth.format(d));
 		t.setCreateBy(user);
 		t.syncTime();
 		t.setSflj(true);
@@ -465,9 +465,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Map<String, Object> rs = new HashMap<>();
 		try {
 			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
-			String rq = sdfMonth.format(sch.getRealExecDate());
-			sch.setFcsjActualTime(sdfMinute.parse(rq + " " + fcsjActual).getTime());
+			sch.setFcsjActualTime(sdfMinute.parse(sch.getRealExecDate() + " " + fcsjActual).getTime());
 			sch.setFcsjActual(fcsjActual);
 			sch.addRemarks(remarks);
 			//改变状态
@@ -614,33 +613,43 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				sch.setBcType(bcType);
 				sch.setClZbh(clZbh);
 				sch.setFcsjAll(fcsj);
+				
 				if(StringUtils.isNotBlank(fcsjActual)){
 					//调整实发
-					sch.setFcsjActualAll(fcsjActual);
-					sch.setStatus(1);
+					if(!fcsjActual.equals(sch.getFcsjActual()))
+						sch.setFcsjActualAll(fcsjActual);
 				}
 				else{
 					sch.setFcsjActual(null);
 					sch.setFcsjActualTime(null);
 				}
+				//实达时间
 				if(StringUtils.isNotBlank(zdsjActual)){
-					//调整实达
-					sch.setZdsjActualAll(zdsjActual);
-					sch.setStatus(2);
-					//下一班次起点到达
-					ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
-					next.setQdzArrDateSJ(zdsjActual);
-					rs.put("nextSch", next);
+					if(!zdsjActual.equals(sch.getZdsjActual())){
+						//调整实达
+						sch.setZdsjActualAll(zdsjActual);
+						//下一班次起点到达时间
+						ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
+						next.setQdzArrDateSJ(zdsjActual);
+						rs.put("nextSch", next);
+					}
 				}
-				else{
+				else /*if(StringUtils.isNotBlank(sch.getZdsjActual()))*/{
+					//清除实达时间
 					sch.setZdsjActual(null);
 					sch.setZdsjActualTime(null);
+					//清除下一班次起点到达时间
+					ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
+					next.setQdzArrDateSJ(null);
+					rs.put("nextSch", next);
 				}
 				sch.setRemarks(remarks);
 			}
+			//班次状态
+			sch.calcStatus();
 			ScheduleBuffer.persistentList.add(sch);
 			rs.put("status", ResponseCode.SUCCESS);
@@ -85,7 +85,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		try {
 			//如果发车时间距当前时间较远，则不发送
 			if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
-				return 0;
+				return -2;
 			}
 			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getFcsjT()))
@@ -253,7 +253,7 @@
 			syncSubmit(idArray, params ,function(){
 					layer.closeAll();
 					layer.msg('操作完成！');
-					//刷新表格
+					//刷新弹出层表格
 					refreshMainList();
 			});
 		}); 
@@ -274,7 +274,7 @@
 			$.post('/realSchedule/adjust', data, function(rs){
 				//更新前端缓存
 				if(rs.status == 200){
-					_data.updateSchedule(rs.t);
+					_alone.refreshSchedule(rs.t);
 				}
 				i ++;
@@ -136,14 +136,15 @@
     <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-multi=1 data-method="spaceAdjust">
-            <span class="menu-text">间隔调整</span>
+            <span class="menu-text">待发间隔调整</span>
         </button>
     </li>
-    <li class="menu-item disabled" >
+    <!-- <li class="menu-item disabled" >
         <button type="button" class="menu-btn">
             <span class="menu-text">误点调整</span>
         </button>
-    </li>
+    </li> -->
+    <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-method="schInfoFineTune">
             <span class="menu-text">发车信息微调</span>
@@ -156,13 +157,12 @@
             <span class="menu-text">临加/子任务</span>
         </button>
     </li>
-    <li class="menu-separator"></li>
-    <li class="menu-item disabled" >
+<!--     <li class="menu-item disabled" >
         <button type="button" class="menu-btn">
         	<i class="fa fa-reply-all"></i>
             <span class="menu-text">撤销执行</span>
         </button>
-    </li>
+    </li> -->
     <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-method="vehicAndPerAdjust">
@@ -49,7 +49,7 @@ var _alone = (function(){
 			});
 		},
 		//刷新单个班次
-		refreshSchedule: function(schedule){
+		refreshSchedule: function(schedule, isBatch){
 			//更新 _data
 			_data.updateSchedule(schedule);
 			var tab = '#tab_line_' + schedule.xlBm;
@@ -62,16 +62,20 @@ var _alone = (function(){
 			var type = schedule.xlDir==0?'up':'down';
 			calculateLineNo($('.pb-table[data-type='+type+']', tab)[0]);
+			
+			if(!isBatch)
+				goToSch(schedule);
 		},
 		//刷新多个班次，刷新完数据再统一计算行号
 		refreshScheduleArray: function(array){
 			if(!array || array.length == 0)
 				return;
 			$.each(array, function(){
-				aloneObject.refreshSchedule(this);
+				aloneObject.refreshSchedule(this, 1);
 			});
 			var table = $('tr[data-id='+array[0].id+']').parents('table')[0];
 			calculateLineNo(table);
+			initRemarksPop();
 		},
 		//将班次所在的表格做全量更新
 		updateTableBySch: function(schedule){
@@ -83,24 +87,24 @@ var _alone = (function(){
 						_data.pushSchedule(this);
 					});
-					var upDown = xlDir==0?'up':'down';
+					/*var upDown = xlDir==0?'up':'down';
 					var tab = $('#tab_line_' + xlBm);
 					//重新渲染表格
-					var table = tab.find('.pb-table[data-type='+upDown+']');
+					var table = tab.find('.pb-table[data-type='+upDown+']');*/
+					var table = getTableBySch(sch);
 					var schArray = _data.findSchByLine(xlBm, xlDir);
 					calculateLineNo(
 							table.find('tbody').html(template('alone_plan_table_temp', {list: schArray}))[0]
 					);
-					var half = tab.find('._body').height() / 2;
-					
 					//定位到新添加的班次
-					var currTr = table.find('tr[data-id='+schedule.id+']')
+					goToSch(schedule);
+					/*var currTr = table.find('tr[data-id='+schedule.id+']')
 						,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37 - half;
 					top = top>0?top:0;
 					currTr.addClass('anim-delay animated flash');
-					currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+					currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });*/
 			});
 		},
 		update2Table: function(xlBm, schedule){
@@ -113,7 +117,7 @@ var _alone = (function(){
 				var rs = splitDir(array)
 					,tab = $('#tab_line_' + xlBm)
-					,half = tab.find('._body').height() / 2;
+					/*,half = tab.find('._body').height() / 2*/;
 				//填充表格数据
 				calculateLineNo(
 						//上行
@@ -123,19 +127,40 @@ var _alone = (function(){
 						//下行
 						tab.find('table[data-type=down] tbody').html(template('alone_plan_table_temp', {list: rs.down}))[0]
 				);
+				
 				//定位到指定的班次
-				var currTr = tab.find('tr[data-id='+schedule.id+']')
+				goToSch(schedule);
+				/*var currTr = tab.find('tr[data-id='+schedule.id+']')
 					,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37 - half;
 				top = top>0?top:0;
 				currTr.addClass('anim-delay animated flash');
-				currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+				currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });*/
 			});
 		},
 		//重新计算行号
 		calculateLineNo: calculateLineNo
 	}
+	//获取班次所在table
+	function getTableBySch(sch){
+		var upDown = sch.xlDir==0?'up':'down';
+		var tab = $('#tab_line_' + sch.xlBm);
+		return tab.find('.pb-table[data-type='+upDown+']');
+	}
+	
+	//定位到班次所在的行
+	function goToSch(sch){
+		var table = getTableBySch(sch)
+			,half = table.parents('._body').height() / 2
+			,currTr = table.find('tr[data-id='+sch.id+']')
+			,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37 - half;
+	
+		top = top>0?top:0;
+		currTr.addClass('anim-delay animated flash');
+		currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
+	} 
+	
 	//计算行号
 	function calculateLineNo(table){
 		var rows = table.rows;
@@ -83,12 +83,9 @@
 		 	setTimeout(function(){
 		 		//打开GPS定时刷新
 		 		_data.startRefreshGpsTimer();
-		 		
-		 		setTimeout(function(){
-		 			//去掉loading
-			 		$('.load-anim').fadeOut();
-			 		$('menu.menu').show();
-		 		}, 100);
+		 		//去掉loading
+		 		$('.load-anim').fadeOut();
+		 		$('menu.menu').show();
 		 	}, 400);
 		}
@@ -83,11 +83,15 @@ var _menu = (function() {
 	});
+	function msg_ct(t){
+		layer.msg(t,{offset: 'ct', shift : 5});
+	}
+	
 	//点击路牌
 	var lps = '.pb-table.data tr td[data-name=lpName]';
 	$('.portlet-fullscreen').on('click', lps, function(e){
 		var lp = $(this).text();
-		layer.msg('高亮路牌：' + lp + '',{offset: 'ct', shift : 5});
+		msg_ct('高亮路牌：' + lp);
 		var lineCode = $(this).parents('.tab-pane').data('id');
 		var schArray = _data.getLineLpMap()[lineCode][lp];
@@ -124,7 +128,7 @@ var _menu = (function() {
 			,sch = _data.getSchedulById(schId);
 		var scroll = false;
-		console.log(_data.findByCl(clnbbm));
+		
 		$.each(_data.findByCl(clnbbm), function(){
 			if(scroll){
 				var nextTr = $('tr[data-id='+this.id+']');
@@ -235,7 +239,7 @@ var _menu = (function() {
 					  $post('/realSchedule/outgoAdjust', params, function(rs){
 						  layer.close(index);
 						  if(rs.t){
-							  layer.msg('调整成功！'); 
+							  msg_ct('调整成功！'); 
 							  _alone.refreshSchedule(rs.t);
 						  }
 					  });
@@ -245,10 +249,10 @@ var _menu = (function() {
 		},
 		//计划烂班
 		planDestroy: function(schedul){
-			/*if(schedul.status == -1){
-				layer.alert('不能重复烂班！', {icon: 2, title: '提示', shift: 5}); 
+			if(schedul.status == -1){
+				layer.alert('没必要做重复烂班！', {icon: 2, title: '提示', shift: 5}); 
 				return;
-			}*/
+			}
 			var array = [];
 			//获取未烂班的班次
 			$.each(_data.getSchedulByVeh(schedul.clZbh),function(){
@@ -325,7 +329,7 @@ var _menu = (function() {
 						  			layer.close(index);
 						  			//刷新数据
 						  			_alone.refreshScheduleArray(rs.list);
-						  			layer.msg('计划烂班成功！');
+						  			msg_ct('计划烂班成功！');
 						  		});
 						  });
 						  return false;
@@ -354,7 +358,7 @@ var _menu = (function() {
 					  $post('/realSchedule/realOutAdjust', params
 							  ,function(rs){
 						  	if(rs.t){
-							  layer.msg('实发调整成功！');
+						  		msg_ct('实发调整成功！');
 								//更新前端数据
 								_alone.refreshSchedule(rs.t);
 							}
@@ -372,7 +376,7 @@ var _menu = (function() {
 			}, function(){
 				$post('/realSchedule/revokeRealOutgo', {id: schedul.id}, function(rs){
 					if(rs.t){
-						layer.msg('撤销实发成功！');
+						msg_ct('撤销实发成功！');
 						//更新前端数据
 						_alone.refreshSchedule(rs.t);
 					}
@@ -388,7 +392,7 @@ var _menu = (function() {
 			}, function(){
 				$post('/realSchedule/revokeDestroy', {id: schedul.id}, function(rs){
 					if(rs.t){
-						layer.msg('撤销烂班成功！');
+						msg_ct('撤销烂班成功！');
 						//更新前端数据
 						_alone.refreshSchedule(rs.t);
 					}
@@ -415,7 +419,7 @@ var _menu = (function() {
 								|| rs.status == 200){
 					  			//刷新数据
 					  			_alone.refreshScheduleArray(rs.list);
-					  			layer.msg('调整间隔成功！');
+					  			msg_ct('调整间隔成功！');
 							}
 						},
 						error: errorHandle
@@ -451,7 +455,7 @@ var _menu = (function() {
 		},
 		//调整人车
 		vehicAndPerAdjust: function(schedul){
-			$.get('/pages/control/line/child_pages/vehicAndper_adjust.html', function(content){
+			$.get('/pages/control/line/child_pages/car_and_persion.html', function(content){
 				layer.open({
 				  type: 1,
 				  area: '730px',
@@ -483,7 +487,10 @@ var _menu = (function() {
 			  		$.post('/directive/dispatch', {id: schedul.id},
 			  				function(code){
 			  			if(code == 0){
-			  				layer.msg('发送成功');
+			  				msg_ct('发送成功');
+			  			}
+			  			else if(code == -2){
+			  				layer.alert('该班次发车时间距离当前时间较远，系统阻止了该调度指令的下发。', {icon: 2, title: '被拦截的指令'});
 			  			}
 			  			else
 			  				layer.alert('发送调度指令失败', {icon: 2, title: '操作失败'});
@@ -494,7 +501,7 @@ var _menu = (function() {
 		schInfoFineTune: function(schedul){
 			var index = layer.open({
 			  type: 1,
-			  area: '630px',
+			  area: '680px',
 			  maxmin: true,
 			  content: template('schinfo_fine_tune_temp', schedul),
 			  shift: 5,
@@ -550,7 +557,7 @@ var _menu = (function() {
 		},
 		//基于车辆的待发调整
 		outgoAdjustAll: function(schedul){
-			$.get('/pages/control/line/child_pages/outgo_adjust_all.html', function(content){
+			$.get('/pages/control/line/child_pages/dfsj_batch.html', function(content){
 				layer.open({
 				  type: 1,
 				  area: '830px',
@@ -136,7 +136,7 @@
 	<td data-name="dfsj"  data-time="{{item.zdsjT}}">{{item.dfsj}}</td>
 {{if item.status == -1}}
-	<td class="tl-qrlb sfsj-item">烂班</td>	
+	<td class="tl-qrlb sfsj-item" >烂班</td>	
 {{else if item.status == 2}}
 	<td data-name="sjfcsj" class="tl-yzx sfsj-item">{{item.fcsjActual == null?"?":item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
@@ -149,8 +149,8 @@
 {{/if}}
 	<td class="hide-lt-1080" data-name="remarks">
-	{{if item.remarks != null && item.length > 0}}
-		<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注...</a>
+	{{if item.remarks != null && item.remarks.length > 0}}
+		<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >查看...</a>
 	{{/if}}
 	</td>
 	<!--<td><a href="javascript:;">主</a></td>-->
@@ -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');
@@ -4,6 +4,10 @@
 var vehiclePanel = (function() {
+	//设备号和marker映射
+	var gpsMarker = {}
+		,cLineCode;// 当前线路编码
+	
 	function getCurrMap(){
 		return realMap[realMap.getMap().fName];
 	}
@@ -16,6 +20,7 @@ var vehiclePanel = (function() {
 	// 手风琴收拢
 	$('.mapRightWrap').on('hide.bs.collapse', '.panel-collapse', function() {
 		$(this).prev().find('span.icon').addClass('rotate');
+		cLineCode = null;
 	});
 	// 手风琴展开
@@ -24,16 +29,19 @@ var vehiclePanel = (function() {
 		var lineCode = $(this).data('line');
 		//收拢其他
 		closeAll();
+		cLineCode = lineCode;
 		drawLineAndGps(lineCode);
 	});
 	//绘制线路和GPS
 	function drawLineAndGps(lineCode){
 		//过滤出该线路的GPS点
-		var showList = [];
+		var showList = [], gps;
 		if(lineGps[lineCode]){
 			$.each(lineGps[lineCode], function(){
-				showList.push(allGps[this]);
+				gps = allGps[this];
+				showList.push(gps);
+				gpsMarker[gps.deviceId] = gps;
 			});
 		}
 		//显示车辆列表
@@ -76,6 +84,7 @@ var vehiclePanel = (function() {
 		if(up)
 			temp = temp.concat(up);
+		var gps;
 		if(!$(this).is(":hidden")){
 			$.each(temp, function(){
 				allGps[this.deviceId] = this;
@@ -88,6 +97,17 @@ var vehiclePanel = (function() {
 				lineGps[this.lineId].push(this.deviceId);
 			})
 		}
+		
+		//先暂时重绘，后面再优化
+		if(cLineCode){
+			var showList = [];
+			if(lineGps[cLineCode]){
+				$.each(lineGps[cLineCode], function(){
+					showList.push(allGps[this]);
+				});
+			}
+			mapObj.drawGpsMarker(showList);
+		}
 	});
 	var exports = {