update

潘钊
1 parent a388c8b5
Showing 31 changed files with 2565 additions and 390 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/directive/buffer/DirectiveBuffer.java
src/main/java/com/bsth/vehicle/directive/controller/DirectiveController.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsRealDataBuffer.java
src/main/java/com/bsth/vehicle/gpsdata/entity/GpsRealData.java
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/alone.js
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/drawSvg.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/js/tooltip.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -38,4 +38,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,@RequestParam String dfsj){
 		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj);
 	}
+	
+	/**
+	 * 
+	 * @Title: destroy 
+	 * @Description: TODO(销毁，烂班) 
+	 * @param @param idsStr  要烂掉的班次ID ,分隔
+	 * @param @param spaceAdjust 自动调整后续间隔（1 是 -1 否）
+	 * @param @param remarks 备注
+	 * @param @param reason 理由
+	 * @param @param spaceNum 间隔（分钟）
+	 * @throws
+	 */
+	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
+	public Map<String, Object> destroy(@RequestParam String idsStr,@RequestParam int spaceAdjust,@RequestParam String  remarks,@RequestParam String reason,@RequestParam  int spaceNum){
+		return scheduleRealInfoService.destroy(idsStr, spaceAdjust, remarks, reason, spaceNum);
+	}
 }
@@ -92,47 +92,42 @@ public class ScheduleRealInfo {
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
-	/**
-	 * 实际发车时间
-	 */
+	/** 实际发车时间*/
 	private String fcsjActual;
-	/**
-	 * 实际终点时间
-	 */
+	/**实际终点时间 */
 	private String zdsjActual;
-	/**
-	 * 班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班
-	 * 
-	 */
+	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
 	private int status;
-	/**
-	 * 是否误点
-	 */
+	/** 是否误点*/
 	private boolean isLate;
-	/**
-	 * 实际里程
-	 */
+	/**实际里程*/
 	private Float realMileage;
-	/**
-	 * 备注
-	 */
+	/** 备注*/
 	private String remarks;
-	/**
-	 * 待发时间（格式 HH:mm）
-	 */
+	/**待发时间（格式 HH:mm） */
 	private String dfsj;
-	/**
-	 * 发车时间戳
-	 */
+	/**待发时间戳 */
+	@Transient
+	private Long dfsjT;
+	
+	/** 发车时间戳*/
 	@Transient
 	private Long fcsjT;
-
+	
+	public void addRemarks(String remark){
+		String newRem = this.getRemarks();
+		if(null == newRem)
+			newRem = "";
+		newRem += remark;
+		this.setRemarks(newRem);
+	}
+	
 	public Long getId() {
 		return id;
 	}
@@ -444,4 +439,12 @@ public class ScheduleRealInfo {
 	public void setFcsjT(Long fcsjT) {
 		this.fcsjT = fcsjT;
 	}
+
+	public Long getDfsjT() {
+		return dfsjT;
+	}
+
+	public void setDfsjT(Long dfsjT) {
+		this.dfsjT = dfsjT;
+	}
 }
@@ -56,6 +56,7 @@ public class GetSchedulePlanThread  extends Thread{
 				item.setDfsj(item.getFcsj());
 				//发车时间戳
 				item.setFcsjT(sdf2.parse(dateStr + " " + item.getFcsj()).getTime());
+				item.setDfsjT(item.getFcsjT());
 			}
 			//new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
@@ -32,6 +32,11 @@ public class ScheduleBuffer {
 	public static ArrayListMultimap<String, ScheduleRealInfo> schedulListMap;
 	/**
+	 * K: 车辆自编号  V: 班次链表
+	 */
+	public static Map<String, LinkedList<ScheduleRealInfo>> vehLinkedMap;
+	
+	/**
 	 * 主键 和 排班映射
 	 */
 	public static Map<Long, ScheduleRealInfo> pkSchedulMap;
@@ -45,6 +50,7 @@ public class ScheduleBuffer {
 		schedulListMap = ArrayListMultimap.create();
 		pkSchedulMap = new HashMap<>();
 		persistentList = new LinkedList<>();
+		vehLinkedMap = new HashMap<>();
 	}
 	public static int init(List<ScheduleRealInfo> list){
@@ -59,9 +65,17 @@ public class ScheduleBuffer {
 				}
 			});
+			String zbh;
 			for(ScheduleRealInfo schedul : list){
 				schedulListMap.put(schedul.getXlBm(), schedul);
 				pkSchedulMap.put(schedul.getId(), schedul);
+				
+				//初始化车辆和班次列表对照
+				zbh = schedul.getClZbh();
+				if(!vehLinkedMap.containsKey(zbh))
+					vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
+				
+				vehLinkedMap.get(zbh).add(schedul);
 			}
 		}catch(Exception e){
 			logger.error("缓存排班数据失败...", e);
@@ -15,4 +15,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj);
+	Map<String, Object> destroy(String idsStr, int spaceAdjust, String  remarks, String reason, int spaceNum);
+
 }
 package com.bsth.service.realcontrol.impl;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,18 +32,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd")
+			, sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm")
+			, sdfShort = new SimpleDateFormat("HH:mm");
+	
 	@Override
 	public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
 		List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByLines(lineList);
-		//按线路编码分组
 		Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
-		for(ScheduleRealInfo item : list){
-			mMap.put(item.getXlBm(), item);
+		for(String lineCode : lineList){
+			mMap.putAll(lineCode, ScheduleBuffer.schedulListMap.get(lineCode));
 		}
-		
 		return mMap.asMap();
 	}
@@ -50,18 +54,85 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		try{
 			ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
+			schedule.setDfsjT(sdfMinute.parse(sdfMonth.format(new Date()) + " " + dfsj).getTime());
 			schedule.setDfsj(dfsj);
-			String newRem = schedule.getRemarks();
-			if(null == newRem)
-				newRem = "";
-			newRem += "[待发调整] " + remarks +";";
-			schedule.setRemarks(newRem);
+			schedule.addRemarks("[待发调整] " + remarks +";");
 			//持久化到数据库
 			ScheduleBuffer.persistentList.add(schedule);
 			map.put("status", ResponseCode.SUCCESS);
 			map.put("dfsj", dfsj);
-			map.put("remarks", newRem);
+			map.put("remarks", schedule.getRemarks());
+		}catch(Exception e){
+			logger.error("", e);
+			map.put("status", ResponseCode.ERROR);
+		}
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> destroy(String idsStr, int spaceAdjust, String  remarks, String reason, int spaceNum) {
+		
+		Map<String, Object> map = new HashMap<>();
+		List<ScheduleRealInfo> rsList = new ArrayList<>();
+		map.put("list", rsList);
+		try{
+			List<String> idList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(idsStr));
+			
+			ScheduleRealInfo schedule = null;
+			for(String id : idList){
+				schedule = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(id));
+				if(null != schedule){
+					schedule.setStatus(-1);
+					schedule.setRemarks("计划烂班["+reason+"] " + remarks);
+					
+					rsList.add(schedule);
+				}
+			}
+			
+			//调整间隔
+			if(spaceAdjust == 1){
+				
+				ScheduleRealInfo first = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(idList.get(0)));
+				String lineCode = first.getXlBm();
+				String upDown = first.getXlDir();
+				
+				List<ScheduleRealInfo> schList = ScheduleBuffer.schedulListMap.get(lineCode)
+							,dirList = new ArrayList<>();
+				//筛选走向
+				for(ScheduleRealInfo s : schList){
+					if(s.getXlDir().equals(upDown)){
+						dirList.add(s);
+					}
+				}
+				
+				int size = dirList.size();
+				Long st = null;
+				int diff = spaceNum * 60 * 1000;
+				for(int i = 0; i < size; i ++){
+					schedule = dirList.get(i);
+					
+					if(schedule.getId() == first.getId()){
+						if(i == 0)
+							st = schedule.getDfsjT() - diff;
+						else
+							st = dirList.get(i - 1).getDfsjT();
+						continue;
+					}
+					if(null == st || schedule.getStatus() == -1)
+						continue;
+					
+					st = st + diff;
+					schedule.setDfsjT(st);
+					schedule.setDfsj(sdfShort.format(new Date(st)));
+					
+					ScheduleBuffer.persistentList.add(schedule);
+					//将调整的班次返回给页面
+					rsList.add(schedule);
+				}
+			}
+			
+			map.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			logger.error("", e);
 			map.put("status", ResponseCode.ERROR);
@@ -67,7 +67,6 @@ public class DirectiveBuffer {
 	}
 	public static void put(Directive directive){
-		transientList.add(directive);
 		directiveMap.put(directive.getMsgId(), directive);
 	}
@@ -29,7 +29,7 @@ public class DirectiveController {
 	 * @Description: TODO(60协议短语下发) 
 	 * @throws
 	 */
-	@RequestMapping(value = "/phrase", method = RequestMethod.GET)
+	@RequestMapping(value = "/phrase", method = RequestMethod.POST)
 	public int send60Phrase(@RequestParam String nbbm, @RequestParam String text){
 		return directiveService.send60Phrase(nbbm, text);
 	}
@@ -42,7 +42,7 @@ public class DirectiveController {
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	@RequestMapping(value = "/lineChnage", method = RequestMethod.GET)
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
 	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
 		return directiveService.lineChange(nbbm, lineId);
 	}
@@ -46,7 +46,16 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	@Override
 	public int send60Phrase(String nbbm, String text) {
-		Directive directive = create60Data(nbbm, text, DispatchInstruct.PHRASE);
+		Directive directive = null;
+		try {
+			directive = create60Data(nbbm, text, DispatchInstruct.PHRASE);
+		} catch (Exception e) {
+			logger.error("生成调度指令时出现异常", e);
+			return -1;
+		}
+		
+		if(null == directive)
+			return -1;
 		//发送指令
 		int code = postJson(JSON.toJSONString(directive));
@@ -90,14 +99,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		change.setTimestamp(t);
 		change.setData(data);
-		int code = 0;//postJson(JSON.toJSONString(change));
-		//if(code == 0){
+		int code = postJson(JSON.toJSONString(change));
+		if(code == 0){
 			//入库
 			lineChangeRepository.save(change);
 			DirectiveBuffer.changeMap.put(deviceId + '_'  + t , change);
-		//}else{
-		//	logger.error("send60Phrase error, code: " + code);
-		//}
+		}else{
+			logger.error("send60Phrase error, code: " + code);
+		}
 		return code;
 	}
@@ -105,13 +114,16 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	public Directive create60Data(String nbbm, String text, DispatchInstruct dispatchInstruct){
 		Long timestamp = System.currentTimeMillis();
-		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
+		//向测试设备发送
+		String deviceId = "229L4041";
+		Short company = 5;
+		
+		/*String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
 		Short company = Short.parseShort(CommonMapped.vehicCompanyMap.get(nbbm));
 		if(null == deviceId){
 			logger.error("没有设备号对照的车辆：" + nbbm);
 			return null;
-		}
-		
+		}*/
 		GpsRealData gpsData = gpsRealDataBuffer.findOneByDeviceId(deviceId);
 		if(null == gpsData){
 			logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
@@ -154,6 +166,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		int code = -1;
 		try{
 			httpClient = HttpClients.createDefault();
+			
 			HttpPost post = new HttpPost(Consts.SEND_DIRECTIVE_URL);
 			post.setEntity(new StringEntity(jsonStr, "utf-8"));
@@ -3,6 +3,7 @@ package com.bsth.vehicle.gpsdata.buffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -11,6 +12,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.gpsdata.entity.GpsRealData;
 import com.google.common.collect.ArrayListMultimap;
@@ -129,11 +132,24 @@ public class GpsRealDataBuffer {
 		//写入车辆自编号
 		String nbbm;
+		LinkedList<ScheduleRealInfo> linkedList;
+		int size;
 		for(GpsRealData gpsData : list){
 			nbbm = CommonMapped.vehicDeviceBiMap.get(gpsData.getDeviceId());
 			if(null != nbbm){
 				gpsData.setNbbm(nbbm);
 				gpsData.setStationName(CommonMapped.stationCodeMap.get(gpsData.getStopNo()));
+				
+				
+				linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
+				if(null != linkedList){
+					//为GPS点附加班次信息
+					size = linkedList.size();
+					if(size > 0)
+						gpsData.setCurrSchId(linkedList.peekFirst().getId());
+					if(size > 1)
+						gpsData.setNextSchId(linkedList.get(1).getId());
+				}
 				resList.add(gpsData);
 			}
 		}
@@ -51,6 +51,12 @@ public class GpsRealData {
 	//站点名称
 	private String stationName;
+	
+	//当前班次ID
+	private Long currSchId;
+	
+	//下一个班次ID
+	private Long nextSchId;
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -147,6 +153,22 @@ public class GpsRealData {
 	public void setUpDown(Integer upDown) {
 		this.upDown = upDown;
 	}
+	
+	public Long getCurrSchId() {
+		return currSchId;
+	}
+
+	public void setCurrSchId(Long currSchId) {
+		this.currSchId = currSchId;
+	}
+
+	public Long getNextSchId() {
+		return nextSchId;
+	}
+
+	public void setNextSchId(Long nextSchId) {
+		this.nextSchId = nextSchId;
+	}
 	public String getNbbm() {
 		return nbbm;
@@ -382,7 +382,7 @@ body{
 /* svg 样式 */
 .line_chart svg{
-    height: calc(100% - 40px);
+    height: 100% ;
     margin: 0;
     z-index: 1;
     position: absolute;
@@ -763,7 +763,7 @@ height: 400px;
 #top-tabs-wrap .tab-content{
     height: calc(100% - 42px);
     padding: 3px 1px;
-    overflow-y: auto;
+   /*  overflow-y: auto; */
 }
 #top-tabs-wrap .tab-content .tab-pane{
@@ -864,7 +864,7 @@ height: 400px;
 	width: 9%;
 }
 .pb-table tr td:nth-child(5){
-	/* width: 15%; */
+	width: 15%;
 }
 .pb-table tr td:nth-child(6){
 	width: 10%;
@@ -958,9 +958,9 @@ height: 400px;
 .pic-panel span.tl-zzzx:before{
 	content: "正在执行";
 }
-/* .pic-panel span.tl-sf-f:before{
+.pic-panel span.tl-sf-f:before{
 	content: "实发（放）";
-} */
+}
 .pic-panel span.tl-xxfc:before{
 	content: "消息发出";
 }
@@ -991,8 +991,10 @@ height: 400px;
 .tl-zzzx{
 	background: #96F396;
 }
-/* .tl-sf-f{
-} */
+.tl-sf-f{
+	background: gray;
+	color: white;
+}
 .tl-xxfc{
 	background: #AE9CCE;
     color: white;
@@ -1472,4 +1474,41 @@ height: 400px;
 .form-custom hr{
 	margin: 15px 0;
+}
+
+.layui-layer-cfm-delete .layui-layer-btn0{
+	background-color: #e73d4a;
+    border-color: #CE3643;
+}
+
+label.error{
+	display: none !important;
+}
+
+.item .form-control.error{
+	border: 1px solid red;
+}
+
+.up-number{
+	font-family: arial;
+    color: #5e96d2;
+    font-size: 18px;
+    font-weight: 700;
+}
+
+.down-number{
+    font-family: arial;
+    color: #e43a45;
+    font-size: 18px;
+    font-weight: 700;
+}
+
+.empty-table-td{
+	background-color: #fff !important;
+}
+
+.empty-table-td:BEFORE{
+    content: "暂无数据";
+    color: #6f6c6c;
+    font-size: 12px;
 }
 \ No newline at end of file
@@ -151,7 +151,7 @@
     </li>
     <li class="menu-separator"></li>
     <li class="menu-item" >
-        <button type="button" class="menu-btn">
+        <button type="button" class="menu-btn" data-method="directiveRepeat">
         	<i class="fa fa-bell-o"></i>
             <span class="menu-text">指令重发</span>
         </button>
@@ -171,9 +171,11 @@
 <script src="/pages/control/line/js/alone.js"></script>
 <script src="/pages/control/line/js/main.js"></script>
 <script>
-//初始化lineCodes
-var lineCodes = '';
+var lineCodes = '' //全部线路编码字符串，由data.js初始化
+	, lineMap = {} //编码和线路详细对照，由data.js初始化;
+
+moment.locale('zh-cn');
 $(function() {
  	//加载模板文件
  	getTemp('temps/home_tp.html');
@@ -8,25 +8,34 @@ var _alone = (function(){
 		,downCode = '下行';
 	var aloneObject = {
-		init: function(){
+		init: function(cb){
 			_data.queryRealSchedule(lineCodes, function(schList){
-				for(var lineCode in schList){
-					//按上下行拆分数据
-					var rs = splitDir(schList[lineCode])
-						,htmlStr = template('alone_main_temp', {up: rs.up, down: rs.down});
-					
-					$('#tab_line_' + lineCode).append(htmlStr).find('._body')
-					//滚动条	
-					.slimscroll({
-							height: 'calc(100% - 80px)',
-							alwaysVisible: true
-					});
+				
+				var schTempList;
+				for(var lineCode in lineMap){
+					schTempList = schList[lineCode];
+					tab = $('#tab_line_' + lineCode);
+					tab.append(template('alone_main_temp', lineMap[lineCode]));
-					//底部svg
-					_data.queryStationRoute(lineCode , 'lineSvg' + lineCode , drawSvg.init);
+					//有排班数据
+					if(schTempList){
+						var rs = splitDir(schTempList);
+						//填充表格数据
+						calculateLineNo(
+								tab.find('table[data-type=up] tbody').html(template('alone_plan_table_temp', {list: rs.up}))[0]
+						);
+						calculateLineNo(
+								tab.find('table[data-type=down] tbody').html(template('alone_plan_table_temp', {list: rs.down}))[0]
+						);
+						
+						//滚动条	
+						tab.find('._body').slimscroll({
+								height: 'calc(100% - 80px)',
+								alwaysVisible: true
+						});
+					}
+					_data.queryStationRoute(lineCode , 'lineSvg' + lineCode , drawSvg.initAloneSvg);
 				}
-				//绑定右键菜单事件
-				_menu.bindClickMenu();
 				$('.console-log .log-item-list').slimscroll({
 					height: '100%'
@@ -40,36 +49,31 @@ var _alone = (function(){
 					container: '.portlet-fullscreen'
 				});
-				//备注POPOVER
-				$('.remarks-popover').popover({trigger: 'hover',container: '.portlet-fullscreen',placement:'bottom'});
+				initRemarksPop();
+				
+				cb && cb();
 			});
-			
-			//$('.tab-pane.aloneline')
-			/*_data.queryStationRoute('10904' , 'lineSvg10904' , drawSvg.init);
-			*/
 		},
 		//刷新班次
 		refreshSchedule: function(schedule){
 			//xlBm
-			var tr = $('tr[data-id='+schedule.id+']', '#tab_line_' + schedule.xlBm)[0]
-				,cells = tr.cells, name;
+			var $tr = $('tr[data-id='+schedule.id+']', '#tab_line_' + schedule.xlBm)
+				,newTr = template('alone_plan_table_temp', {list: [schedule]});
-			$.each(cells, function(i, cell){
-				name = $(cell).data('name');
-				if(name == 'remarks'){
-					var link = $(cell).find('a');
-					if(link.length == 0){
-						$(cell).append('<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="'+schedule[name]+'" >备注</a>')
-					}
-					else{
-						link.attr('data-content', schedule[name]);
-					}
-				}
-				else{
-					$(cell).text(schedule[name]);
-				}
-			});
-		}
+			$tr.replaceWith(newTr);
+			initRemarksPop();
+		},
+		//重新计算行号
+		calculateLineNo: calculateLineNo
+	}
+	
+	//计算行号
+	function calculateLineNo(table){
+		var rows = table.rows;
+		$.each(rows,function(i, r){
+			var cells = r.cells;
+			$(cells[0]).text(i + 1);
+		});
 	}
 	function splitDir(list){
@@ -84,5 +88,9 @@ var _alone = (function(){
 		return rs;
 	}
+	function initRemarksPop(){
+		//备注POPOVER
+		$('.remarks-popover', '.pb-table').popover({trigger: 'hover',container: '.portlet-fullscreen',placement:'bottom'});
+	}
 	return aloneObject;
 })();
 \ No newline at end of file
@@ -24,41 +24,24 @@ var _data = (function(){
 		getLineIds: function(){
 			return JSON.parse(storage.getItem('lineIds'));
 		},
-		getRealVehic: function(lineArray, cb){
-			var tabList = [
-						   {nbbm: 'W9H108', endDistance: '13.14', endTime: '82', instructions: '', speed: '16', roadSigns: '另1'},
-						   {nbbm: 'W9H108', endDistance: '13.14', endTime: '82', instructions: '', speed: '16', roadSigns: '另1'},
-						   {nbbm: 'W9H108', endDistance: '13.14', endTime: '82', instructions: '', speed: '16', roadSigns: '另1'},
-						   {nbbm: 'W9H108', endDistance: '13.14', endTime: '82', instructions: '', speed: '16', roadSigns: '另1'},
-						   {nbbm: 'W9H108', endDistance: '13.14', endTime: '82', instructions: '', speed: '16', roadSigns: '另1'},
-						   {nbbm: 'W9H108', endDistance: '13.14', endTime: '82', instructions: '', speed: '16', roadSigns: '另1'}
-			];
-			var d = {
-					'10232_0': tabList,
-					'10232_1': tabList,
-					'10566_0': tabList,
-					'10566_1': tabList,
-					'10904_0': tabList,
-					'10904_1': tabList,
-					'10069_0': tabList,
-					'10069_1': tabList,
-					'10474_0': tabList,
-					'10474_1': tabList,
-					'10507_0': tabList,
-					'10507_1': tabList,
-					'10702_0': tabList,
-					'10702_1': tabList,
-					'10220_0': tabList,
-					'10220_1': tabList
-			};
-			cb && cb(d);
+		//为GPS点附加班次信息
+		attachSchedulInfo: function(gpsArray){
+			$.each(gpsArray, function(){
+				gps = this;
+				if(gps.currSchId)
+					gps.currSch = schedules[gps.currSchId];
+				if(gps.nextSchId)
+					gps.nextSch = schedules[gps.nextSchId];
+				
+			});
+			
+			return gpsArray;
 		}
 		//查询站点路由
-		,queryStationRoute : function(lineId,container,  cb){
+		,queryStationRoute : function(lineId,container, cb, width){
 			$get('/stationroute/all', {'line.lineCode_eq': lineId}, function(routes){
 				var svgData = analyData(routes);
-				
-				cb && cb(lineId, svgData, container);
+				cb && cb(lineId, svgData, container, width);
 			});
 		},
 		//实时GPS定时刷新
@@ -116,6 +99,7 @@ var _data = (function(){
 	//初始化lineCodes
 	$.each(dataObject.getLines(), function(i, obj){
 		lineCodes += (obj.lineCode + ',');
+		lineMap[obj.lineCode] = obj;
 	});
 	lineCodes = lineCodes.substr(0, lineCodes.length - 1);
@@ -130,11 +114,11 @@ var _data = (function(){
 		});
 	}
 	var upSort = function(a, b){
-		return a.outStationNmber - b.outStationNmber;
+		return a.stationRouteCode - b.stationRouteCode;
 	}
 	var downSort = function(a, b){
-		return b.outStationNmber - a.outStationNmber;
+		return b.stationRouteCode - a.stationRouteCode;
 	}
 	var station_indexof = function(array, station , start){
@@ -8,7 +8,8 @@ var drawSvg = (function(){
 		,p = 112//上下行之间的间隔  132
 		,x = d3.scale.linear()
 		,w
-		,lineSvgMapp = {}
+		,homeSvgMapp = {}
+		,aloneSvgMapp = {}
 		,lineStations = {}
 		,seGps = {} //起终点gps信号;
@@ -41,28 +42,39 @@ var drawSvg = (function(){
 	var cutNbbm = function(nbbm){
 		return nbbm.substr(nbbm.length - 3, nbbm.length);
 	}
-	
+
 	var drawSvgObject = {
-		init: function(lineId, data, container){
+		initHomeSvg: function(lineId, data, container){
+			var w = $('.line_chart:first').width(),
+				svg = drawSvgObject.init(lineId, data, container, w, 80);
+			//线路编码 和 首页SVG对照
+			homeSvgMapp[lineId] = svg;
+		},
+		initAloneSvg: function(lineId, data, container){
+			var w = $(document).width(),
+				svg = drawSvgObject.init(lineId, data, container,w , 44);
+			//线路编码 和 单线路SVG对照
+			aloneSvgMapp[lineId] = svg;
+		},
+		init: function(lineId, data, container, w, mtop){
 			if(!data || data.length == 0)
 				return;
+			mt = mtop;
 			//起终点站
 			$.each(data, function(){
 				if(this.stationMark == 'B' || this.stationMark == 'E' )
 					seGps[lineId + '_' + this.id[0]] = [];
 			});
-			//w = $('.line_chart:first').width();
-			w = $('#' + container).width();
 			var svg = d3.select('#' + container).append('svg')
 				.attr('width', w).attr('opacity', 0)
 				.attr('id', lineId);
-			lineSvgMapp[lineId] = svg;
+			
 			lineStations[lineId] = data.slice(0);
 			//抽站
-			cleanStation(data);
+			cleanStation(w, data);
 			var dLen = data.length;
 			x.range([ 60 , w - 15]).domain([ 0,  dLen]);
@@ -153,63 +165,15 @@ var drawSvg = (function(){
 				return $(this).attr('class')?null:this;
 			}).remove();
+			return svg;
 		},
 		//画出GPS点
 		drawVehicle: function(gpsArray){
 			for(var i = 0, gps; gps = gpsArray[i ++];){
-				var svg = lineSvgMapp[gps.lineId]
-					,stionId = gps.lineId + '_' + gps.stopNo
-					,station = $('#' + stionId)
-					,c = station.attr('class')||""
-					,start = c.indexOf('start') != -1
-					,end = c.indexOf('end') != -1;
-			
-				if(station.length == 0)
-					continue;
-				
-				//起终点站GPS信号
-				if(seGps[stionId]){
-					seGps[stionId].push(gps);
-					continue;
-				}
-				
-				var cx = parseInt(station.attr('cx'))
-					,cy = parseInt(station.attr('cy'))
-					,updown = station.attr('updown')
-					,gpsGWrap = svg.select('.gps-g-wrap')
-					,gpscont;
-				
-				if($('g[for='+stionId+']').length == 0){
-					gpscont = gpsGWrap.append('g')
-						.attr('class', 'station-gps-container')
-						.attr('updown', updown)
-						.attr('for', stionId);
-				}else{
-					gpscont = gpsGWrap.selectAll('g')
-							.select(function(){return $(this).attr('for') == stionId?this:null})
-							.classed({'multiple': true});
-				}
-				var vg = gpscont.selectAll('g[deviceId="'+gps.deviceId+'"]')
-					.data([gps]).enter().append('g')
-					.attr('deviceId', gps.deviceId)
-					.attr('class', 'vehci-g ' + (updown==0?'up':'down'))
-					.attr('station', gps.stopNo);
-				
-				//上下行异常
-				/*if(!start && !end && updown != gps.upDown){
-					vg.classed({'updown-error': true});
-				}*/
-				
-				vg.append('text')
-					.attr('x', cx + 4).attr('y', cy + 17)
-					.text(cutNbbm(gps.nbbm));
-				
-				var rect = vg.append('rect').attr('x', cx).attr('y', cy);
-				
-				//tooltip
-				_tooltip.initGpsTip(vg);
+				//drawGpsToSvg(gps, aloneSvgMapp[gps.lineId]);
+				drawGpsToSvg(gps, homeSvgMapp[gps.lineId]);
 			}
 			//画出起终点GPS信号
@@ -221,7 +185,7 @@ var drawSvg = (function(){
 					,x = parseInt(e.attr('cx'))
 					,y = parseInt(e.attr('cy'));
-					var svg = lineSvgMapp[seGps[eid][0].lineId];
+					var svg = homeSvgMapp[seGps[eid][0].lineId];
 					var gs = svg.append('g').classed({'start': e.attr('class').indexOf('start') != -1, 'park': true})
 						.selectAll('g').data(seGps[eid]).enter().append('g');
@@ -240,12 +204,14 @@ var drawSvg = (function(){
 							return y + i * 27 + 17;
 						})
 						.text(function(d){return cutNbbm(d.nbbm)});
+					
+					_tooltip.initStartAndEndGPS(gs);
 				}
 			}
 			/**
 			 * 堆叠多个GPS信号
-			
+			 */
 			$.each($('.station-gps-container'), function(i, multiGps){
 				var tArray = $(multiGps).find('g')
 					,updowm = $(multiGps).attr('updown')
@@ -268,7 +234,7 @@ var drawSvg = (function(){
 					$(tArray[1]).css('transform', 'translate(-15px, '+ translateY +'px)');
 				}
-			}); */
+			});
 /*			function drawNumber(multiGps, num, that, start, end){
 				var circle = $('#' + $(multiGps).attr('for'))
@@ -289,6 +255,59 @@ var drawSvg = (function(){
 		}
 	};
+	function drawGpsToSvg(gps, svg){
+		var stionId = gps.lineId + '_' + gps.stopNo
+		,station = $('#' + stionId)
+		,c = station.attr('class')||""
+		,start = c.indexOf('start') != -1
+		,end = c.indexOf('end') != -1;
+
+		if(station.length == 0)
+			return;
+		
+		//起终点站GPS信号
+		if(seGps[stionId]){
+			seGps[stionId].push(gps);
+			return;
+		}
+		
+		var cx = parseInt(station.attr('cx'))
+			,cy = parseInt(station.attr('cy'))
+			,updown = station.attr('updown')
+			,gpsGWrap = svg.select('.gps-g-wrap')
+			,gpscont;
+		
+		if($('g[for='+stionId+']').length == 0){
+			gpscont = gpsGWrap.append('g')
+				.attr('class', 'station-gps-container')
+				.attr('updown', updown)
+				.attr('for', stionId);
+		}else{
+			gpscont = gpsGWrap.selectAll('g')
+					.select(function(){return $(this).attr('for') == stionId?this:null})
+					.classed({'multiple': true});
+		}
+		var vg = gpscont.selectAll('g[deviceId="'+gps.deviceId+'"]')
+			.data([gps]).enter().append('g')
+			.attr('deviceId', gps.deviceId)
+			.attr('class', 'vehci-g ' + (updown==0?'up':'down'))
+			.attr('station', gps.stopNo);
+		
+		//上下行异常
+		/*if(!start && !end && updown != gps.upDown){
+			vg.classed({'updown-error': true});
+		}*/
+		
+		vg.append('text')
+			.attr('x', cx + 4).attr('y', cy + 17)
+			.text(cutNbbm(gps.nbbm));
+		
+		var rect = vg.append('rect').attr('x', cx).attr('y', cy);
+		
+		//tooltip
+		_tooltip.initGpsTip(vg);
+	}
+	
 	function drawPath(svg, data,updown, noclear){
 		svg.append('g').selectAll('path')
 			.data(data.slice(0, data.length - 1)).enter().append('path')
@@ -330,8 +349,8 @@ var drawSvg = (function(){
 			});
 	}
-	function cleanStation(data){
-		var ms = w / 52
+	function cleanStation(w,data){
+		var ms = w / 45
 		,dLen = data.length;
 		if(ms < dLen){
 			var end;
@@ -26,24 +26,16 @@
 			$('#tab_home').html(homeHtmlStr);
-			//车辆信息
-			_data.getRealVehic(lineArray, function(d){
-				for(var n in d){
-					var htmlStr = template('home_table_temp', {list: d[n]});
-					$('#tab_' + n).find('tbody').html(htmlStr);
-				}
-				
-				//滚动条
-				$('.card_wrap .table_wrap').slimscroll({
-					height: '187px',
-					alwaysVisible: true,
-					opacity: .8
-				});
+			//滚动条
+			$('.card_wrap .table_wrap').slimscroll({
+				height: '187px',
+				alwaysVisible: true,
+				opacity: .8
 			});
-			//svg线路图
+			//SVG线路图
 			$.each(lineArray, function(i, obj){
-				_data.queryStationRoute( obj.lineCode, 'line_chart_' + obj.lineCode , drawSvg.init);
+				_data.queryStationRoute( obj.lineCode, 'line_chart_' + obj.lineCode , drawSvg.initHomeSvg);
 			});
 		 	$('.line_chart .top .top-remark').slimscroll({
@@ -52,11 +44,24 @@
 		 	//模拟图GPS刷新事件
 		 	$('#tab_home').on('gps_refresh', function(e, add, up){
-		 		drawSvg.drawVehicle(add);
+		 		//附加班次信息
+		 		addList = _data.attachSchedulInfo(add);
+		 		drawSvg.drawVehicle(addList);
+		 		
+		 		//按线路分组
+		 		var listMap = groupByLine(addList);
+		 		for(var key in listMap){
+					var htmlStr = template('home_table_temp', {list: listMap[key]});
+					$('#tab_' + key).find('tbody').html(htmlStr);
+					//更新badge
+					$('#'+key+'_badge').text('( ' + listMap[key].length + ' )');
+				}
 		 	});
-		 	//定时刷新GPS
-		 	_data.startRefreshGpsTimer();
+		 	
+		 	setTimeout(function(){
+		 		_data.startRefreshGpsTimer();
+		 	}, 300);
 		 /*	setTimeout(function(){
 		 		homeObject.refreshGps(function(add, update){
 			 		//将新增的点画到模拟图上
@@ -80,14 +85,14 @@ setTimeout(function(){
 	$('#top-tabs-wrap .nav-tabs').append(topTabs);
 	$('#top-tabs-wrap .tab-content').append(tabPanels);
-	//初始化主页
-	homeObject.init();
-	
 	//加载地图页数据
 	$('#tab_map').load('/pages/mapmonitor/real/real.html');
 	//初始化单线路调度页面
-	_alone.init();
+	_alone.init(function(){
+		//初始化主页
+		homeObject.init();
+	});
 }, 200)
@@ -99,4 +104,16 @@ setTimeout(function(){
 		}
 		return map;
 	}
+	
+	function groupByLine(gpsArray){
+		var rs = {}, gps;
+		$.each(gpsArray, function(){
+			key = this.lineId + '_' + this.upDown;
+			if(!rs[key])
+				rs[key] = [];
+		
+			rs[key].push(this);
+		});
+		return rs;
+	}
 }();
 \ No newline at end of file
@@ -18,29 +18,29 @@ var _menu = (function() {
 		menuObject[method](schedul);
 	});
-	var menuObject = {
-		bindClickMenu : function() {
-			var ac = 'active-menu';
-			// 表格右键呼出菜单
-			$('.pb-table.data tr td[name!=lineNo]').on('contextmenu',
-					function(e) {
-						e.preventDefault();
-						$('.pb-table tr td.' + ac).removeClass(ac);
-						var item = $(this);
-						item.addClass(ac);
-
-						showMenu(e.pageX, e.pageY + 3);
-						$(document).one('click', function() {
-							$('#rightMenu').removeClass('show-menu');
-							item.removeClass(ac);
-						});
-					})
-			// 点击选中
-			.on('click', function() {
+	// 表格右键呼出菜单
+	var ac = 'active-menu'
+		,items = '.pb-table.data tr td[name!=lineNo]';
+	$('.portlet-fullscreen').on('contextmenu', items, 
+			function(e) {
+				e.preventDefault();
 				$('.pb-table tr td.' + ac).removeClass(ac);
-				$(this).addClass(ac);
-			});
-		},
+				var item = $(this);
+				item.addClass(ac);
+
+				showMenu(e.pageX, e.pageY + 3);
+				$(document).one('click', function() {
+					$('#rightMenu').removeClass('show-menu');
+					item.removeClass(ac);
+				});
+			})
+	// 点击选中
+	.on('click',items, function() {
+		$('.pb-table tr td.' + ac).removeClass(ac);
+		$(this).addClass(ac);
+	});
+	
+	var menuObject = {
 		//待发调整
 		outgoAdjust: function(schedul){
 			var index = layer.open({
@@ -68,9 +68,9 @@ var _menu = (function() {
 		//计划烂班
 		planDestroy: function(schedul){
 			var data = {item: schedul, array : _data.getSchedulByVeh(schedul.clZbh)}
-			layer.open({
+			var index = layer.open({
 			  type: 1,
-			  area: ['370px', '605px'],
+			  area: ['370px', '645px'],
 			  maxmin: true,
 			  skin:'layui-layer-molv',
 			  content: template('plan_destroy_body_temp', data),
@@ -78,10 +78,17 @@ var _menu = (function() {
 			  title: '计划烂班设置',
 			  success: function(){
 				  var f = $('#planDestroyForm');
+				  //红色
 				  $('.icheck', f).iCheck({
 					 checkboxClass: 'icheckbox_square-red',
 					 increaseArea: '20%'
 				  });
+				  //蓝色
+				  $('.icheck-blue', f).iCheck({
+					 checkboxClass: 'icheckbox_minimal-blue',
+					 increaseArea: '20%'
+				  });
+				  $('[data-toggle="tooltip"]', f).tooltip();
 				  //滚动到选中项
 				  var cont = $('.custom-check-box', f)
 					,checked = $('.icheck:checked', f);
@@ -91,13 +98,51 @@ var _menu = (function() {
 					  }, 500);
 				  }
 				  //确定
-				  $('button.confirm', f).one('click', function(){
-					  var params = f.serializeJSON()
-					  	,text = '确定烂掉部分班次？，';
-					  $.each(params.ids, function(i, id){
-						  var s = _data.getSchedulById(id);
-						  text += (s.)
-					  });
+				  $('button.confirm', f).on('click', function(){
+					  f.submit();
+				  });
+				  
+				  f.validate({
+					 submitHandler : function(){
+						 var params = f.serializeJSON()
+						  	,text = '确定烂掉部分班次['+schedul.clZbh+']&nbsp;&nbsp;'
+						  	,idsStr = '';
+						 
+						 $.each(params.ids, function(i, id){
+							 var s = _data.getSchedulById(id);
+							 text += (s.fcsj + ', ');
+							 idsStr += (id + ',');
+						 });
+						 text = text.substr(0, text.length - 2);
+						 if(params.spaceAdjust == 1){
+							 text += '<br>并自动调整后续班次间隔 <span class="font-red">'+params.spaceNum+'</span>分钟'
+						 }
+						 layer.close(index);
+						 //弹出确认框
+						 index = layer.confirm(text, {
+							btn : [ '确定烂班' , '取消' ],
+							icon : 3,
+							shift: 5,
+							skin : 'layui-layer-cfm-delete'
+						  	}, function(){
+						  		params.idsStr = idsStr;
+						  		$post('/realSchedule/destroy', params, function(rs){
+						  			layer.close(index);
+						  			$.each(rs.list, function(){
+						  				var old = _data.getSchedulById(this.id);
+						  				old.dfsj = this.dfsj;
+						  				old.dfsjT = this.dfsjT;
+						  				old.remarks = this.remarks;
+						  				old.status = this.status;
+						  				_alone.refreshSchedule(old);
+						  			});
+						  			layer.msg('调整间隔成功！');
+						  			console.log($('tr[data-id='+schedul.id+']').parents('table')[0]);
+						  			_alone.calculateLineNo($('tr[data-id='+schedul.id+']').parents('table')[0]);
+						  		});
+						  });
+						  return false;
+					  }
 				  });
 			  }
 			});
@@ -163,6 +208,27 @@ var _menu = (function() {
 				  }
 				});
 			});
+		},
+		//指令重发
+		directiveRepeat: function(schedul){
+			var text = '[路牌： '+schedul.lpName+'  计划时间：'+schedul.fcsj+'  待发时间：'+schedul.dfsj+']';
+			var index = layer.confirm(schedul.clZbh + '重发调度指令？ ' + text, {
+				btn : [ '是' , '否' ],
+				icon : 3,
+				shift: 5
+			  	}, function(){
+			  		//走短语下发
+			  		layer.close(index);
+			  		layer.msg('正在下发指令', {icon: 16});
+			  		$.post('/directive/phrase', {nbbm: schedul.clZbh, text: text},
+			  				function(code){
+			  			if(code == 0){
+			  				layer.msg('发送成功');
+			  			}
+			  			else
+			  				layer.alert('发送调度指令失败', {icon: 2, title: '操作失败'});
+			  		});
+			  });
 		}
 	}
@@ -12,7 +12,6 @@ var _tooltip = (function(){
 	var position = {};
 	var lastDom;
-	//toolTip hover
 	tip.hover(function() {
 		clearTime();
 		$(this).addClass('hover');
@@ -55,18 +54,24 @@ var _tooltip = (function(){
 			.addClass('tooltip-modal');
 	}
+	var lineIds;
+	setTimeout(function(){
+		lineIds = _data.getLineIds();
+	}, 1000);
+	
 	var tooltipObject = {
 		//正常 GPS toolTip
 		initGpsTip: function(e){
-			var lineIds = _data.getLineIds();
-			
 			e.on('mouseover', function(d){
 				clearTime();
 				var offset = $(this).offset()
 					,y = $(this).attr('y');
+				//获取线路名称
 				if(!d.lineName)
 					d.lineName = lineIds[d.lineId];
+				
+				d.fromNow = moment(d.timestamp).fromNow();
 				var html = template('tooltip_gps_temp', d);
 				showTip({
 					top: offset.top - 45,
@@ -74,25 +79,55 @@ var _tooltip = (function(){
 					container: html
 				});
 			})
-			.on('mouseout', function(){
-				et = setTimeout(function(){
-					if(tip.hasClass('fixed'))
-						return;
-					if(tip.hasClass('hover'))
-						return;
-					
-					tip.hide();
-				},300);
-			});
+			.on('mouseout', hideTip);
+		},
+		//首末站GPS
+		initStartAndEndGPS: function(e){
+			e.on('mouseover', function(d){
+				clearTime();
+				var offset = $(this).offset()
+					,y = $(this).attr('y');
+				
+				//获取线路名称
+				if(!d.lineName)
+					d.lineName = lineIds[d.lineId];
+				
+				d.fromNow = moment(d.timestamp).fromNow();
+				var html = template('tooltip_startend_gps_temp', d);
+				showTip({
+					top: offset.top - 45,
+					left: offset.left,
+					container: html
+				});
+			})
+			.on('mouseout', hideTip);
 		}
 	};
-	
+	var ftHeight = 40 + 40,//页脚
+		docHeight = $(document).height();
 	function showTip(op){
 		tip.css('top', op.top)
 			.css('left', op.left)
 			.html(op.container)
 			.addClass('open').show();
+		
+		var h = tip.height();
+		//超出下边界了
+		if(h + op.top + ftHeight > docHeight){
+			tip.css('top', op.top - h - 38);
+		}
+	}
+	
+	function hideTip(){
+		et = setTimeout(function(){
+			if(tip.hasClass('fixed'))
+				return;
+			if(tip.hasClass('hover'))
+				return;
+			
+			tip.hide();
+		},300);
 	}
 	function clearTime(){
@@ -6,7 +6,7 @@
 			<div class="col-md-6 panel-wrap">
 		<div class="_panel">
 			<div class="_head" style="color: #2765A7;">
-				上行/上海火车站北广场
+				上行/{{startStationName}}
 			</div>
 			<table class="table table-striped table-bordered table-advance pb-table head">
 					<thead>
@@ -25,26 +25,11 @@
 					</thead>
 			</table>
 			<div class="_body">
-				<table class="table table-striped table-bordered table-advance pb-table data">
+				<table class="table table-striped table-bordered table-advance pb-table data" data-type="up">
 					<tbody>
-						{{each up as item i}}
-						<tr data-id={{item.id}}>
-							<td name="lineNo">{{i + 1}}</td>
-							<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
-							<td data-name="clZbh">{{item.clZbh}}</td>
-							<td data-name="zdsj">{{item.zdsj}}</td>
-							<td></td>
-							<td data-name="fcsj">{{item.fcsj}}</td>
-							<td data-name="dfsj">{{item.dfsj}}</td>
-							<td></td>
-							<td class="hide-lt-1080" data-name="remarks">
-								{{if item.remarks != null}}
-									<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注</a>
-								{{/if}}
-							</td>
-							<td><a href="javascript:;">主</a></td>
+						<tr>
+							<td colspan=10 class="empty-table-td"></td>
 						</tr>
-						{{/each}}
 					</tbody>
 				</table>
 			</div>
@@ -53,7 +38,7 @@
 	<div class="col-md-6 panel-wrap">
 		<div class="_panel">
 			<div class="_head" style="color: #C92121;">
-				下行/华戴路川环南路
+				下行/{{endStationName}}
 			</div>
 			<table class="table table-striped table-bordered table-advance pb-table head">
 					<thead>
@@ -72,26 +57,11 @@
 					</thead>
 			</table>
 			<div class="_body">
-				<table class="table table-striped table-bordered table-advance pb-table data">
+				<table class="table table-striped table-bordered table-advance pb-table data" data-type="down">
 					<tbody>
-						{{each down as item i}}
-						<tr data-id={{item.id}}>
-							<td name="lineNo">{{i + 1}}</td>
-							<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
-							<td data-name="clZbh">{{item.clZbh}}</td>
-							<td data-name="zdsj">{{item.zdsj}}</td>
-							<td></td>
-							<td data-name="fcsj">{{item.fcsj}}</td>
-							<td data-name="dfsj">{{item.dfsj}}</td>
-							<td></td>
-							<td class="hide-lt-1080" data-name="remarks">
-								{{if item.remarks != null}}
-									<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注</a>
-								{{/if}}
-							</td>
-							<td><a href="javascript:;">主</a></td>
+						<tr>
+							<td colspan=10 class="empty-table-td"></td>
 						</tr>
-						{{/each}}
 					</tbody>
 				</table>
 			</div>
@@ -102,16 +72,17 @@
 	<div class="pic-panel">
 		图例：
 			<span class="tl-yzx"></span>
-			<span class="tl-wzx"></span>
+			<!--<span class="tl-wzx"></span>-->
 			<span class="tl-wd"></span>
 			<span class="tl-qrlb"></span>
 			<span class="tl-zzzx"></span>
-		&nbsp;&nbsp;&nbsp;
-		<span class="tl-sf-f"></span>
+		<!-- <span class="tl-sf-f"></span> -->
+&nbsp;&nbsp;&nbsp;
+
 		<span class="tl-xxfc"></span>
 		<span class="tl-xxsd"></span>
 		<span class="tl-xxrd"></span>
-		<span class="tl-fcpqr"></span>
+		<!--<span class="tl-fcpqr"></span>-->
 	</div>
 	</div>
@@ -167,12 +138,39 @@
 </div>
 <div class="panel-wrap" style="height: 209px;margin-top: 6px;">
-	<div class="_panel"  id="lineSvg10904">
+	<div class="_panel"  id="lineSvg{{lineCode}}">
 	</div>
 </div>
 </script>
+<!-- 班次table -->
+<script id="alone_plan_table_temp" type="text/html">
+{{each list as item i}}
+	<tr data-id={{item.id}}>
+	<td name="lineNo"></td>
+	<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
+	<td data-name="clZbh">{{item.clZbh}}</td>
+	<td data-name="zdsj">{{item.zdsj}}</td>
+	<td></td>
+	<td data-name="fcsj">{{item.fcsj}}</td>
+	<td data-name="dfsj">{{item.dfsj}}</td>
+	
+	{{if item.status == -1}}
+		<td class="tl-qrlb">烂班</td>	
+	{{else}}
+		<td></td>
+	{{/if}}
+	<td class="hide-lt-1080" data-name="remarks">
+		{{if item.remarks != null}}
+			<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注</a>
+		{{/if}}
+	</td>
+	<td><a href="javascript:;">主</a></td>
+	</tr>
+{{/each}}
+</script>
+
 <!-- 托管状态描述 -->
 <script id="tg_question_info_temp" type="text/html">
 <table class="tg-question-table">
@@ -313,7 +311,7 @@
 {{each array as obj i}}
     				<label>
 						<div class="checker">
-						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.fcsj==item.fcsj}}checked{{/if}}></span></div> {{obj.fcsj}}
+						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.dfsj==item.dfsj}}checked{{/if}}></span></div> {{obj.dfsj}}
 					</label>
 {{/each}}
 					</div>
@@ -325,7 +323,7 @@
    	 		<div class="item full">
 				<span class="item-label" style="width: 80px;line-height: 32px;">调整说明：</span>
 				<br>
-				<select class="form-control" style="width: 100%;">
+				<select class="form-control" style="width: 100%;" name="reason">
 	          		<option value="配车">配车</option>
 					<option value="保养">保养</option>
 					<option value="故障">故障</option>
@@ -346,10 +344,22 @@
 	  <div class="form-custom-row">
    	 	<div class="item full" >
-	   	 	<textarea class="form-control" rows="4" name="remarks" placeholder="烂班说明！不超过50个字符，必填"></textarea>
+	   	 	<textarea class="form-control" rows="4" name="remarks" placeholder="烂班说明，必填" required></textarea>
    	 	</div>
    	  </div>
+	<div class="form-custom-row">
+   	 	<div class="item full" >
+	   	 	<label>
+				<div class="checker">
+				<span><input type="checkbox" value=1 name="spaceAdjust" class="icheck-blue" checked></span></div> 自动调整后续班次间隔为
+			</label>
+			<input type="number" name="spaceNum" value=15 style="width: 50px;height: 30px;margin: 0 5px;" > 分钟
+			&nbsp;<i class="fa fa-question-circle" style="cursor: pointer;" data-toggle="tooltip" data-placement="left" title="当前首个烂班为起点，调整后续班次间隔"></i>
+   	 	</div>
+   	  </div>
+
+
 	<hr>
 	<div class="form-custom-footer">
 		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
@@ -3,11 +3,22 @@
 {{each list as obj i}}
 <tr>
    <td> {{obj.nbbm}} </td>
-   <td> {{obj.endDistance}} </td>
-   <td class="col_hide_1680"> {{obj.endTime}} </td>
-   <td>{{obj.instructions}}</td>
-   <td> {{obj.speed}} </td>
-   <td> {{obj.roadSigns}} </td>
+   <td> 
+	{{if obj.currSch != null}}
+		{{obj.currSch.lpName}}
+	{{else}}
+		无
+	{{/if}}
+   </td>
+   <td class="col_hide_1680"> {{obj.speed}} </td>
+   <td> 暂无 </td>
+   <td>
+{{if obj.nextSch != null}}
+	{{obj.nextSch.dfsj}}
+{{else}}
+	无
+{{/if}}
+	</td>
 </tr>
 {{/each}}
 </script>
 \ No newline at end of file
@@ -8,7 +8,7 @@
 	<div class="col-lg-2 ">
 		<div class="title">
-			发往{{lineObj.startStationName}}方向 <span class="badge"> 13 </span>
+			发往{{lineObj.startStationName}}方向 <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"
@@ -30,21 +30,20 @@
 		<table class="table table-striped table-bordered table-advance"
 			style="table-layout: fixed;">
 			<colgroup>
-				<col style="width: 20%;">
-				<col style="width: 19%;">
-				<col style="width: 20%;">
-				<col style="width: 14%;">
-				<col style="width: 14%;">
+				<col style="width: 22%;">
+				<col style="width: 17%;">
+				<col style="width: 17%;">
+				<col style="width: 22%;">
+				<col style="width: 22%;">
 			</colgroup>
 			<thead>
 				<tr>
 					<th>车辆编码</th>
-					<th>终点距离</th>
-					<th class="col_hide_1680">终点时间</th>
-					<th>指令</th>
-					<th>速度</th>
 					<th>路牌</th>
+					<th>速度</th>
+					<th class="col_hide_1680">终点时间</th>
+					<th>下一班</th>
 				</tr>
 			</thead>
 		</table>
@@ -53,12 +52,11 @@
 				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
 				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_0">
 				<colgroup>
-					<col style="width: 20%;">
-					<col style="width: 19%;">
-					<col style="width: 20%;">
-					<col style="width: 14%;">
-					<col style="width: 14%;">
-
+					<col style="width: 22%;">
+					<col style="width: 17%;">
+					<col style="width: 17%;">
+					<col style="width: 22%;">
+					<col style="width: 22%;">
 				</colgroup>
 				<tbody></tbody>
 			</table>
@@ -75,7 +73,7 @@
 	<div class="col-lg-2  down">
 		<div class="title">
-			发往{{lineObj.endStationName}}方向 <span class="badge"> 7 </span>
+			发往{{lineObj.endStationName}}方向 <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"
@@ -93,21 +91,19 @@
 		<table class="table table-striped table-bordered table-advance"
 			style="table-layout: fixed;">
 			<colgroup>
-				<col style="width: 20%;">
-				<col style="width: 19%;">
-				<col style="width: 20%;">
-				<col style="width: 14%;">
-				<col style="width: 14%;">
-
+				<col style="width: 22%;">
+				<col style="width: 17%;">
+				<col style="width: 17%;">
+				<col style="width: 22%;">
+				<col style="width: 22%;">
 			</colgroup>
 			<thead>
 				<tr>
 					<th>车辆编码</th>
-					<th>终点距离</th>
-					<th class="col_hide_1680">终点时间</th>
-					<th>指令</th>
-					<th>速度</th>
 					<th>路牌</th>
+					<th>速度</th>
+					<th class="col_hide_1680">终点时间</th>
+					<th>下一班</th>
 				</tr>
 			</thead>
 		</table>
@@ -116,11 +112,11 @@
 				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
 				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_1">
 				<colgroup>
-					<col style="width: 20%;">
-					<col style="width: 19%;">
-					<col style="width: 20%;">
-					<col style="width: 14%;">
-					<col style="width: 14%;">
+					<col style="width: 22%;">
+					<col style="width: 17%;">
+					<col style="width: 17%;">
+					<col style="width: 22%;">
+					<col style="width: 22%;">
 				</colgroup>
 				<tbody>
@@ -9,10 +9,41 @@
 	<div><a href="javascript:;" data-for="station" class="tip_modal">{{stationName}}</a></div>
 	<div>速度：{{speed}}</div>
 	<hr >
-	<div>预计2分钟后到达<a href="javascript:;" data-for="station" class="tip_modal">下一站</a></div>
-	<div>终点站：<a href="javascript:;" data-for="station" > 终点</a></div>
+	<div>预计 ? 分钟后到达<a href="javascript:;" data-for="station" class="tip_modal">下一站</a></div>
+	<div>终点站：
+		<a href="javascript:;" data-for="station" > 
+		{{if currSch != null}}
+			{{currSch.zdzName}}
+		{{/if}}
+
+		</a></div>
 	<hr >
-	<div class="subtitle">10秒前更新（在线）</div>
+	<div class="subtitle">{{fromNow}}更新（在线）</div>
+	<div class="subtitle" style="margin-top: 8px;">
+		<a href="javascript:;" data-for="map" class="tip_modal" data-lon={{lon}} data-lat={{lat}} data-nbbm={{nbbm}}>
+			<i class="fa fa-map-marker"></i>
+			地图查看
+		</a>
+	</div>
+</div>
+</script>
+
+<script id="tooltip_startend_gps_temp" type="text/html">
+<div id="tooltip-Container" >
+	<div class="title">
+		<a href="javascript:;" data-for="station" class="tip_modal">{{nbbm}}</a>
+	</div>
+	<div>
+		{{lineName}}
+	</div>
+	<div><a href="javascript:;" data-for="station" class="tip_modal">{{stationName}}</a></div>
+	<div>停站时间：无 </div>
+	{{if nextSch != null}}
+		<div>计划 {{nextSch.dfsj}} 发车</div>
+	{{/if}}
+
+	<hr >
+	<div class="subtitle">{{fromNow}}更新（在线）</div>
 	<div class="subtitle" style="margin-top: 8px;">
 		<a href="javascript:;" data-for="map" class="tip_modal" data-lon={{lon}} data-lat={{lat}} data-nbbm={{nbbm}}>
 			<i class="fa fa-map-marker"></i>
@@ -87,6 +87,7 @@ label.BMapLabel{
 .mapRightWrap.vehicle{
 	height: calc(100% - 110px);
+	overflow: auto;
 }
 .mapRightWrap.search{
@@ -567,4 +568,22 @@ html{
 	background: #ddd;
 	color: #333333;
 }
-/* GaoDe  style end-------  */
 \ No newline at end of file
+/* GaoDe  style end-------  */
+
+
+.map-gps-empty{
+	padding: 10px;
+    text-align: center;
+    color: #b37f7f;
+    border-bottom: 1px dashed #556471;
+    font-size: 13px;
+}
+
+.mapRightWrap::-webkit-scrollbar-thumb {
+    box-shadow: 0 0 0 5px rgba(231, 236, 241, 0.52) inset;
+}
+
+.gps_info_win p{
+	margin-bottom: 13px;
+	font-size: 13px;
+}
@@ -12,6 +12,11 @@ var realMap = (function() {
         });
     }
+	/**
+	 * 透明点，用于替换隐藏百度Marker的icon
+	 */
+	var tmIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAAbSURBVHjaYvz//z8DAwMDAxMDFAAAAAD//wMAMAYDAW/BVI8AAAAASUVORK5CYII=';
+	
 	var REAL_BAIDU_TEXT = '百度地图', REAL_GAODE_TEXT = '高德地图';
 	// 中心点 （上海市浦东新区政府）
@@ -34,6 +39,14 @@ var realMap = (function() {
 	//百度API Key
 	var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+	var bd_gps_info_win_opts = {
+	  		width : 190,
+	  		height: 255,
+	  		enableMessage:true
+	};
+	
+	//设备号和marker对照
+	var markersMap;
 	var real_map = {
 		getMap: function(){
 			return currentMap;
@@ -75,6 +88,10 @@ var realMap = (function() {
 						isVisible = true;
 					}
 				});
+				//百度路况控件自身关闭按钮
+				$('.portlet-fullscreen').on('click', '.maplibTc .maplibTcClose', function(){
+					isVisible = false;
+				});
 				$('#tcWrap.maplibTc').addClass('animated bounceInLeft');
 				$('.maplibTcBtn_deskTop.anchorTR').remove();
@@ -143,9 +160,6 @@ var realMap = (function() {
 						  cb && cb();
 					},
 					onPolylinesSet: function(pline){
-						//pline.setStrokeColor('#333');
-						//console.log(pline.getStrokeColor());
-						console.log(pline);
 						cb && cb();
 					},
 					onGetBusLineComplete: function(line){
@@ -156,19 +170,32 @@ var realMap = (function() {
 			},
 			//将GPS信号画到地图上
 			drawGpsMarker: function(gpsList){
+				markersMap = {};
 				var map = currentMap.map;
+				var markerClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 3});
 				real_map.baidu.coordsConvert(gpsList, function(){
-					console.log(gpsList);
 					//绘制车辆位置
-					var label;
+					var marker;
 					$.each(gpsList, function(i, gpsData){
-						//生成marker
-						label = createLabel(gpsData);
-						map.addOverlay(label);
+						marker = createBDMarkerByGps(gpsData)
+						map.addOverlay(marker);
+						//marker加入点聚合
+						markerClusterer.addMarker(marker); 
+						
+						markersMap[gpsData.deviceId] = marker;
 					});
 				});
 			},
+			goToMarker: function(deviceId){
+				var m = markersMap[deviceId];
+				if(m){
+					currentMap.map.panTo(m.point);
+					setTimeout(function(){
+						bdOpenWindow(m);
+					}, 500);
+				}
+			},
 			coordsConvert: function(list, cb){
 				if(list.length > 100)
 					list = list.slice(0, 100);
@@ -317,14 +344,6 @@ var realMap = (function() {
 		layer.msg('正在切换到' + text + '...', {icon : 16,shade : [ 0.6, '#393D49' ],time : 0});
 	}
-	function createLabel(gpsData){
-		var point = new BMap.Point(gpsData.bd_coord.x, gpsData.bd_coord.y)
-		//label
-		,label = new BMap.Label(gpsData.nbbm.replace('-',''), {position: point, offset: new BMap.Size(-28,-10)});
-		label.setStyle({borderColor: bgColor(gpsData),borderRadius: '5px', padding: '3px 5px', color: tColor(gpsData), backgroundColor: bgColor(gpsData)});
-		return label;
-	}
-	
 	/**
 	 * 颜色
 	 */
@@ -348,5 +367,31 @@ var realMap = (function() {
 			return "rgb(229, 229, 229)";
 	}
+	function createBDMarkerByGps(gpsData){
+		//marker
+		var point = new BMap.Point(gpsData.bd_coord.x, gpsData.bd_coord.y)
+		//label
+		,label = new BMap.Label(gpsData.nbbm.replace('-',''), {position: point, offset: new BMap.Size(-20,8)});
+		label.setStyle({borderColor: bgColor(gpsData), padding: '6px 6px 4px 6px', color: tColor(gpsData), backgroundColor: bgColor(gpsData)});
+		var marker = new BMap.Marker(point);
+		marker.setLabel(label);
+		//icon
+		marker.setIcon(new BMap.Icon(tmIcon, new BMap.Size(25,25)));
+		//window 绑定到 label
+		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
+		//数据绑定到label
+		marker.gpsData = gpsData;
+		
+		//mouseover
+		label.addEventListener('mouseover', function(){
+			bdOpenWindow(marker);
+		});
+		return marker;
+	}
+	
+	function bdOpenWindow(marker){
+		marker.infoWindow.setContent(template('gps_info_win_temp', marker.gpsData));
+		currentMap.map.openInfoWindow(marker.infoWindow, marker.point);
+	}
 	return real_map;
 })();
 \ No newline at end of file
@@ -39,8 +39,9 @@
 			// 刷新
 			return;
 		}
+		var method = $(this).data('click');
-		if (playAnimation)
+		if (!method || playAnimation)
 			return;
 		playAnimation = true;
@@ -48,7 +49,7 @@
 		$('.mapTools div.item.active').removeClass('active');
 		$(this).addClass('active');
-		toolsEvent[$(this).data('click')]();
+		toolsEvent[method]();
 	});
 	var classzz = 'mapRightWrap z-depth-3 ';
@@ -65,8 +66,10 @@
 			resetRotate(null, searchPanel.init);
 		},
 		notice : function() {
+			alert('notice');
 		},
 		playBack : function() {
+			alert('playBack');
 		},
 		clearStyle : function() {
 			mrw.removeClass(
@@ -4,16 +4,15 @@
 var vehiclePanel = (function() {
-	function getCurr(){
+	function getCurrMap(){
 		return realMap[realMap.getMap().fName];
 	}
 	var storage = window.localStorage;
 	function closeAll(){
-		$('a[data-toggle=collapse]').collapse('hide');
+		$('.mapRightWrap .collapse.in').collapse('hide');
 	}
-	
 	// 手风琴收拢
 	$('.mapRightWrap').on('hide.bs.collapse', '.panel-collapse', function() {
 		$(this).prev().find('span.icon').addClass('rotate');
@@ -23,27 +22,45 @@ var vehiclePanel = (function() {
 	$('.mapRightWrap').on('show.bs.collapse', '.panel-collapse', function() {
 		$(this).prev().find('span.icon').removeClass('rotate');
 		var lineCode = $(this).data('line');
-		
 		//收拢其他
 		closeAll();
-		
-		//该线路的GPS点
+		//过滤出该线路的GPS点
 		var showList = [];
-		$.each(lineGps[lineCode], function(){
-			showList.push(allGps[this]);
-		})
-		//在地图上画出线路
-		var mapObj = getCurr();
-		console.log('allGps', allGps, 'lineCode', lineCode);
-		mapObj.drawLine($(this).data('name'), function(){
-			mapObj.drawGpsMarker(showList);
-		});
-		
+		if(lineGps[lineCode]){
+			$.each(lineGps[lineCode], function(){
+				showList.push(allGps[this]);
+			});
+		}
 		//显示车辆列表
 		var htmlStr = template('vehicle_panel_collapse_temp', {list: showList});
 		$(this).html(htmlStr);
+		
+		/**
+		 * 延迟一下再画地图，不然会有点卡
+		 */
+		var that = $(this);
+		setTimeout(function(){
+			//在地图上画出线路
+			var mapObj = getCurrMap();
+			mapObj.drawLine(that.data('name'), function(){
+				mapObj.drawGpsMarker(showList);
+			});
+		}, 500);
 	});
+	//展开完成
+	$('.mapRightWrap').on('shown.bs.collapse', '.panel-collapse', function() {
+		//滚动到激活项
+		var cont = $('.mapRightWrap'),h = $(this).prev();
+		cont.scrollTop(h.offset().top - cont.offset().top + h.scrollTop());
+	});
+	
+	//go to marker
+	$('.mapRightWrap').on('click', '.goto-marker', function() {
+		getCurrMap().goToMarker($(this).data('deviceid'));
+	});
+	
+	
 	//GPS刷新事件
 	var allGps = {};
 	var lineGps = {};
@@ -75,10 +92,10 @@ var vehiclePanel = (function() {
 			var htmlStr = template('vehicle_panel_temp', {list: lines});
 			$('.mapRightWrap').html(htmlStr).addClass('vehicle');
 			//滚动条
-			$('.gps-line-wrap').slimscroll({
+			/*$('.gps-line-wrap').slimscroll({
 				height: '100%',
 				alwaysVisible: true
-			});
+			});*/
 			/*var line = {code: 10103, name: '119路'};
 			$get('/gps/real/line/' + line.code, null, function(data){
 				//过滤掉没有自编号和站点名为空的
+/**
+ * @fileoverview MarkerClusterer标记聚合器用来解决加载大量点要素到地图上产生覆盖现象的问题，并提高性能。
+ * 主入口类是<a href="symbols/BMapLib.MarkerClusterer.html">MarkerClusterer</a>，
+ * 基于Baidu Map API 1.2。
+ *
+ * @author Baidu Map Api Group 
+ * @version 1.2
+ */
+ 
+
+/** 
+ * @namespace BMap的所有library类均放在BMapLib命名空间下
+ */
+var BMapLib = window.BMapLib = BMapLib || {};
+(function(){
+    
+    /**
+     * 获取一个扩展的视图范围，把上下左右都扩大一样的像素值。
+     * @param {Map} map BMap.Map的实例化对象
+     * @param {BMap.Bounds} bounds BMap.Bounds的实例化对象
+     * @param {Number} gridSize 要扩大的像素值
+     *
+     * @return {BMap.Bounds} 返回扩大后的视图范围。
+     */
+    var getExtendedBounds = function(map, bounds, gridSize){
+        bounds = cutBoundsInRange(bounds);
+        var pixelNE = map.pointToPixel(bounds.getNorthEast());
+        var pixelSW = map.pointToPixel(bounds.getSouthWest()); 
+        pixelNE.x += gridSize;
+        pixelNE.y -= gridSize;
+        pixelSW.x -= gridSize;
+        pixelSW.y += gridSize;
+        var newNE = map.pixelToPoint(pixelNE);
+        var newSW = map.pixelToPoint(pixelSW);
+        return new BMap.Bounds(newSW, newNE);
+    };
+
+    /**
+     * 按照百度地图支持的世界范围对bounds进行边界处理
+     * @param {BMap.Bounds} bounds BMap.Bounds的实例化对象
+     *
+     * @return {BMap.Bounds} 返回不越界的视图范围
+     */
+    var cutBoundsInRange = function (bounds) {
+        var maxX = getRange(bounds.getNorthEast().lng, -180, 180);
+        var minX = getRange(bounds.getSouthWest().lng, -180, 180);
+        var maxY = getRange(bounds.getNorthEast().lat, -74, 74);
+        var minY = getRange(bounds.getSouthWest().lat, -74, 74);
+        return new BMap.Bounds(new BMap.Point(minX, minY), new BMap.Point(maxX, maxY));
+    }; 
+
+    /**
+     * 对单个值进行边界处理。
+     * @param {Number} i 要处理的数值
+     * @param {Number} min 下边界值
+     * @param {Number} max 上边界值
+     * 
+     * @return {Number} 返回不越界的数值
+     */
+    var getRange = function (i, mix, max) {
+        mix && (i = Math.max(i, mix));
+        max && (i = Math.min(i, max));
+        return i;
+    };
+
+    /**
+     * 判断给定的对象是否为数组
+     * @param {Object} source 要测试的对象
+     *
+     * @return {Boolean} 如果是数组返回true，否则返回false
+     */
+    var isArray = function (source) {
+        return '[object Array]' === Object.prototype.toString.call(source);
+    };
+
+    /**
+     * 返回item在source中的索引位置
+     * @param {Object} item 要测试的对象
+     * @param {Array} source 数组
+     *
+     * @return {Number} 如果在数组内，返回索引，否则返回-1
+     */
+    var indexOf = function(item, source){
+        var index = -1;
+        if(isArray(source)){
+            if (source.indexOf) {
+                index = source.indexOf(item);
+            } else {
+                for (var i = 0, m; m = source[i]; i++) {
+                    if (m === item) {
+                        index = i;
+                        break;
+                    }
+                }
+            }
+        }        
+        return index;
+    };
+
+    /**
+     *@exports MarkerClusterer as BMapLib.MarkerClusterer
+     */
+    var MarkerClusterer =  
+        /**
+         * MarkerClusterer
+         * @class 用来解决加载大量点要素到地图上产生覆盖现象的问题，并提高性能
+         * @constructor
+         * @param {Map} map 地图的一个实例。
+         * @param {Json Object} options 可选参数，可选项包括：<br />
+         *    markers {Array<Marker>} 要聚合的标记数组<br />
+         *    girdSize {Number} 聚合计算时网格的像素大小，默认60<br />
+         *    maxZoom {Number} 最大的聚合级别，大于该级别就不进行相应的聚合<br />
+         *    minClusterSize {Number} 最小的聚合数量，小于该数量的不能成为一个聚合，默认为2<br />
+         *    isAverangeCenter {Boolean} 聚合点的落脚位置是否是所有聚合在内点的平均值，默认为否，落脚在聚合内的第一个点<br />
+         *    styles {Array<IconStyle>} 自定义聚合后的图标风格，请参考TextIconOverlay类<br />
+         */
+        BMapLib.MarkerClusterer = function(map, options){
+            if (!map){
+                return;
+            }
+            this._map = map;
+            this._markers = [];
+            this._clusters = [];
+            
+            var opts = options || {};
+            this._gridSize = opts["gridSize"] || 60;
+            this._maxZoom = opts["maxZoom"] || 18;
+            this._minClusterSize = opts["minClusterSize"] || 2;           
+            this._isAverageCenter = false;
+            if (opts['isAverageCenter'] != undefined) {
+                this._isAverageCenter = opts['isAverageCenter'];
+            }    
+            this._styles = opts["styles"] || [];
+        
+            var that = this;
+            this._map.addEventListener("zoomend",function(){
+                that._redraw();     
+            });
+    
+            this._map.addEventListener("moveend",function(){
+                 that._redraw();     
+            });
+   
+            var mkrs = opts["markers"];
+            isArray(mkrs) && this.addMarkers(mkrs);
+        };
+
+    /**
+     * 添加要聚合的标记数组。
+     * @param {Array<Marker>} markers 要聚合的标记数组
+     *
+     * @return 无返回值。
+     */
+    MarkerClusterer.prototype.addMarkers = function(markers){
+        for(var i = 0, len = markers.length; i <len ; i++){
+            this._pushMarkerTo(markers[i]);
+        }
+        this._createClusters();   
+    };
+
+    /**
+     * 把一个标记添加到要聚合的标记数组中
+     * @param {BMap.Marker} marker 要添加的标记
+     *
+     * @return 无返回值。
+     */
+    MarkerClusterer.prototype._pushMarkerTo = function(marker){
+        var index = indexOf(marker, this._markers);
+        if(index === -1){
+            marker.isInCluster = false;
+            this._markers.push(marker);//Marker拖放后enableDragging不做变化，忽略
+        }
+    };
+
+    /**
+     * 添加一个聚合的标记。
+     * @param {BMap.Marker} marker 要聚合的单个标记。
+     * @return 无返回值。
+     */
+    MarkerClusterer.prototype.addMarker = function(marker) {
+        this._pushMarkerTo(marker);
+        this._createClusters();
+    };
+
+    /**
+     * 根据所给定的标记，创建聚合点
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype._createClusters = function(){
+        var mapBounds = this._map.getBounds();
+        var extendedBounds = getExtendedBounds(this._map, mapBounds, this._gridSize);
+        for(var i = 0, marker; marker = this._markers[i]; i++){
+            if(!marker.isInCluster && extendedBounds.containsPoint(marker.getPosition()) ){ 
+                this._addToClosestCluster(marker);
+            }
+        }   
+    };
+
+    /**
+     * 根据标记的位置，把它添加到最近的聚合中
+     * @param {BMap.Marker} marker 要进行聚合的单个标记
+     *
+     * @return 无返回值。
+     */
+    MarkerClusterer.prototype._addToClosestCluster = function (marker){
+        var distance = 4000000;
+        var clusterToAddTo = null;
+        var position = marker.getPosition();
+        for(var i = 0, cluster; cluster = this._clusters[i]; i++){
+            var center = cluster.getCenter();
+            if(center){
+                var d = this._map.getDistance(center, marker.getPosition());
+                if(d < distance){
+                    distance = d;
+                    clusterToAddTo = cluster;
+                }
+            }
+        }
+    
+        if (clusterToAddTo && clusterToAddTo.isMarkerInClusterBounds(marker)){
+            clusterToAddTo.addMarker(marker);
+        } else {
+            var cluster = new Cluster(this);
+            cluster.addMarker(marker);            
+            this._clusters.push(cluster);
+        }    
+    };
+
+    /**
+     * 清除上一次的聚合的结果
+     * @return 无返回值。
+     */
+    MarkerClusterer.prototype._clearLastClusters = function(){
+        for(var i = 0, cluster; cluster = this._clusters[i]; i++){            
+            cluster.remove();
+        }
+        this._clusters = [];//置空Cluster数组
+        this._removeMarkersFromCluster();//把Marker的cluster标记设为false
+    };
+
+    /**
+     * 清除某个聚合中的所有标记
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype._removeMarkersFromCluster = function(){
+        for(var i = 0, marker; marker = this._markers[i]; i++){
+            marker.isInCluster = false;
+        }
+    };
+   
+    /**
+     * 把所有的标记从地图上清除
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype._removeMarkersFromMap = function(){
+    	var tmplabel;
+        for(var i = 0, marker; marker = this._markers[i]; i++){
+            marker.isInCluster = false;
+            
+            tmplabel = marker.getLabel();
+            
+            this._map.removeOverlay(marker);  
+            
+            marker.setLabel(tmplabel);
+        }
+    };
+
+    /**
+     * 删除单个标记
+     * @param {BMap.Marker} marker 需要被删除的marker
+     *
+     * @return {Boolean} 删除成功返回true，否则返回false
+     */
+    MarkerClusterer.prototype._removeMarker = function(marker) {
+        var index = indexOf(marker, this._markers),tmplabel;
+        if (index === -1) {
+            return false;
+        }
+        tmplabel = marker.getLabel();
+        this._map.removeOverlay(marker);
+        marker.setLabel(tmplabel);
+        this._markers.splice(index, 1);
+        return true;
+    };
+
+    /**
+     * 删除单个标记
+     * @param {BMap.Marker} marker 需要被删除的marker
+     *
+     * @return {Boolean} 删除成功返回true，否则返回false
+     */
+    MarkerClusterer.prototype.removeMarker = function(marker) {
+        var success = this._removeMarker(marker);
+        if (success) {
+            this._clearLastClusters();
+            this._createClusters();
+        }
+        return success;
+    };
+    
+    /**
+     * 删除一组标记
+     * @param {Array<BMap.Marker>} markers 需要被删除的marker数组
+     *
+     * @return {Boolean} 删除成功返回true，否则返回false
+     */
+    MarkerClusterer.prototype.removeMarkers = function(markers) {
+        var success = false;
+        for (var i = 0; i < markers.length; i++) {
+            var r = this._removeMarker(markers[i]);
+            success = success || r; 
+        }
+
+        if (success) {
+            this._clearLastClusters();
+            this._createClusters();
+        }
+        return success;
+    };
+
+    /**
+     * 从地图上彻底清除所有的标记
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype.clearMarkers = function() {
+        this._clearLastClusters();
+        this._removeMarkersFromMap();
+        this._markers = [];
+    };
+
+    /**
+     * 重新生成，比如改变了属性等
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype._redraw = function () {
+        this._clearLastClusters();
+        this._createClusters();
+    };
+
+    /**
+     * 获取网格大小
+     * @return {Number} 网格大小
+     */
+    MarkerClusterer.prototype.getGridSize = function() {
+        return this._gridSize;
+    };
+
+    /**
+     * 设置网格大小
+     * @param {Number} size 网格大小
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype.setGridSize = function(size) {
+        this._gridSize = size;
+        this._redraw();
+    };
+
+    /**
+     * 获取聚合的最大缩放级别。
+     * @return {Number} 聚合的最大缩放级别。
+     */
+    MarkerClusterer.prototype.getMaxZoom = function() {
+        return this._maxZoom;       
+    };
+
+    /**
+     * 设置聚合的最大缩放级别
+     * @param {Number} maxZoom 聚合的最大缩放级别
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype.setMaxZoom = function(maxZoom) {
+        this._maxZoom = maxZoom;
+        this._redraw();
+    };
+
+    /**
+     * 获取聚合的样式风格集合
+     * @return {Array<IconStyle>} 聚合的样式风格集合
+     */
+    MarkerClusterer.prototype.getStyles = function() {
+        return this._styles;
+    };
+
+    /**
+     * 设置聚合的样式风格集合
+     * @param {Array<IconStyle>} styles 样式风格数组
+     * @return 无返回值
+     */
+    MarkerClusterer.prototype.setStyles = function(styles) {
+        this._styles = styles;
+        this._redraw();
+    };
+
+    /**
+     * 获取单个聚合的最小数量。
+     * @return {Number} 单个聚合的最小数量。
+     */
+    MarkerClusterer.prototype.getMinClusterSize = function() {
+        return this._minClusterSize;
+    };
+
+    /**
+     * 设置单个聚合的最小数量。
+     * @param {Number} size 单个聚合的最小数量。
+     * @return 无返回值。
+     */
+    MarkerClusterer.prototype.setMinClusterSize = function(size) {
+        this._minClusterSize = size;
+        this._redraw();
+    };
+
+    /**
+     * 获取单个聚合的落脚点是否是聚合内所有标记的平均中心。
+     * @return {Boolean} true或false。
+     */
+    MarkerClusterer.prototype.isAverageCenter = function() {
+        return this._isAverageCenter;
+    };
+
+    /**
+     * 获取聚合的Map实例。
+     * @return {Map} Map的示例。
+     */
+    MarkerClusterer.prototype.getMap = function() {
+      return this._map;
+    };
+
+    /**
+     * 获取所有的标记数组。
+     * @return {Array<Marker>} 标记数组。
+     */
+    MarkerClusterer.prototype.getMarkers = function() {
+        return this._markers;
+    };
+
+    /**
+     * 获取聚合的总数量。
+     * @return {Number} 聚合的总数量。
+     */
+    MarkerClusterer.prototype.getClustersCount = function() {
+        var count = 0;
+		for(var i = 0, cluster; cluster = this._clusters[i]; i++){
+            cluster.isReal() && count++;     
+        }
+		return count;
+    };
+
+    /**
+     * @ignore
+     * Cluster
+     * @class 表示一个聚合对象，该聚合，包含有N个标记，这N个标记组成的范围，并有予以显示在Map上的TextIconOverlay等。
+     * @constructor
+     * @param {MarkerClusterer} markerClusterer 一个标记聚合器示例。
+     */
+    function Cluster(markerClusterer){
+        this._markerClusterer = markerClusterer;
+        this._map = markerClusterer.getMap();
+        this._minClusterSize = markerClusterer.getMinClusterSize();
+        this._isAverageCenter = markerClusterer.isAverageCenter();
+        this._center = null;//落脚位置
+        this._markers = [];//这个Cluster中所包含的markers
+        this._gridBounds = null;//以中心点为准，向四边扩大gridSize个像素的范围，也即网格范围
+		this._isReal = false; //真的是个聚合
+    
+        this._clusterMarker = new BMapLib.TextIconOverlay(this._center, this._markers.length, {"styles":this._markerClusterer.getStyles()});
+        //this._map.addOverlay(this._clusterMarker);
+    }
+   
+    /**
+     * 向该聚合添加一个标记。
+     * @param {Marker} marker 要添加的标记。
+     * @return 无返回值。
+     */
+    Cluster.prototype.addMarker = function(marker){
+        if(this.isMarkerInCluster(marker)){
+            return false;
+        }//也可用marker.isInCluster判断,外面判断OK，这里基本不会命中
+    
+        if (!this._center){
+            this._center = marker.getPosition();
+            this.updateGridBounds();//
+        } else {
+            if(this._isAverageCenter){
+                var l = this._markers.length + 1;
+                var lat = (this._center.lat * (l - 1) + marker.getPosition().lat) / l;
+                var lng = (this._center.lng * (l - 1) + marker.getPosition().lng) / l;
+                this._center = new BMap.Point(lng, lat);
+                this.updateGridBounds();
+            }//计算新的Center
+        }
+    
+        marker.isInCluster = true;
+        this._markers.push(marker);
+    
+        var len = this._markers.length,tmplabel;
+        if(len < this._minClusterSize ){     
+            this._map.addOverlay(marker);
+			//this.updateClusterMarker();
+            return true;
+        } else if (len === this._minClusterSize) {
+            for (var i = 0; i < len; i++) {
+            	tmplabel = this._markers[i].getLabel();
+                this._markers[i].getMap() && this._map.removeOverlay(this._markers[i]);
+                this._markers[i].setLabel(tmplabel);
+            }
+			
+        } 
+        this._map.addOverlay(this._clusterMarker);
+		this._isReal = true;
+        this.updateClusterMarker();
+        return true;
+    };
+    
+    /**
+     * 判断一个标记是否在该聚合中。
+     * @param {Marker} marker 要判断的标记。
+     * @return {Boolean} true或false。
+     */
+    Cluster.prototype.isMarkerInCluster= function(marker){
+        if (this._markers.indexOf) {
+            return this._markers.indexOf(marker) != -1;
+        } else {
+            for (var i = 0, m; m = this._markers[i]; i++) {
+                if (m === marker) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
+
+    /**
+     * 判断一个标记是否在该聚合网格范围中。
+     * @param {Marker} marker 要判断的标记。
+     * @return {Boolean} true或false。
+     */
+    Cluster.prototype.isMarkerInClusterBounds = function(marker) {
+        return this._gridBounds.containsPoint(marker.getPosition());
+    };
+	
+	Cluster.prototype.isReal = function(marker) {
+        return this._isReal;
+    };
+
+    /**
+     * 更新该聚合的网格范围。
+     * @return 无返回值。
+     */
+    Cluster.prototype.updateGridBounds = function() {
+        var bounds = new BMap.Bounds(this._center, this._center);
+        this._gridBounds = getExtendedBounds(this._map, bounds, this._markerClusterer.getGridSize());
+    };
+
+    /**
+     * 更新该聚合的显示样式，也即TextIconOverlay。
+     * @return 无返回值。
+     */
+    Cluster.prototype.updateClusterMarker = function () {
+        if (this._map.getZoom() > this._markerClusterer.getMaxZoom()) {
+            this._clusterMarker && this._map.removeOverlay(this._clusterMarker);
+            for (var i = 0, marker; marker = this._markers[i]; i++) {
+                this._map.addOverlay(marker);
+            }
+            return;
+        }
+
+        if (this._markers.length < this._minClusterSize) {
+            this._clusterMarker.hide();
+            return;
+        }
+
+        this._clusterMarker.setPosition(this._center);
+        
+        this._clusterMarker.setText(this._markers.length);
+
+        var thatMap = this._map;
+        var thatBounds = this.getBounds();
+        this._clusterMarker.addEventListener("click", function(event){
+            thatMap.setViewport(thatBounds);
+        });
+
+    };
+
+    /**
+     * 删除该聚合。
+     * @return 无返回值。
+     */
+    Cluster.prototype.remove = function(){
+    	var tmplabel;
+        for (var i = 0, m; m = this._markers[i]; i++) {
+        	 	tmplabel = this._markers[i].getLabel();
+                this._markers[i].getMap() && this._map.removeOverlay(this._markers[i]);
+                this._markers[i].setLabel(tmplabel);
+        }//清除散的标记点
+        this._map.removeOverlay(this._clusterMarker);
+        this._markers.length = 0;
+        delete this._markers;
+    }
+
+    /**
+     * 获取该聚合所包含的所有标记的最小外接矩形的范围。
+     * @return {BMap.Bounds} 计算出的范围。
+     */
+    Cluster.prototype.getBounds = function() {
+        var bounds = new BMap.Bounds(this._center,this._center);
+        for (var i = 0, marker; marker = this._markers[i]; i++) {
+            bounds.extend(marker.getPosition());
+        }
+        return bounds;
+    };
+
+    /**
+     * 获取该聚合的落脚点。
+     * @return {BMap.Point} 该聚合的落脚点。
+     */
+    Cluster.prototype.getCenter = function() {
+        return this._center;
+    };
+
+})();
+/**
+ * @fileoverview 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。
+ * 主入口类是<a href="symbols/BMapLib.TextIconOverlay.html">TextIconOverlay</a>，
+ * 基于Baidu Map API 1.2。
+ *
+ * @author Baidu Map Api Group 
+ * @version 1.2
+ */
+ 
+
+ /** 
+ * @namespace BMap的所有library类均放在BMapLib命名空间下
+ */
+var BMapLib = window.BMapLib = BMapLib || {};
+
+(function () { 
+   
+    /**
+     * 声明baidu包
+     */
+    var T,
+    baidu = T = baidu || {version: "1.3.8"}; 
+    
+    (function (){
+        //提出guid，防止在与老版本Tangram混用时
+        //在下一行错误的修改window[undefined]
+        baidu.guid = "$BAIDU$";
+
+        //Tangram可能被放在闭包中
+        //一些页面级别唯一的属性，需要挂载在window[baidu.guid]上
+        window[baidu.guid] = window[baidu.guid] || {};
+
+        /**         
+        * @ignore
+        * @namespace baidu.dom 操作dom的方法。
+        */
+        baidu.dom = baidu.dom || {};
+    
+        
+        /**
+         * 从文档中获取指定的DOM元素
+         * @name baidu.dom.g
+         * @function
+         * @grammar baidu.dom.g(id)
+         * @param {string|HTMLElement} id 元素的id或DOM元素
+         * @shortcut g,T.G
+         * @meta standard
+         * @see baidu.dom.q
+         *             
+         * @returns {HTMLElement|null} 获取的元素，查找不到时返回null,如果参数不合法，直接返回参数
+         */
+        baidu.dom.g = function (id) {
+            if ('string' == typeof id || id instanceof String) {
+                return document.getElementById(id);
+            } else if (id && id.nodeName && (id.nodeType == 1 || id.nodeType == 9)) {
+                return id;
+            }
+            return null;
+        };
+
+        // 声明快捷方法
+        baidu.g = baidu.G = baidu.dom.g;
+
+        /**
+         * 获取目标元素所属的document对象
+         * @name baidu.dom.getDocument
+         * @function
+         * @grammar baidu.dom.getDocument(element)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @meta standard
+         * @see baidu.dom.getWindow
+         *             
+         * @returns {HTMLDocument} 目标元素所属的document对象
+         */
+        baidu.dom.getDocument = function (element) {
+            element = baidu.dom.g(element);
+            return element.nodeType == 9 ? element : element.ownerDocument || element.document;
+        };
+
+        /**
+           * @ignore
+         * @namespace baidu.lang 对语言层面的封装，包括类型判断、模块扩展、继承基类以及对象自定义事件的支持。
+        */
+        baidu.lang = baidu.lang || {};
+
+        /**
+         * 判断目标参数是否string类型或String对象
+         * @name baidu.lang.isString
+         * @function
+         * @grammar baidu.lang.isString(source)
+         * @param {Any} source 目标参数
+         * @shortcut isString
+         * @meta standard
+         * @see baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
+         *             
+         * @returns {boolean} 类型判断结果
+         */
+        baidu.lang.isString = function (source) {
+            return '[object String]' == Object.prototype.toString.call(source);
+        };
+
+        // 声明快捷方法
+        baidu.isString = baidu.lang.isString;
+
+        /**
+         * 从文档中获取指定的DOM元素
+         * **内部方法**
+         * 
+         * @param {string|HTMLElement} id 元素的id或DOM元素
+         * @meta standard
+         * @return {HTMLElement} DOM元素，如果不存在，返回null，如果参数不合法，直接返回参数
+         */
+        baidu.dom._g = function (id) {
+            if (baidu.lang.isString(id)) {
+                return document.getElementById(id);
+            }
+            return id;
+        };
+
+        // 声明快捷方法
+        baidu._g = baidu.dom._g;
+
+        /**
+         * @ignore
+         * @namespace baidu.browser 判断浏览器类型和特性的属性。
+         */
+        baidu.browser = baidu.browser || {};
+
+        if (/msie (\d+\.\d)/i.test(navigator.userAgent)) {
+            //IE 8下，以documentMode为准
+            //在百度模板中，可能会有$，防止冲突，将$1 写成 \x241
+            /**
+             * 判断是否为ie浏览器
+             * @property ie ie版本号
+             * @grammar baidu.browser.ie
+             * @meta standard
+             * @shortcut ie
+             * @see baidu.browser.firefox,baidu.browser.safari,baidu.browser.opera,baidu.browser.chrome,baidu.browser.maxthon 
+             */
+           baidu.browser.ie = baidu.ie = document.documentMode || + RegExp['\x241'];
+        }
+
+        /**
+         * 获取目标元素的computed style值。如果元素的样式值不能被浏览器计算，则会返回空字符串（IE）
+         *
+         * @author berg
+         * @name baidu.dom.getComputedStyle
+         * @function
+         * @grammar baidu.dom.getComputedStyle(element, key)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @param {string} key 要获取的样式名
+         *
+         * @see baidu.dom.getStyle
+         *             
+         * @returns {string} 目标元素的computed style值
+         */
+
+        baidu.dom.getComputedStyle = function(element, key){
+            element = baidu.dom._g(element);
+            var doc = baidu.dom.getDocument(element),
+                styles;
+            if (doc.defaultView && doc.defaultView.getComputedStyle) {
+                styles = doc.defaultView.getComputedStyle(element, null);
+                if (styles) {
+                    return styles[key] || styles.getPropertyValue(key);
+                }
+            }
+            return ''; 
+        };
+
+        /**
+         * 提供给setStyle与getStyle使用
+         */
+        baidu.dom._styleFixer = baidu.dom._styleFixer || {};
+
+        /**
+         * 提供给setStyle与getStyle使用
+         */
+        baidu.dom._styleFilter = baidu.dom._styleFilter || [];
+
+        /**
+         * 为获取和设置样式的过滤器
+         * @private
+         * @meta standard
+         */
+        baidu.dom._styleFilter.filter = function (key, value, method) {
+            for (var i = 0, filters = baidu.dom._styleFilter, filter; filter = filters[i]; i++) {
+                if (filter = filter[method]) {
+                    value = filter(key, value);
+                }
+            }
+            return value;
+        };
+
+        /**
+           * @ignore
+         * @namespace baidu.string 操作字符串的方法。
+         */
+        baidu.string = baidu.string || {};
+
+        /**
+         * 将目标字符串进行驼峰化处理
+         * @name baidu.string.toCamelCase
+         * @function
+         * @grammar baidu.string.toCamelCase(source)
+         * @param {string} source 目标字符串
+         * @remark
+         * 支持单词以“-_”分隔
+         * @meta standard
+         *             
+         * @returns {string} 驼峰化处理后的字符串
+         */
+        baidu.string.toCamelCase = function (source) {
+            //提前判断，提高getStyle等的效率 thanks xianwei
+            if (source.indexOf('-') < 0 && source.indexOf('_') < 0) {
+                return source;
+            }
+            return source.replace(/[-_][^-_]/g, function (match) {
+                return match.charAt(1).toUpperCase();
+            });
+        };
+
+        /**
+         * 获取目标元素的样式值
+         * @name baidu.dom.getStyle
+         * @function
+         * @grammar baidu.dom.getStyle(element, key)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @param {string} key 要获取的样式名
+         * @remark
+         * 
+         * 为了精简代码，本模块默认不对任何浏览器返回值进行归一化处理（如使用getStyle时，不同浏览器下可能返回rgb颜色或hex颜色），也不会修复浏览器的bug和差异性（如设置IE的float属性叫styleFloat，firefox则是cssFloat）。<br />
+         * baidu.dom._styleFixer和baidu.dom._styleFilter可以为本模块提供支持。<br />
+         * 其中_styleFilter能对颜色和px进行归一化处理，_styleFixer能对display，float，opacity，textOverflow的浏览器兼容性bug进行处理。	
+         * @shortcut getStyle
+         * @meta standard
+         * @see baidu.dom.setStyle,baidu.dom.setStyles, baidu.dom.getComputedStyle
+         *             
+         * @returns {string} 目标元素的样式值
+         */
+        baidu.dom.getStyle = function (element, key) {
+            var dom = baidu.dom;
+
+            element = dom.g(element);
+            key = baidu.string.toCamelCase(key);
+            //computed style, then cascaded style, then explicitly set style.
+            var value = element.style[key] ||
+                        (element.currentStyle ? element.currentStyle[key] : "") || 
+                        dom.getComputedStyle(element, key);
+
+            // 在取不到值的时候，用fixer进行修正
+            if (!value) {
+                var fixer = dom._styleFixer[key];
+                if(fixer){
+                    value = fixer.get ? fixer.get(element) : baidu.dom.getStyle(element, fixer);
+                }
+            }
+    
+            /* 检查结果过滤器 */
+            if (fixer = dom._styleFilter) {
+                value = fixer.filter(key, value, 'get');
+            }
+
+            return value;
+        };
+
+        // 声明快捷方法
+        baidu.getStyle = baidu.dom.getStyle;
+
+
+        if (/opera\/(\d+\.\d)/i.test(navigator.userAgent)) {
+        /**
+         * 判断是否为opera浏览器
+         * @property opera opera版本号
+         * @grammar baidu.browser.opera
+         * @meta standard
+         * @see baidu.browser.ie,baidu.browser.firefox,baidu.browser.safari,baidu.browser.chrome 
+         */
+            baidu.browser.opera = + RegExp['\x241'];
+        }
+
+        /**
+         * 判断是否为webkit内核
+         * @property isWebkit 
+         * @grammar baidu.browser.isWebkit
+         * @meta standard
+         * @see baidu.browser.isGecko
+         */
+        baidu.browser.isWebkit = /webkit/i.test(navigator.userAgent);
+
+        /**
+         * 判断是否为gecko内核
+         * @property isGecko 
+         * @grammar baidu.browser.isGecko
+         * @meta standard
+         * @see baidu.browser.isWebkit
+         */
+        baidu.browser.isGecko = /gecko/i.test(navigator.userAgent) && !/like gecko/i.test(navigator.userAgent);
+
+        /**
+         * 判断是否严格标准的渲染模式
+         * @property isStrict 
+         * @grammar baidu.browser.isStrict
+         * @meta standard
+         */
+        baidu.browser.isStrict = document.compatMode == "CSS1Compat";
+
+        /**
+         * 获取目标元素相对于整个文档左上角的位置
+         * @name baidu.dom.getPosition
+         * @function
+         * @grammar baidu.dom.getPosition(element)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @meta standard
+         *             
+         * @returns {Object} 目标元素的位置，键值为top和left的Object。
+         */
+        baidu.dom.getPosition = function (element) {
+            element = baidu.dom.g(element);
+            var doc = baidu.dom.getDocument(element), 
+                browser = baidu.browser,
+                getStyle = baidu.dom.getStyle,
+            // Gecko 1.9版本以下用getBoxObjectFor计算位置
+            // 但是某些情况下是有bug的
+            // 对于这些有bug的情况
+            // 使用递归查找的方式
+                BUGGY_GECKO_BOX_OBJECT = browser.isGecko > 0 && 
+                                         doc.getBoxObjectFor &&
+                                         getStyle(element, 'position') == 'absolute' &&
+                                         (element.style.top === '' || element.style.left === ''),
+                pos = {"left":0,"top":0},
+                viewport = (browser.ie && !browser.isStrict) ? doc.body : doc.documentElement,
+                parent,
+                box;
+    
+            if(element == viewport){
+                return pos;
+            }
+
+            if(element.getBoundingClientRect){ // IE and Gecko 1.9+
+        
+                //当HTML或者BODY有border width时, 原生的getBoundingClientRect返回值是不符合预期的
+                //考虑到通常情况下 HTML和BODY的border只会设成0px,所以忽略该问题.
+                box = element.getBoundingClientRect();
+
+                pos.left = Math.floor(box.left) + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft);
+                pos.top  = Math.floor(box.top)  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop);
+        
+                // IE会给HTML元素添加一个border，默认是medium（2px）
+                // 但是在IE 6 7 的怪异模式下，可以被html { border: 0; } 这条css规则覆盖
+                // 在IE7的标准模式下，border永远是2px，这个值通过clientLeft 和 clientTop取得
+                // 但是。。。在IE 6 7的怪异模式，如果用户使用css覆盖了默认的medium
+                // clientTop和clientLeft不会更新
+                pos.left -= doc.documentElement.clientLeft;
+                pos.top  -= doc.documentElement.clientTop;
+        
+                var htmlDom = doc.body,
+                    // 在这里，不使用element.style.borderLeftWidth，只有computedStyle是可信的
+                    htmlBorderLeftWidth = parseInt(getStyle(htmlDom, 'borderLeftWidth')),
+                    htmlBorderTopWidth = parseInt(getStyle(htmlDom, 'borderTopWidth'));
+                if(browser.ie && !browser.isStrict){
+                    pos.left -= isNaN(htmlBorderLeftWidth) ? 2 : htmlBorderLeftWidth;
+                    pos.top  -= isNaN(htmlBorderTopWidth) ? 2 : htmlBorderTopWidth;
+                }
+            } else { 
+                // safari/opera/firefox
+                parent = element;
+
+                do {
+                    pos.left += parent.offsetLeft;
+                    pos.top  += parent.offsetTop;
+      
+                    // safari里面，如果遍历到了一个fixed的元素，后面的offset都不准了
+                    if (browser.isWebkit > 0 && getStyle(parent, 'position') == 'fixed') {
+                        pos.left += doc.body.scrollLeft;
+                        pos.top  += doc.body.scrollTop;
+                        break;
+                    }
+            
+                    parent = parent.offsetParent;
+                } while (parent && parent != element);
+
+                // 对body offsetTop的修正
+                if(browser.opera > 0 || (browser.isWebkit > 0 && getStyle(element, 'position') == 'absolute')){
+                    pos.top  -= doc.body.offsetTop;
+                }
+
+                // 计算除了body的scroll
+                parent = element.offsetParent;
+                while (parent && parent != doc.body) {
+                    pos.left -= parent.scrollLeft;
+                    // see https://bugs.opera.com/show_bug.cgi?id=249965
+                    if (!browser.opera || parent.tagName != 'TR') {
+                        pos.top -= parent.scrollTop;
+                    }
+                    parent = parent.offsetParent;
+                }
+            }
+
+            return pos;
+        };
+
+        /**
+         * @ignore
+         * @namespace baidu.event 屏蔽浏览器差异性的事件封装。
+         * @property target 	事件的触发元素
+         * @property pageX 		鼠标事件的鼠标x坐标
+         * @property pageY 		鼠标事件的鼠标y坐标
+         * @property keyCode 	键盘事件的键值
+         */
+        baidu.event = baidu.event || {};
+
+        /**
+         * 事件监听器的存储表
+         * @private
+         * @meta standard
+         */
+        baidu.event._listeners = baidu.event._listeners || [];
+
+        /**
+         * 为目标元素添加事件监听器
+         * @name baidu.event.on
+         * @function
+         * @grammar baidu.event.on(element, type, listener)
+         * @param {HTMLElement|string|window} element 目标元素或目标元素id
+         * @param {string} type 事件类型
+         * @param {Function} listener 需要添加的监听器
+         * @remark
+         * 
+        1. 不支持跨浏览器的鼠标滚轮事件监听器添加<br>
+        2. 改方法不为监听器灌入事件对象，以防止跨iframe事件挂载的事件对象获取失败
+    
+         * @shortcut on
+         * @meta standard
+         * @see baidu.event.un
+         *             
+         * @returns {HTMLElement|window} 目标元素
+         */
+        baidu.event.on = function (element, type, listener) {
+            type = type.replace(/^on/i, '');
+            element = baidu.dom._g(element);
+
+            var realListener = function (ev) {
+                    // 1. 这里不支持EventArgument,  原因是跨frame的事件挂载
+                    // 2. element是为了修正this
+                    listener.call(element, ev);
+                },
+                lis = baidu.event._listeners,
+                filter = baidu.event._eventFilter,
+                afterFilter,
+                realType = type;
+            type = type.toLowerCase();
+            // filter过滤
+            if(filter && filter[type]){
+                afterFilter = filter[type](element, type, realListener);
+                realType = afterFilter.type;
+                realListener = afterFilter.listener;
+            }
+    
+            // 事件监听器挂载
+            if (element.addEventListener) {
+                element.addEventListener(realType, realListener, false);
+            } else if (element.attachEvent) {
+                element.attachEvent('on' + realType, realListener);
+            }
+  
+            // 将监听器存储到数组中
+            lis[lis.length] = [element, type, listener, realListener, realType];
+            return element;
+        };
+
+        // 声明快捷方法
+        baidu.on = baidu.event.on;
+
+        /**
+         * 返回一个当前页面的唯一标识字符串。
+         * @name baidu.lang.guid
+         * @function
+         * @grammar baidu.lang.guid()
+         * @version 1.1.1
+         * @meta standard
+         *             
+         * @returns {String} 当前页面的唯一标识字符串
+         */
+
+        (function(){
+            //不直接使用window，可以提高3倍左右性能
+            var guid = window[baidu.guid];
+
+            baidu.lang.guid = function() {
+                return "TANGRAM__" + (guid._counter ++).toString(36);
+            };
+
+            guid._counter = guid._counter || 1;
+        })();
+
+        /**
+         * 所有类的实例的容器
+         * key为每个实例的guid
+         * @meta standard
+         */
+
+        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
+
+        /**
+         * 判断目标参数是否为function或Function实例
+         * @name baidu.lang.isFunction
+         * @function
+         * @grammar baidu.lang.isFunction(source)
+         * @param {Any} source 目标参数
+         * @version 1.2
+         * @see baidu.lang.isString,baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
+         * @meta standard
+         * @returns {boolean} 类型判断结果
+         */
+        baidu.lang.isFunction = function (source) {
+            // chrome下,'function' == typeof /a/ 为true.
+            return '[object Function]' == Object.prototype.toString.call(source);
+        };
+
+        /**
+         *    
+         * @ignore
+         * @class  Tangram继承机制提供的一个基类，用户可以通过继承baidu.lang.Class来获取它的属性及方法。
+         * @name 	baidu.lang.Class
+         * @grammar baidu.lang.Class(guid)
+         * @param 	{string}	guid	对象的唯一标识
+         * @meta standard
+         * @remark baidu.lang.Class和它的子类的实例均包含一个全局唯一的标识guid。guid是在构造函数中生成的，因此，继承自baidu.lang.Class的类应该直接或者间接调用它的构造函数。<br>baidu.lang.Class的构造函数中产生guid的方式可以保证guid的唯一性，及每个实例都有一个全局唯一的guid。
+         * @meta standard
+         * @see baidu.lang.inherits,baidu.lang.Event
+         */
+        baidu.lang.Class = function(guid) {
+            this.guid = guid || baidu.lang.guid();
+            window[baidu.guid]._instances[this.guid] = this;
+        };
+        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
+
+        /**
+         * 释放对象所持有的资源，主要是自定义事件。
+         * @name dispose
+         * @grammar obj.dispose()
+         */
+        baidu.lang.Class.prototype.dispose = function(){
+            delete window[baidu.guid]._instances[this.guid];
+
+            for(var property in this){
+                if (!baidu.lang.isFunction(this[property])) {
+                    delete this[property];
+                }
+            }
+            this.disposed = true;
+        };
+
+        /**
+         * 重载了默认的toString方法，使得返回信息更加准确一些。
+         * @return {string} 对象的String表示形式
+         */
+        baidu.lang.Class.prototype.toString = function(){
+            return "[object " + (this._className || "Object" ) + "]";
+        };
+
+        /**
+         * @ignore
+         * @class   自定义的事件对象。
+         * @name 	baidu.lang.Event
+         * @grammar baidu.lang.Event(type[, target])
+         * @param 	{string} type	 事件类型名称。为了方便区分事件和一个普通的方法，事件类型名称必须以"on"(小写)开头。
+         * @param 	{Object} [target]触发事件的对象
+         * @meta standard
+         * @remark 引入该模块，会自动为Class引入3个事件扩展方法：addEventListener、removeEventListener和dispatchEvent。
+         * @meta standard
+         * @see baidu.lang.Class
+         */
+        baidu.lang.Event = function (type, target) {
+            this.type = type;
+            this.returnValue = true;
+            this.target = target || null;
+            this.currentTarget = null;
+        };
+
+        /**
+         * 注册对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.addEventListener(type, handler[, key])
+         * @param 	{string}   type         自定义事件的名称
+         * @param 	{Function} handler      自定义事件被触发时应该调用的回调函数
+         * @param 	{string}   [key]		为事件监听函数指定的名称，可在移除时使用。如果不提供，方法会默认为它生成一个全局唯一的key。
+         * @remark 	事件类型区分大小写。如果自定义事件名称不是以小写"on"开头，该方法会给它加上"on"再进行判断，即"click"和"onclick"会被认为是同一种事件。 
+         */
+        baidu.lang.Class.prototype.addEventListener = function (type, handler, key) {
+            if (!baidu.lang.isFunction(handler)) {
+                return;
+            }
+
+            !this.__listeners && (this.__listeners = {});
+
+            var t = this.__listeners, id;
+            if (typeof key == "string" && key) {
+                if (/[^\w\-]/.test(key)) {
+                    throw("nonstandard key:" + key);
+                } else {
+                    handler.hashCode = key; 
+                    id = key;
+                }
+            }
+            type.indexOf("on") != 0 && (type = "on" + type);
+
+            typeof t[type] != "object" && (t[type] = {});
+            id = id || baidu.lang.guid();
+            handler.hashCode = id;
+            t[type][id] = handler;
+        };
+ 
+        /**
+         * 移除对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.removeEventListener(type, handler)
+         * @param {string}   type     事件类型
+         * @param {Function|string} handler  要移除的事件监听函数或者监听函数的key
+         * @remark 	如果第二个参数handler没有被绑定到对应的自定义事件中，什么也不做。
+         */
+        baidu.lang.Class.prototype.removeEventListener = function (type, handler) {
+            if (typeof handler != "undefined") {
+                if ( (baidu.lang.isFunction(handler) && ! (handler = handler.hashCode))
+                    || (! baidu.lang.isString(handler))
+                ){
+                    return;
+                }
+            }
+
+            !this.__listeners && (this.__listeners = {});
+
+            type.indexOf("on") != 0 && (type = "on" + type);
+
+            var t = this.__listeners;
+            if (!t[type]) {
+                return;
+            }
+            if (typeof handler != "undefined") {
+                t[type][handler] && delete t[type][handler];
+            } else {
+                for(var guid in t[type]){
+                    delete t[type][guid];
+                }
+            }
+        };
+
+        /**
+         * 派发自定义事件，使得绑定到自定义事件上面的函数都会被执行。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.dispatchEvent(event, options)
+         * @param {baidu.lang.Event|String} event 	Event对象，或事件名称(1.1.1起支持)
+         * @param {Object} 					options 扩展参数,所含属性键值会扩展到Event对象上(1.2起支持)
+         * @remark 处理会调用通过addEventListenr绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
+        myobj.onMyEvent = function(){}<br>
+        myobj.addEventListener("onMyEvent", function(){});
+         */
+        baidu.lang.Class.prototype.dispatchEvent = function (event, options) {
+            if (baidu.lang.isString(event)) {
+                event = new baidu.lang.Event(event);
+            }
+            !this.__listeners && (this.__listeners = {});
+
+            // 20100603 添加本方法的第二个参数，将 options extend到event中去传递
+            options = options || {};
+            for (var i in options) {
+                event[i] = options[i];
+            }
+
+            var i, t = this.__listeners, p = event.type;
+            event.target = event.target || this;
+            event.currentTarget = this;
+
+            p.indexOf("on") != 0 && (p = "on" + p);
+
+            baidu.lang.isFunction(this[p]) && this[p].apply(this, arguments);
+
+            if (typeof t[p] == "object") {
+                for (i in t[p]) {
+                    t[p][i].apply(this, arguments);
+                }
+            }
+            return event.returnValue;
+        };
+
+
+        baidu.lang.inherits = function (subClass, superClass, className) {
+            var key, proto,
+                selfProps = subClass.prototype,
+                clazz = new Function();
+
+            clazz.prototype = superClass.prototype;
+            proto = subClass.prototype = new clazz();
+            for (key in selfProps) {
+                proto[key] = selfProps[key];
+            }
+            subClass.prototype.constructor = subClass;
+            subClass.superClass = superClass.prototype;
+
+            // 类名标识，兼容Class的toString，基本没用
+            if ("string" == typeof className) {
+                proto._className = className;
+            }
+        };
+        // 声明快捷方法
+        baidu.inherits = baidu.lang.inherits;
+    })();
+
+
+    /**
+    
+     * 图片的路径
+
+     * @private
+     * @type {String}
+    
+     */
+    var _IMAGE_PATH = 'http://api.map.baidu.com/library/TextIconOverlay/1.2/src/images/m';
+
+    /**
+    
+     * 图片的后缀名
+
+      * @private
+     * @type {String}
+    
+     */
+    var _IMAGE_EXTENSION  = 'png';
+
+    /**
+     *@exports TextIconOverlay as BMapLib.TextIconOverlay
+     */
+    var TextIconOverlay = 
+        /**
+        * TextIconOverlay
+        * @class 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。文字通常是数字（0-9）或字母（A-Z ），而文字与图标之间有一定的映射关系。
+        *该覆盖物适用于以下类似的场景：需要在地图上添加一系列覆盖物，这些覆盖物之间用不同的图标和文字来区分，文字可能表示了该覆盖物的某一属性值，根据该文字和一定的映射关系，自动匹配相应颜色和大小的图标。
+        *
+        *@constructor
+        *@param {Point} position 表示一个经纬度坐标位置。
+        *@param {String} text 表示该覆盖物显示的文字信息。
+        *@param {Json Object} options 可选参数，可选项包括：<br />
+        *"<b>styles</b>":{Array<IconStyle>} 一组图标风格。单个图表风格包括以下几个属性：<br />
+        *   url	{String}	 图片的url地址。(必选)<br />
+        *   size {Size}	图片的大小。（必选）<br />
+        *   anchor {Size} 图标定位在地图上的位置相对于图标左上角的偏移值，默认偏移值为图标的中心位置。（可选）<br />
+        *   offset {Size} 图片相对于可视区域的偏移值，此功能的作用等同于CSS中的background-position属性。（可选）<br />
+        *   textSize {Number} 文字的大小。（可选，默认10）<br />
+        *   textColor {String} 文字的颜色。（可选，默认black）<br />
+        */
+        BMapLib.TextIconOverlay = function(position, text, options){
+            this._position = position;
+            this._text = text;
+            this._options = options || {};
+            this._styles = this._options['styles'] || [];
+            (!this._styles.length) && this._setupDefaultStyles();                  
+        };
+
+    T.lang.inherits(TextIconOverlay, BMap.Overlay, "TextIconOverlay");
+
+    TextIconOverlay.prototype._setupDefaultStyles = function(){  
+        var sizes = [53, 56, 66, 78, 90];
+        for(var i = 0, size; size = sizes[i]; i++){
+            this._styles.push({
+                url:_IMAGE_PATH + i + '.' + _IMAGE_EXTENSION,
+                size: new BMap.Size(size, size)
+            });
+        }//for循环的简洁写法
+    };
+
+    /**
+    *继承Overlay的intialize方法，自定义覆盖物时必须。
+    *@param {Map} map BMap.Map的实例化对象。
+    *@return {HTMLElement} 返回覆盖物对应的HTML元素。
+    */
+    TextIconOverlay.prototype.initialize = function(map){
+        this._map = map;
+    
+        this._domElement = document.createElement('div');     
+        this._updateCss();    
+        this._updateText();
+        this._updatePosition(); 
+        
+        this._bind();
+
+        this._map.getPanes().markerMouseTarget.appendChild(this._domElement);
+        return this._domElement;   
+    };
+
+    /**
+    *继承Overlay的draw方法，自定义覆盖物时必须。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.draw = function(){
+        this._map && this._updatePosition();
+    };
+    
+    /**
+    *获取该覆盖物上的文字。
+    *@return {String} 该覆盖物上的文字。
+    */
+    TextIconOverlay.prototype.getText = function(){
+        return this._text;
+    };
+
+    /**
+    *设置该覆盖物上的文字。
+    *@param {String} text 要设置的文字，通常是字母A-Z或数字0-9。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.setText = function(text){
+        if(text && (!this._text || (this._text.toString() != text.toString()))){
+            this._text = text;
+            this._updateText();
+            this._updateCss();
+            this._updatePosition(); 
+        }
+    };
+
+    /**
+    *获取该覆盖物的位置。
+    *@return {Point} 该覆盖物的经纬度坐标。
+    */
+    TextIconOverlay.prototype.getPosition = function () {
+        return this._position;
+    };
+   
+    /**
+    *设置该覆盖物的位置。
+    *@param {Point}  position 要设置的经纬度坐标。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.setPosition = function (position) {
+        if(position && (!this._position || !this._position.equals(position))){
+            this._position = position;  
+            this._updatePosition();
+        }
+    };
+
+    /**
+    *由文字信息获取风格数组的对应索引值。
+    *内部默认的对应函数为文字转换为数字除以10的结果，比如文字8返回索引0，文字25返回索引2.
+    *如果需要自定义映射关系，请覆盖该函数。
+    *@param {String} text  文字。
+    *@param {Array<IconStyle>}  styles 一组图标风格。
+    *@return {Number} 对应的索引值。
+    */
+    TextIconOverlay.prototype.getStyleByText = function(text, styles){
+        var count = parseInt(text);
+        var index = parseInt(count / 10);
+        index = Math.max(0, index);
+        index = Math.min(index, styles.length - 1);
+        return styles[index]; 
+    }
+
+    /**
+    *更新相应的CSS。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updateCss = function(){
+        var style = this.getStyleByText(this._text, this._styles);
+        this._domElement.style.cssText = this._buildCssText(style);
+    };
+
+    /**
+    *更新覆盖物的显示文字。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updateText = function(){
+        if (this._domElement) {
+            this._domElement.innerHTML = this._text;
+        }
+    };
+
+    /**
+    *调整覆盖物在地图上的位置更新覆盖物的显示文字。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updatePosition = function(){
+        if (this._domElement && this._position) {
+            var style = this._domElement.style;
+            var pixelPosition= this._map.pointToOverlayPixel(this._position); 
+            pixelPosition.x -= Math.ceil(parseInt(style.width) / 2);
+            pixelPosition.y -= Math.ceil(parseInt(style.height) / 2);       
+            style.left = pixelPosition.x + "px";
+            style.top = pixelPosition.y + "px";
+        }
+    };
+    
+    /**
+    * 为该覆盖物的HTML元素构建CSS
+    * @param {IconStyle}  一个图标的风格。
+    * @return {String} 构建完成的CSSTEXT。
+    */
+    TextIconOverlay.prototype._buildCssText = function(style) {    
+        //根据style来确定一些默认值
+        var url = style['url'];
+        var size = style['size'];
+        var anchor = style['anchor'];
+        var offset = style['offset'];
+        var textColor = style['textColor'] || 'black';
+        var textSize = style['textSize'] || 10;
+
+        var csstext = [];
+        if (T.browser["ie"] < 7) {
+            csstext.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
+                'sizingMethod=scale,src="' + url + '");');
+        } else {
+            csstext.push('background-image:url(' + url + ');');
+            var backgroundPosition = '0 0';
+            (offset instanceof BMap.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');          
+            csstext.push('background-position:' + backgroundPosition + ';');
+        }
+
+        if (size instanceof BMap.Size){
+            if (anchor instanceof BMap.Size) {
+                if (anchor.height > 0 && anchor.height < size.height) {
+                      csstext.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
+                }
+                if(anchor.width > 0 && anchor.width < size.width){
+                    csstext.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');                
+                }
+            } else {
+                csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
+                csstext.push('width:' + size.width + 'px; text-align:center;');
+            }
+        }
+   
+        csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
+            textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
+        return csstext.join('');
+    };
+
+
+    /**
+    
+     * 当鼠标点击该覆盖物时会触发该事件
+
+     * @name TextIconOverlay#click
+
+     * @event
+
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+    
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     *
+
+     */
+
+    /**
+
+     * 当鼠标进入该覆盖物区域时会触发该事件
+
+     * @name TextIconOverlay#mouseover
+
+     * @event
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+    
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+
+     *
+
+     * @example <b>参考示例：</b><br />
+
+     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
+
+     */
+
+    /**
+
+     * 当鼠标离开该覆盖物区域时会触发该事件
+
+     * @name TextIconOverlay#mouseout
+
+     * @event
+
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+
+     *
+
+     * @example <b>参考示例：</b><br />
+
+     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
+
+     */
+
+
+    /**
+    * 为该覆盖物绑定一系列事件
+    * 当前支持click mouseover mouseout
+    * @return 无返回值。
+    */
+    TextIconOverlay.prototype._bind = function(){
+        if (!this._domElement){
+            return;
+        }
+
+        var me = this;
+        var map = this._map;
+
+        var BaseEvent = T.lang.Event;
+        function eventExtend(e, be){
+            var elem = e.srcElement || e.target;
+            var x = e.clientX || e.pageX;
+            var y = e.clientY || e.pageY;
+            if (e && be && x && y && elem){
+                var offset = T.dom.getPosition(map.getContainer());
+                be.pixel = new BMap.Pixel(x - offset.left, y - offset.top);
+                be.point = map.pixelToPoint(be.pixel);
+            }
+            return be;
+        }//给事件参数增加pixel和point两个值
+
+        T.event.on(this._domElement,"mouseover", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseover")));
+        });
+        T.event.on(this._domElement,"mouseout", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseout")));
+        });
+        T.event.on(this._domElement,"click", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onclick")));
+        });
+    };
+
+})();
 \ No newline at end of file
@@ -31,10 +31,12 @@
 	<div class="item" data-click="search">
 		<i class="fa fa-search"></i> &nbsp;搜索
 	</div>
-	<div class="item" data-click="notice">
+	<!-- <div class="item" data-click="notice"> -->
+	<div class="item" >
 		<i class="fa fa-bell-o"></i> &nbsp;通知
 	</div>
-	<div class="item" data-click="playBack">
+	<!-- <div class="item" data-click="playBack"> -->
+	<div class="item" >
 		<i class="fa fa-history"></i> &nbsp;回放
 	</div>
 </div>
@@ -44,6 +46,8 @@
 <div id="temps"></div>
+<script src="/pages/mapmonitor/real/plugins/TextIconOverlay.js"></script>
+<script src="/pages/mapmonitor/real/plugins/MarkerClusterer.js"></script>
 <script src="/pages/mapmonitor/real/js/map_platform.js"></script>
 <script src="/pages/mapmonitor/real/js/vehicle.js"></script>
 <script src="/pages/mapmonitor/real/js/search.js"></script>
 <script id="vehicle_panel_temp" type="text/html">
 <div class="gps-line-wrap">
 {{each list as line i}}
-<a data-toggle="collapse" href="#collapse_{{line.lineCode}}" aria-expanded="true" style="text-decoration:none">
+<a data-toggle="collapse" href="#collapse_{{line.lineCode}}" style="text-decoration:none" class="collapseLink">
 <p class="head" >
 	{{line.name}}
 	<span class="icon rotate">
@@ -14,7 +14,7 @@
 	<!--
 	<div class="vehicle-item offline" >
 		<div class="text">
-			 <span><i class="fa fa-circle"></i> &nbsp;W1B-397</span> 
+			 <span class="goto-marker" data-deviceId="{{deviceId}}"><i class="fa fa-circle"></i> &nbsp;W1B-397</span> 
 			 &nbsp;&nbsp;&nbsp;
 			 已掉线10分钟
 		</div>
@@ -31,7 +31,7 @@
 {{each list as gpsObj i}}
 	<div class="vehicle-item online" >
 		<div class="text">
-			 <span class="nbbm"><i class="fa fa-circle"></i> &nbsp;{{gpsObj.nbbm}}</span> 
+			 <span class="nbbm goto-marker" data-deviceId="{{gpsObj.deviceId}}"><i class="fa fa-circle"></i> &nbsp;{{gpsObj.nbbm}}</span> 
 			 &nbsp;&nbsp;&nbsp;
 			<span style="font-size: 13px;">{{gpsObj.stationName}}</span>
 		</div>
@@ -40,4 +40,56 @@
 		</div>
 	</div>
 {{/each}}
+{{if list.length == 0}}
+<div class="map-gps-empty">没有相关数据</div>
+{{/if}}
+</script>
+
+<!-- gps信息窗口 -->
+<script id="gps_info_win_temp" type="text/html">
+<div class="gps_info_win">
+<h4 style="color:#0E6AF9;">
+{{if stationName!=null}}
+	{{stationName}}
+{{else}}
+	未知站点
+{{/if}}
+
+{{if upDown == 0}}
+（上行）
+{{else if upDown == 1}}
+（下行）
+{{else}}
+（未知的上下行）
+{{/if}}
+</h4>
+<h4 style="color: #0E6AF9;margin: 5px 0 5px 0;">
+	{{nbbm}}
+</h4>
+<p>
+路牌：
+{{if currSch!=null}}
+	{{currSch.lpName}}
+{{/if}}
+</p>
+<p>
+营运状态：{{if state==0}}营运{{else}}非营运{{/if}}
+</p>
+<p>
+在线状态：在线
+</p>
+<p>速度：{{speed}}</p>
+<hr>
+<p class="banci-info">
+	开往
+	{{if currSch!=null}}{{currSch.zdzName}}{{/if}}
+	( 预计 未知时间 到达 )
+</p>
+<p class="banci-info">
+{{if nextSch!=null}}
+	下一班{{nextSch.qdzName}} {{nextSch.fcsj}} 发车
+{{/if}}
+</p>
+<a href="javascript:void(0)" style="color:#006600;font-size:12px;">轨迹回放</a>
+</div>
 </script>
 \ No newline at end of file