Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

徐烜
2 parents 4a83e333 c0ebd39f
Showing 38 changed files with 1651 additions and 472 deletions
src/main/java/com/bsth/ServiceStateTest.java
src/main/java/com/bsth/util/DateUtils.java
src/main/java/com/bsth/util/TransGPS.java
src/main/java/com/bsth/vehicle/directive/controller/DirectiveController.java
src/main/java/com/bsth/vehicle/directive/entity/Directive80.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveService.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/controller/GpsDataController.java
src/main/java/com/bsth/vehicle/gpsdata/service/GpsDataServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/static/assets/js/TransGPS.js
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
src/main/resources/static/pages/control/line/child_pages/deviceReport.html
src/main/resources/static/pages/control/line/child_pages/ttsConfigure.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/main.js
+package com.bsth;
+
+public class ServiceStateTest {
+
+	public static void main(String[] args) {
+		System.out.println("运营状态：" + getService(33554432));
+		System.out.println("上下行：" + getUpOrDown(33554432));
+	}
+
+	/**
+	 * 获取运营状态
+	 * 
+	 * @return -1无效 0运营 1未运营
+	 */
+	public static byte getService(long serviceState) {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
+			return -1;
+		return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
+	}
+
+	/**
+	 * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+	 * 
+	 * @return -1无效 0上行 1下行
+	 */
+	public static byte getUpOrDown(long serviceState) {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+				|| (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+			return -1;
+		return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+	}
+}
@@ -14,6 +14,16 @@ public class DateUtils {
 		return (int) (cal.getTimeInMillis() / 1000);
 	}
  
+	// 获得当天0点毫秒时间戳
+	public static long getTimestamp() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTimeInMillis();
+	}
+	
 	public static Long getTimesmorning(Calendar cal) {
 		cal.set(Calendar.HOUR_OF_DAY, 0);
 		cal.set(Calendar.SECOND, 0);
@@ -118,4 +118,14 @@ public class TransGPS {
 		double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
 		return LocationMake(z * Math.cos(theta), z * Math.sin(theta));
 	}
+	
+/*	public static void main(String[] args) {
+		Location loc = LocationMake(121.359627, 31.030046);
+		
+		loc = transformFromWGSToGCJ(loc);
+		
+		loc = bd_encrypt(loc);
+		System.out.println(loc.lng);
+		System.out.println(loc.lat);
+	}*/
 }
@@ -4,6 +4,10 @@ import java.util.List;
 import java.util.Map;
  
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
+import com.bsth.util.DateUtils;
 import com.bsth.vehicle.directive.entity.Directive80;
 import com.bsth.vehicle.directive.service.DirectiveService;
  
@@ -93,6 +98,14 @@ public class DirectiveController {
 		return directiveService.findNoCofm80(lineCodes);
 	}
  
+	@RequestMapping(value = "/findAll80", method = RequestMethod.GET)
+	public Page<Directive80> findAll80(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "12") int size){
+		
+		return directiveService.findAll80(map, new PageRequest(page, size, new Sort(Direction.DESC, "timestamp")));
+	}
+	
 	/**
 	 * 
 	 * @Title: reply80 
 package com.bsth.vehicle.directive.entity;
  
+import java.util.Date;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
@@ -60,9 +62,15 @@ public class Directive80 {
 	/** 调度员是否确认 */
 	private boolean confirm;
  
+	/** 处理人 */
+	private String handleUser;
+	
 	/** 处理结果 0：同意  -1：不同意 */
 	private int confirmRs;
-
+	
+	/** 处理时间 */
+	private Date handleTime;
+	
 	@Embeddable
 	public static class DriverReportData {
  
@@ -120,6 +128,9 @@ public class Directive80 {
 			this.nbbm = nbbm;
 		}
 	}
+	
+	@Transient
+	private String timeStr;
  
 	public Integer getId() {
 		return id;
@@ -184,4 +195,28 @@ public class Directive80 {
 	public void setConfirmRs(int confirmRs) {
 		this.confirmRs = confirmRs;
 	}
+
+	public String getHandleUser() {
+		return handleUser;
+	}
+
+	public void setHandleUser(String handleUser) {
+		this.handleUser = handleUser;
+	}
+
+	public String getTimeStr() {
+		return timeStr;
+	}
+
+	public void setTimeStr(String timeStr) {
+		this.timeStr = timeStr;
+	}
+
+	public Date getHandleTime() {
+		return handleTime;
+	}
+
+	public void setHandleTime(Date handleTime) {
+		this.handleTime = handleTime;
+	}
 }
@@ -4,6 +4,9 @@ package com.bsth.vehicle.directive.service;
 import java.util.List;
 import java.util.Map;
  
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
 import com.bsth.vehicle.directive.entity.Directive60;
@@ -77,4 +80,6 @@ public interface DirectiveService extends BaseService&lt;Directive60, Integer&gt;{
 	Map<String, Object> reply80(int id, int reply);
  
 	Map<String, Object> findDirective(String nbbm, int dType, int page, int size);
+
+	Page<Directive80> findAll80(Map<String, Object> map, PageRequest pageRequest);
 }
@@ -12,14 +12,20 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
  
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.util.DateUtils;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
 import com.bsth.vehicle.directive.entity.Directive;
@@ -342,8 +348,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 			rs.put("status", ResponseCode.ERROR);
 			rs.put("msg", "该数据已经被处理了！");
 		} else {
+			SysUser user = SecurityUtils.getCurrentUser();
+			
 			d80.setConfirm(true);
+			d80.setHandleUser(user.getUserName());
 			d80.setConfirmRs(reply);
+			d80.setHandleTime(new Date());
 			// 封装C0数据包并回复设备
 			DirectiveC0 c0 = new DirectiveC0();
 			c0.setDeviceId(d80.getDeviceId());
@@ -440,4 +450,24 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		rsMap.put("page", page);
 		return rsMap;
 	}
+
+	@Override
+	public Page<Directive80> findAll80(Map<String, Object> map, PageRequest pageRequest) {
+		//默认只查看当天的
+		map.put("timestamp_gt", DateUtils.getTimestamp());
+		
+		Object nbbm = map.get("nbbm");
+		if(null != nbbm && StringUtils.isNotBlank(nbbm.toString())){
+			map.put("deviceId_eq", CommonMapped.vehicDeviceBiMap.inverse().get(nbbm.toString()));
+		}
+		
+		Page<Directive80> pageData = d80Repository.findAll(new CustomerSpecs<Directive80>(map), pageRequest);
+		//格式化时间和转换车辆自编号
+		List<Directive80> list = pageData.getContent();
+		for(Directive80 d80 : list){
+			d80.setTimeStr(sdfHHmm2.format(new Date(d80.getTimestamp())));
+			d80.getData().setNbbm(CommonMapped.vehicDeviceBiMap.get(d80.getDeviceId()));
+		}
+		return pageData;
+	}
 }
@@ -163,31 +163,39 @@ public class GpsRealDataBuffer {
 						gpsData.setNextSchId(next.getId());
  
 				}
-				/*if(null == current){
-					next = ScheduleBuffer.getFirst(nbbm);
-				}
-				else
-					next = ScheduleBuffer.getNext(current);*/
-				
-				/*if(current != null)
-					gpsData.setCurrSchId(current.getId());
-				if(next != null)
-					gpsData.setNextSchId(next.getId());*/
-				//gpsData.setCurrSchId(ScheduleBuffer.findCurrent(nbbm));
-				/*subList = ScheduleBuffer.vehSchListMap.get(nbbm);
-				if(subList.size() == 0)
-					continue;*/
+				resList.add(gpsData);
+			}
+		}
+		return resList;
+	}
+	
+	
+	public List<GpsRealData> getOnlineListByLineCode(Integer lineCode){
+		List<GpsRealData> list = lineGpsMultimap.get(lineCode)
+					,resList = new ArrayList<>();
+		
+		//写入车辆自编号
+		String nbbm;
+		ScheduleRealInfo current, next;
+		for(GpsRealData gpsData : list){
+			if(!gpsData.isOnline())
+				continue;
+			
+			nbbm = CommonMapped.vehicDeviceBiMap.get(gpsData.getDeviceId());
+			if(null != nbbm){
+				gpsData.setNbbm(nbbm);
+				gpsData.setStationName(CommonMapped.stationCodeMap.get(gpsData.getStopNo()));
  
+				current = ScheduleBuffer.findCurrent(nbbm);
  
-				/*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());
-				}*/
+				if(null != current){
+					gpsData.setCurrSchId(current.getId());
+					
+					next = ScheduleBuffer.getNext(current);
+					if(next != null)
+						gpsData.setNextSchId(next.getId());
+					
+				}
 				resList.add(gpsData);
 			}
 		}
@@ -208,7 +216,7 @@ public class GpsRealDataBuffer {
 		Integer code;
 		while(iterator.hasNext()){
 			code = Integer.parseInt(iterator.next());
-			list.addAll(getListByLineCode(code));
+			list.addAll(getOnlineListByLineCode(code));
 		}
  
 		return list;
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.gpsdata.buffer.ArrivalDataBuffer;
 import com.bsth.vehicle.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
@@ -62,4 +63,9 @@ public class GpsDataController {
 	public List<ArrivalInfo> ramData(@RequestParam String nbbm){
 		return ArrivalDataBuffer.allMap.get(nbbm);
 	}
+	
+	@RequestMapping(value = "/Car2DeviceId")
+	public Map<String, String> findCarDeviceIdMap(){
+		return CommonMapped.vehicDeviceBiMap.inverse();
+	}
 }
@@ -212,15 +212,16 @@ public class GpsDataServiceImpl implements GpsDataService{
 				lat = rs.getFloat("LAT");
 				//高德坐标
 				gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
-				map.put("gd_lon", gdLoc.getLng());
-				map.put("gd_lat", gdLoc.getLat());
+				map.put("gcj_lon", gdLoc.getLng());
+				map.put("gcj_lat", gdLoc.getLat());
 				//百度坐标
 				bdLoc = TransGPS.bd_encrypt(gdLoc);
 				map.put("bd_lon", bdLoc.getLng());
 				map.put("bd_lat", bdLoc.getLat());
  
-				map.put("device", rs.getString("DEVICE_ID"));
+				map.put("deviceId", rs.getString("DEVICE_ID"));
 				map.put("ts", rs.getLong("TS"));
+				map.put("timestamp", rs.getLong("TS"));
 				map.put("stopNo", rs.getString("STOP_NO"));
  
 				inOutStop = rs.getInt("INOUT_STOP");
@@ -15,7 +15,6 @@ import com.bsth.common.Constants;
 import com.bsth.vehicle.common.CommonMapped;
  
 /**
- * 驾驶员上报80指令推送
  * 注意：在sendMsg时，多线程状态下有几率出现连接状态脏读，建议 synchronized
  * @author PanZhao
  */
+/** GCJ WGS BD 等坐标转换算法，从 TransGPS.java 代码转换而来*/
+var TransGPS = (function(){
+	var pi = 3.14159265358979324
+		,a = 6378245.0
+		,ee = 0.00669342162296594323;
+	
+	
+	function outOfChina(lat, lon){
+		if (lon < 72.004 || lon > 137.8347)
+			return 1;
+		if (lat < 0.8293 || lat > 55.8271)
+			return 1;
+		return 0;
+	}
+	
+	function transformLat(x, y){
+		var ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(x > 0 ? x : -x);
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
+		return ret;
+	}
+	
+	function transformLon(x, y){
+		var ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(x > 0 ? x : -x);
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0;
+		return ret;
+	}
+	
+	function transformFromWGSToGCJ(lat, lng){
+		var mgLoc = {};
+		if(1 == outOfChina(lat, lng)){
+			mgLoc = {lat: lat, lng: lng};
+			return mgLoc;
+		}
+		
+		var dLat = transformLat(lng - 105.0, lat - 35.0);
+		var dLon = transformLon(lng - 105.0, lat - 35.0);
+		var radLat = lat / 180.0 * pi;
+		var magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		
+		var sqrtMagic = Math.sqrt(magic);
+		
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		
+		mgLoc['lat'] = lat + dLat;
+		mgLoc['lng'] = lng + dLon;
+		
+		return mgLoc;
+	}
+	
+	function transformFromGCJToWGS(lat, lng){
+		var wgLoc = {lat: lat, lng: lng}
+			,currGcLoc = {}, dLoc = {};
+		
+		while (true) {
+			currGcLoc = transformFromWGSToGCJ(lat, lng);
+			dLoc.lat = lat - currGcLoc.lat;
+			dLoc.lng = lng - currGcLoc.lng;
+			if (Math.abs(dLoc.lat) < 1e-7 && Math.abs(dLoc.lng) < 1e-7) {
+				return wgLoc;
+			}
+			wgLoc.lat += dLoc.lat;
+			wgLoc.lng += dLoc.lng;
+		}
+	}
+	
+	var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	
+	function bd_encrypt(lat, lng){
+		var x = lng, y = lat;
+		var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+		var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+		
+		return {lng: z * Math.cos(theta) + 0.0065, lat: z * Math.sin(theta) + 0.006};
+	}
+	
+	function bd_decrypt(lat, lng){
+		var x = bdLoc.lng - 0.0065, y = bdLoc.lat - 0.006;
+		var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+		var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+		
+		return {lng: z * Math.cos(theta), lat: z * Math.sin(theta)};
+	}
+	
+	var transGPS = {
+		wgsToBD: function(lat, lng){
+			var gcj = transformFromWGSToGCJ(lat, lng);
+			return bd_encrypt(gcj.lat, gcj.lng);
+		},
+		transformFromWGSToGCJ: transformFromWGSToGCJ
+	}
+	
+	return transGPS;
+})();
 \ No newline at end of file
@@ -241,42 +241,45 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 						// 如果线路信息不为空
 						if(BusLine){
  
-							if(BusLine.zB.length == 0){
-								
-								// 根据坐标点获取两点之间的折线路段
-								map.getSectionListPlonly(stationdataList,function(sectiondata) {
-									
-									// 定义路段信息字符串
-									var sectionJSON = JSON.stringify(sectiondata);
-									
-									// 路段信息JSON字符串
-									params.sectionJSON = sectionJSON;
-									
-									addSave(params,addLine.id,directionData);
-									
-								});
+							// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
+							var Polygon = BusLine.getPolyline();
+							
+							// 返回多边型的点数组（自1.2新增）
+							var polyGonArray = Polygon.getPath();
+							
+							var jsonArray = [{sectionName:lineNameV+dirStr,points:polyGonArray}];
+							
+							// 定义路段信息字符串
+							var sectionJSON = JSON.stringify(jsonArray);
+							
+							// 路段信息JSON字符串
+							params.sectionJSON = sectionJSON;
+							
+							addSave(params,addLine.id,directionData);
+							/* if(BusLine.zB.length == 0){
  
  
  
 							}else {
  
-								// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
-								var Polygon = BusLine.getPolyline();
-								
-								// 返回多边型的点数组（自1.2新增）
-								var polyGonArray = Polygon.getPath();
-								
-								var jsonArray = [{sectionName:lineNameV+dirStr,points:polyGonArray}];
+							} */
+						}else {
+							
+							
+							// 根据坐标点获取两点之间的折线路段
+							map.getSectionListPlonly(stationdataList,function(sectiondata) {
  
 								// 定义路段信息字符串
-								var sectionJSON = JSON.stringify(jsonArray);
+								var sectionJSON = JSON.stringify(sectiondata);
  
 								// 路段信息JSON字符串
 								params.sectionJSON = sectionJSON;
  
 								addSave(params,addLine.id,directionData);
  
-							}
+							});
+							
+							
 						} 
 					});
  
@@ -249,9 +249,7 @@ var PublicFunctions = function () {
 					// 如果线路信息不为空
 					if(BusLine) {
  
-						console.log(BusLine);
-						
-						if(BusLine.zB.length == 0){
+						/*if(BusLine.zB.length == 0){
  
 							layer.confirm('系统生成该线路【'+lineNameV+'】时获取站点与路段异常！请联系管理员或者检查网络连接是否异常！', {
 								btn : [ '确认' ]
@@ -277,7 +275,7 @@ var PublicFunctions = function () {
 								return ;
 							});
  
-						}
+						}*/
  
 						// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
 						var Polygon = BusLine.getPolyline();
@@ -175,11 +175,24 @@ var WorldsBMap = function () {
  
 			            		  if(r.message=='ok') {
  
-			            			  // 获取距离(单位：米)
-			            			  points[index+1].distance = r.result.taxi.distance;
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
  
-			            			  // 获取时间(单位：秒)
-			            			  points[index+1].duration = r.result.taxi.duration;
  
 			            		  }
  
@@ -367,9 +380,6 @@ var WorldsBMap = function () {
 			// 画圆
 			pointsCircle : function(objStation) {
  
-				
-				console.log(objStation);
-				
 				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
 				mapBValue.setZoom(16);
  
@@ -928,7 +938,7 @@ var WorldsBMap = function () {
 							//获取第一个公交列表显示到map上
 							var fstLine = BusListResult.getBusListItem(i);
  
-							if(fstLine==undefined){
+							/*if(fstLine==undefined){
  
 								layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
  
@@ -947,6 +957,13 @@ var WorldsBMap = function () {
 									return;
 								});
  
+							}*/
+							
+							if(fstLine==undefined){
+								
+								
+								callback && callback(null);
+								
 							}
  
 							busline.getBusLine(fstLine);
-<div id="historyMessagePanel" style="margin: 15px 0 0 0;">
+<div id="deviceReportPanel" style="margin: 15px 0 0 0;">
 	<h4 style="padding: 5px 0 10px 15px;margin: 0;"><i class="fa fa-code-fork"></i> 设备请求上报记录</h4>
 	<form class="form-inline" >
 		<div class="form-group" style="margin: 18px;">
@@ -29,9 +29,9 @@
 		<table class="table table-hover" style="table-layout: fixed;">
 			<thead>
 				<tr>
-					<th width="9%" style="text-align: center;">位置</th>
-					<th width="9%">时间</th>
+					<th width="9%">线路</th>
 					<th width="11%">车辆</th>
+					<th width="9%">时间</th>
 					<th width="24%">请求代码</th> 
 					<th width="10%">处理人</th>
 					<th width="10%">处理时间</th>
@@ -39,60 +39,6 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr>
-					<td width="7%" style="text-align: center;">位置</td>
-					<td>05:30</td>
-					<td>B-92875</td>
-					<td>请求出场</td> 
-					<td>mh001</td>
-					<td>05:31</td>
-					<td><span class="label label-sm label-success"> 同意</span></td>
-				</tr>
-				<tr>
-					<td width="7%" style="text-align: center;">位置</td>
-					<td>05:30</td>
-					<td>B-92875</td>
-					<td>请求出场</td> 
-					<td>mh001</td>
-					<td>05:31</td>
-					<td><span class="label label-sm label-success"> 同意</span></td>
-				</tr>
-				<tr>
-					<td width="7%" style="text-align: center;">位置</td>
-					<td>05:30</td>
-					<td>B-92875</td>
-					<td>请求出场</td> 
-					<td>mh001</td>
-					<td>05:31</td>
-					<td><span class="label label-sm label-success"> 同意</span></td>
-				</tr>
-				<tr>
-					<td width="7%" style="text-align: center;">位置</td>
-					<td>05:30</td>
-					<td>B-92875</td>
-					<td>请求出场</td> 
-					<td>mh001</td>
-					<td>05:31</td>
-					<td><span class="label label-sm label-success"> 同意</span></td>
-				</tr>
-				<tr>
-					<td width="7%" style="text-align: center;">位置</td>
-					<td>05:30</td>
-					<td>B-92875</td>
-					<td>请求出场</td> 
-					<td>mh001</td>
-					<td>05:31</td>
-					<td><span class="label label-sm label-success"> 同意</span></td>
-				</tr>
-				<tr>
-					<td width="7%" style="text-align: center;">位置</td>
-					<td>05:30</td>
-					<td>B-92875</td>
-					<td>请求出场</td> 
-					<td>mh001</td>
-					<td>05:31</td>
-					<td><span class="label label-sm label-success"> 同意</span></td>
-				</tr>
 			</tbody>
 		</table>
 	</div>
@@ -100,38 +46,107 @@
 			<ul id="pagination" class="pagination"></ul>
 		</div>
 </div>
-<script id="history_directive_list_temp" type="text/html">
-{{each list as item i}}
+<script id="device_report_list_temp" type="text/html">
+{{each content as item i}}
 <tr>
-	<td>{{item.timeHHmm}}</td>
-	<td>{{item.nbbm}}</td>
-	<td>
-		<div class="text-furl">
-			{{item.data.txtContent}}
-		</div>
+	<td width="7%" >
+		{{item.lineName}}
 	</td>
-	<td>{{item.sender}}</td>
+	<td>{{item.data.nbbm}}</td>
+	<td>{{item.timeStr}}</td>
+	<td>{{item.text}}</td> 
 	<td>
-		{{if item.errorText != null}}
-			<span class="label label-sm label-danger">{{item.errorText}}</span>
-		{{else}}
-			{{if item.reply46 != 0}}
-				<span class="label label-sm label-danger">设备无响应</span>
-			{{else if item.reply47 != 0}}
-				<span class="label label-sm label-warning">驾驶员未确认</span>
-			{{/if}}
-
-			{{if item.reply46 == 0 && item.reply47 == 0}}
-				<span class="label label-sm label-success"> 成功</span>
+		{{if item.handleUser == null}}
+			{{if item.c0 != null}}
+				系统
 			{{/if}}
+		{{else}}
+			{{item.handleUser}}
 		{{/if}}
 	</td>
+
+	{{if item.c0 != null && item.c0.data != null}}
+		<td>{{item.c0.timeStr}}</td>
+		<td>
+			{{if item.c0.data.requestAck==6 }}
+				<span class="label label-sm label-success"> 同意</span>
+			{{else if item.c0.data.requestAck==21 }}
+				<span class="label label-sm label-danger"> 不同意</span>		
+			{{/if}}
+		</td>
+
+	{{else}}
+		<td></td>
+		<td><span class="label label-sm label-warning"> 未处理</span></td>
+	{{/if}}
 </tr>
 {{/each}}
 </script>
  
 <script>
 !function(){
-
+	var page=0,pSize=12
+		,$form = $('#deviceReportPanel form')
+		,$car = $('#deviceReportPanel #carSelect')
+		,$table = $('#deviceReportPanel table');
+	
+	var lineNameMap = JSON.parse(storage.getItem('lineIds'));
+	//初始加载数据
+	jsDoQuery(true);
+	
+	//车辆搜索框
+	createVehSearch($car).on('change', function(){
+		page = 0;
+		jsDoQuery(true);
+	});
+	
+	function jsDoQuery(pagination){
+		var params = $form.serializeJSON();
+		params.page = page;
+		params.size = pSize;
+		
+		$.get('/directive/findAll80', params, function(rs){
+			//命令字转中文
+			$.each(rs.content, function(){
+				this.text = reqCodeMap[this.data.requestCode];
+				if(this.c0)
+					this.c0.timeStr = moment(this.c0.timestamp).format('HH:mm');
+				//线路名转换
+				this.lineName = lineNameMap[this.data.lineId];
+			});
+			
+			var htmlStr = template('device_report_list_temp', rs);
+			$table.find('tbody').html(htmlStr);
+			
+			if(pagination){
+				showPagination(rs, true);
+			}
+		});
+	}
+	
+	function showPagination(data, noQuery){
+		if(data.totalPages == 0)
+			return;
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPages,
+		    visiblePages: 6,
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(noQuery){
+		    		noQuery = false;
+		    		return;
+		    	}
+		    	
+		    	page = num - 1;
+		    	jsDoQuery();
+		    }
+		});
+	}
 }();
 </script>
 \ No newline at end of file
+<div id="ttsConfigurePanel" style="margin: 15px;">
+	<h4 style="padding: 5px 0 10px 15px;margin: 0;"><i class="fa fa-volume-down"></i> TTS 语音设置</h4>
+	<br>
+	<div class="alert" style="    border-bottom: 1px solid #eeeeee;">
+      	设置变更将会保存在本地客户端，清理缓存和更换电脑会重置. </div>
+	<form class="form-horizontal" role="form">
+		<div class="form-body">
+			<div class="form-group">
+				<label class="col-md-3 control-label">发音速度</label>
+				<div class="col-md-9">
+					<input type="number" name="rate" class="form-control input-inline input-medium" min="0.1" max="10"> 
+					<span class="help-inline"> 1 ~ 10 </span>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-md-3 control-label">队列</label>
+				<div class="col-md-9">
+					<select class="form-control input-inline input-medium" name="queueModel">
+                        <option value="1">总是最新</option>
+                        <option value="-1">按顺序完整播放</option>
+                    </select>
+                    <span class="help-block"> </span>
+				</div>
+			</div>
+			<hr>
+			
+			<div class="well"> 
+				<span id="ttsText">我能吞下玻璃而不伤身体 </span>
+				&nbsp;<button type="button" class="btn red-sunglo btn-sm" id="ttsPlay"> <i class="fa fa-volume-down"></i> &nbsp;播放 </button></div>
+		</div>
+		<div class="form-actions">
+			<div class="row">
+				<div class="col-md-12" style="text-align: center;">
+					<button type="button" class="btn blue-madison saveCofig"> <i class="fa fa-check"></i> 保存修改 </button>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
+<script>
+!function(){
+	var ttsPlay = $('#ttsConfigurePanel #ttsPlay')
+		,text = $('#ttsConfigurePanel #ttsText').text()
+		,queueModel = $('#ttsConfigurePanel select[name=queueModel]')
+		,rate = $('#ttsConfigurePanel input[name=rate]')
+		,saveButton = $('#ttsConfigurePanel button.saveCofig');
+	
+	ttsPlay.on('click', function(){
+		h5Speech.speakTest(text, rate.val());
+	});
+	
+	queueModel.on('change', function(){
+		var t = $(this).val()
+			help = $(this).next();
+		if(t == 1){
+			help.text('有新的语音播报时，强制中断未结束的语音');
+		}
+		else{
+			help.text('按照队列顺序依次完整播报');
+		}
+	});
+	
+	saveButton.on('click', function(){
+		if(!rate.val()){
+			layer.msg('发音速度不能不空！');
+			return;
+		}
+		
+		var code = h5Speech.setCofig(rate.val(), queueModel.val());
+		if(code == 1)
+			layer.msg('修改成功！');
+	});
+	
+	//初始化
+	var ttsConfig = h5Speech.getCofig();
+	console.log('ttsConfig', ttsConfig);
+	rate.val(ttsConfig.rate);
+	queueModel.val(ttsConfig.queueModel).trigger('change');
+}();
+</script>
 \ No newline at end of file
@@ -661,10 +661,10 @@ g.park text{
 	border-bottom: 1px solid #545C7B;
 	border-radius: 0 0 4px 4px !important;
 }
-
+/* 
 #tab_map .mapRightWrap.vehicle .vehicle-item div.text{
 	color: #C5C4C4;
-}
+} */
  
 #tab_map .mapRightWrap.vehicle .vehicle-item div.icon{
 	color: #ccc;
@@ -672,7 +672,7 @@ g.park text{
 #tab_map .mapRightWrap.vehicle .vehicle-item.offline div.text span i,
 #tab_map .mapRightWrap.vehicle .vehicle-item.offline div.text span, 
 #tab_map .mapRightWrap.vehicle .vehicle-item.offline div.text{
-	color: #FF858E;
+	color: #aca7a7;
 }
 #tab_map .mapRightWrap.search .input-group .input-group-btn button {
     color: #CDD3D7;
@@ -710,25 +710,26 @@ g.park text{
 #tab_map .mapRightWrap.gaode.vehicle .vehicle-item{
 	 background: #fdfdfd;
 	 color: #2D2929;
+	 border-bottom: 1px solid #ccd4f3;
 }
 #tab_map .mapRightWrap.gaode.vehicle .vehicle-item div.text {
     color: #999;
 }
-#tab_map .mapRightWrap.gaode.vehicle .vehicle-item div.text span,
+/* #tab_map .mapRightWrap.gaode.vehicle .vehicle-item div.text span,
 #tab_map .mapRightWrap.vehicle.gaode p.head>span.icon>a {
     color: #000;
-}
+} */
 #tab_map .mapRightWrap.gaode.vehicle p.head{
 	color: #504B4B;
 }
 #tab_map .mapRightWrap.vehicle.gaode p.head>span.icon>a:hover{
 	color: #555555;
 }
-#tab_map .mapRightWrap.vehicle.gaode .vehicle-item.offline div.text span i,
+/* #tab_map .mapRightWrap.vehicle.gaode .vehicle-item.offline div.text span i,
 #tab_map .mapRightWrap.vehicle.gaode .vehicle-item.offline div.text span,
 #tab_map .mapRightWrap.vehicle.gaode .vehicle-item.offline div.text{
 	color: #e43a45;
-}
+} */
 #tab_map .mapRightWrap.search.gaode .input-group input{
     background-color: #fafafa;
     border: 1px solid #fafafa;
@@ -745,15 +746,15 @@ g.park text{
     color: #fff;
 }
 #tab_map .mapRightWrap.gaode .search_result{
-	background: rgba(250, 250, 250, 0.9);
+	background: rgba(250, 250, 250, 0.95);
 	color: #333333;
 }
 #tab_map .mapRightWrap.gaode .search_result .item_vehicle_list{
 	border-bottom: 1px solid #C7C7C7;
 }
-#tab_map .mapRightWrap.gaode .search_result .item_vehicle{
+/* #tab_map .mapRightWrap.gaode .search_result .item_vehicle{
 	color: #333333;
-}
+} */
 #tab_map .mapRightWrap.gaode .search_result .result_item span.sub_text{
 	color: #8E8D8D;
 }
-<link href="css/lineControl.css" rel="stylesheet" type="text/css" />
+<link href="/pages/control/line/css/lineControl.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/css/animate.min.css" rel="stylesheet" type="text/css" />
  
 <!-- 初始load动画 -->
@@ -24,7 +24,7 @@
 	              <button type="button" class="btn btn-default" id="msgAndDirect">
 	                  <i class="fa fa-bell"></i> 调度指令</button>
  
-	              <div class="btn-group">
+ 	             <!--  <div class="btn-group">
 	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled>
 	                      <i class="fa fa-database"></i> 基本信息
 	                      <i class="fa fa-angle-down"></i>
@@ -46,20 +46,17 @@
 	                          <a href="javascript:;"> 调度短语 </a>
 	                      </li>
 	                  </ul>
-	               </div>
+	               </div> -->
  
  
 	              <div class="btn-group">
-	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled>
+	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
 	                      <i class="fa fa-gavel"></i> 系统设置
 	                      <i class="fa fa-angle-down"></i>
 	                  </button>
 	                  <ul class="dropdown-menu">
 	                      <li>
-	                          <a href="javascript:;"> 缓冲区设置 </a>
-	                      </li>
-	                      <li>
-	                          <a href="javascript:;"> 发车屏通知 </a>
+	                          <a href="javascript:;" id="ttsConfigure"> TTS 语音设置 </a>
 	                      </li>
 	                  </ul>
 	              </div>
@@ -231,6 +228,9 @@
 <script src="/pages/control/line/js/messenger.js"></script>
 <script src="/pages/control/line/js/keyboardListen.js"></script>
 <script src="/pages/control/line/js/toolbarEvent.js"></script>
+<script src="/pages/control/line/js/speech.js"></script>
+
+
 <script>
  
 var lineCodes = '' //全部线路编码字符串，由data.js初始化
@@ -73,6 +73,15 @@
 		 		$('menu.menu').show();
 		 	}, 400);
  
+		 	setTimeout(function(){
+		 		//提示文本
+		 		var promptFlag = storage.getItem('promptFlag_0808');
+		 		if(!promptFlag){
+		 			layer.alert('未避免 TTS 重复播报，请在 “地图” 标签页，点击 “新窗口” 打开新的地图页面', {shift: 5}); 
+		 			storage.setItem('promptFlag_0808', 1);
+		 		}
+		 	}, 1500);
+		 	
 		}
 	}
  
@@ -104,6 +113,7 @@ setTimeout(function(){
 	if(operationMode == 0){
 		$(document).on('ajaxSend', interceptPOST);
 	}
+	
 }, 300)
  
 	function gpslistToMap(gpslist){
+/** html5 Web Speech 相关 */
+
+var h5Speech = (function(){
+	
+	//发音速度 1 ~ 10;
+	var rate;
+	//队列播放模式 1：覆盖式  -1：完整顺序播报
+	var queueModel;
+	var synth = window.speechSynthesis;
+	
+	//读取配置信息
+	readCofig();
+	var speechInstance = {
+		speak: function(t){
+			if(queueModel == 1)
+				synth.cancel();
+			
+			//延迟一会，防止 synth.cancel 将当前项也从队列移除
+			setTimeout(function(){
+				var msg = new SpeechSynthesisUtterance(t);
+				msg.rate = rate;
+				synth.speak(msg);
+			}, 100);
+		},
+		speakTest: function(t, rate){
+			var msg = new SpeechSynthesisUtterance(t);
+			msg.rate = rate;
+			synth.speak(msg);
+		},
+		getCofig: function(){
+			return {rate: rate, queueModel: queueModel};
+		},
+		setCofig: function(r, q){
+			rate = r;
+			queueModel = q;
+			writeCofig(rate, queueModel);
+			
+			return 1;
+		}
+	};
+	return speechInstance;
+	
+	function readCofig(){
+		//读取配置信息
+		var ttsCofig = storage.getItem('tts_cofig');
+		if(ttsCofig){
+			ttsCofig = JSON.parse(ttsCofig);
+			rate = ttsCofig.rate;
+			queueModel = ttsCofig.queueModel;
+		}
+		else{
+			//写入默认配置
+			rate = 1.2;
+			queueModel = 1;
+			writeCofig(rate, queueModel);
+		}
+	}
+	
+	function writeCofig(rate, queueModel){
+		storage.setItem('tts_cofig', JSON.stringify({rate: rate, queueModel: queueModel}));
+	}
+})();
@@ -30,8 +30,7 @@
  
 	//设备上报
 	$('#deviceReport').on('click', function(){
-		layer.msg('功能测试中，测试完了就开放...')
-		/*$.get('/pages/control/line/child_pages/deviceReport.html', function(content){
+		$.get('/pages/control/line/child_pages/deviceReport.html', function(content){
 			layer.open({
 			  type: 1,
 			  area: '930px',
@@ -42,6 +41,21 @@
  
 			  }
 			});
-		});*/
+		});
+	});
+	
+	//TTS语音设置
+	$('#ttsConfigure').on('click', function(){
+		$.get('/pages/control/line/child_pages/ttsConfigure.html', function(content){
+			layer.open({
+			  type: 1,
+			  area: '530px',
+			  content: content,
+			  title : false,
+			  shift: 5,
+			  success: function(){
+			  }
+			});
+		});
 	});
 }();
 \ No newline at end of file
@@ -109,6 +109,9 @@ function appendLogItem(tempId, json, lineCode){
  
 	var logWrap = $('.console-log .log-item-list', '#tab_line_' + lineCode);
 	logWrap.prepend(htmlStr);
+	//语音播报
+	var text = $(htmlStr).find('.log-item-text').text();
+	h5Speech.speak(text);
 }
  
 }();
@@ -301,16 +301,22 @@ $(function(){
 			lsData.push(lineIdMap[$(e).data('id')]);
 		});
 		storage.setItem('lineControlItems', JSON.stringify(lsData));
-		//监控模式还是主调模式
-		storage.setItem('operationMode', $(this).data('status'));
-		//将线路路由缓存到localstorage
-		cacheRoute(lsData, function(cacheData){
-			for(var lineCode in cacheData){
-				storage.setItem(lineCode + '_route', JSON.stringify(cacheData[lineCode]));
-			}
+		//缓存车辆和设备对照
+		$.get('/gps/Car2DeviceId', function(rs){
+			storage.setItem('car2DeviceId', JSON.stringify(rs));
+			
+			//监控模式还是主调模式
+			storage.setItem('operationMode', $(this).data('status'));
+			//将线路路由缓存到localstorage
+			cacheRoute(lsData, function(cacheData){
+				for(var lineCode in cacheData){
+					storage.setItem(lineCode + '_route', JSON.stringify(cacheData[lineCode]));
+				}
+				
+				layer.closeAll();
+				loadPage('/pages/control/line/index.html');
+			});
  
-			layer.closeAll();
-			loadPage('/pages/control/line/index.html');
 		});
 		//window.location.href = '/pages/control/line/index.html';
 	});
+<link href="/pages/control/line/css/lineControl.css" rel="stylesheet" type="text/css" />
+<div id="tab_map" class="portlet light portlet-fullscreen" style="transition: all .5s ease;padding: 0;" oncontextmenu=self.event.returnValue=false>
+</div>
+<script>
+!function(){
+	//加载地图页面
+	$('#tab_map').load('/pages/mapmonitor/real/real.html', function(){
+		$('#mapContainer').height('100%').css('margin-top', 0);
+		$('#openWindow').remove();
+		$('.leftUtils').css('width', '189px');
+		
+		startRefreshGpsTimer();
+	});
+	
+	moment.locale('zh-cn');
+	var storage = window.localStorage;
+	var lineCodes = '';
+	var allGps = {};
+	//初始化lineCodes
+	$.each(JSON.parse(storage.getItem('lineControlItems')), function(i, obj){
+		lineCodes += (obj.lineCode + ',');
+	});
+	lineCodes = lineCodes.substr(0, lineCodes.length - 1);
+	
+	//为地图提供gps数据
+	var gpsTimer;
+	var realGpsT = 1000 * 10;
+	function startRefreshGpsTimer(){
+		var f = arguments.callee;
+		refreshGpsProxy();
+		gpsTimer = setTimeout(f, realGpsT);
+	}
+	
+	function refreshGpsProxy(){
+		refreshGps(function(add, up){
+			$('#tab_map #mapContainer').trigger('gps_refresh', [add, up]);
+		});
+	}
+	function refreshGps(cb){
+		$.ajax({
+			url: '/gps/real/line',
+			data: {lineCodes: lineCodes},
+			timeout: 5000,//5秒超时
+			success: getGpsSuccess,
+			error: getGpsError
+		});
+		
+		function getGpsSuccess(gpsList){
+			if(!gpsList || gpsList.length == 0)
+				return;
+			
+			var prve = allGps
+				,addArray = []
+				,upArray = []
+				,oldGps;
+			for(var i = 0, gps; gps=gpsList[i++];){
+				oldGps = prve[gps.deviceId];
+				if(!oldGps){
+					addArray.push(gps);
+				}
+				else if(gps.timestamp > oldGps.timestamp){
+					//更新
+					upArray.push(gps);
+				}
+				allGps[gps.deviceId] = gps;
+			}
+			cb && cb(addArray, upArray);
+		}
+		
+		function getGpsError(jqXHR, textStatus){
+			if(textStatus === 'error'){
+				console.log(jqXHR, textStatus);
+				layer.alert('获取GPS数据时出现异常，请尝试刷新页面！', {icon: 2});
+			}
+			else if(textStatus === 'timeout')
+				layer.alert('连接服务器超时', {icon: 2});
+			
+			//停止gps刷新
+			clearTimeout(gpsTimer);
+		}
+	}
+}();
+</script>
 \ No newline at end of file
@@ -179,7 +179,7 @@ label.BMapLabel{
  
 .leftUtils{
 	position: absolute;
-	width: 188px;
+	width: 259px;
 	height: 40px;
     background-color: #3B3F51;
     z-index: 9999;
@@ -431,33 +431,45 @@ html{
  
 .mapRightWrap.vehicle .vehicle-item div.text{
     padding: 5px 0 11px 5px;
-    color: #B2B2B2;
+    color: #aebbae;
     -webkit-user-select: initial;
 }
  
 .mapRightWrap.vehicle .vehicle-item div.text span.nbbm{
     padding: 5px 7px;
-    color: #eee;
     cursor: pointer;
 }
  
-.mapRightWrap.vehicle .vehicle-item div.text span.nbbm:hover{
-	color: #C8C8C8;
+.mapRightWrap.vehicle .vehicle-item.online_0 div.text span.nbbm{
+	color: #45D245;
+}
+
+.mapRightWrap.vehicle .vehicle-item.online_1 div.text span.nbbm{
+	color: #ff8375;
+}
+
+
+.mapRightWrap.vehicle .vehicle-item.online_0 div.text span.nbbm:hover{
+	color: #45D245;
+} 
+
+.mapRightWrap.vehicle .vehicle-item.online_1 div.text span.nbbm:hover{
+	color: #f16454;
 }
  
 .mapRightWrap.vehicle .vehicle-item div.text span i{
 	font-size: 12px;
 }
  
-.mapRightWrap.vehicle .vehicle-item.online div.text span i{
+/* .mapRightWrap.vehicle .vehicle-item.online div.text span i{
 	color: #45D245;
-}
+} */
  
 /* off line */
 .mapRightWrap.vehicle .vehicle-item.offline div.text span i,
 .mapRightWrap.vehicle .vehicle-item.offline div.text span,
 .mapRightWrap.vehicle .vehicle-item.offline div.text{
-	color: #FF737C;
+	color: #aca7a7;
 }
  
 .mapRightWrap.vehicle .vehicle-item div.icon{
@@ -474,10 +486,17 @@ html{
  
 .mapRightWrap .search_result{
     position: absolute;
-    background: rgba(98, 103, 117, 0.91);
+    background: rgba(59, 92, 115,0.95);
     width: 100%;
     top: 60px;
     color: #e5e5e5;
+    
+    max-height: 500px;
+    overflow: auto;
+}
+
+.mapRightWrap .search_result::-webkit-scrollbar-thumb{
+	    box-shadow: 0 0 0 5px rgba(255, 255, 255, 0.2) inset;
 }
  
 .mapRightWrap .search_result .result_item{
@@ -488,7 +507,7 @@ html{
 }
  
 .mapRightWrap .search_result .result_item:hover{
-	background: #60A798;
+	background: #59829e;
     color: #fff;
 }
  
@@ -499,10 +518,11 @@ html{
 .mapRightWrap .search_result .result_item span.sub_text{
 	color: #BBBABA;
     margin-left: 5px;
+    font-size: 14px;
 }
  
 .mapRightWrap .search_result .item_vehicle_list{
-	margin-bottom: 20px;
+	/* margin-bottom: 20px; */
 	/* border-bottom: 1px solid #F3F5F5; */
 }
  
@@ -510,6 +530,11 @@ html{
 	color: #fafcfb;
 }
  
+.mapRightWrap .search_result .item_vehicle.state_online{
+	color: #84ffe4;
+	font-size: 15px;
+}
+
 /* GaoDe  style start-------  */
 .mapRightWrap.gaode{
 	background: #fff;
@@ -558,8 +583,8 @@ html{
     color: #999;
 }
  
-.mapRightWrap.gaode.vehicle .vehicle-item div.text span {
-    color: #000;
+.mapRightWrap.gaode.vehicle .vehicle-item.online_0 div.text span {
+    color: #23a023;
 }
  
 .mapRightWrap.gaode.playBack form {
@@ -602,7 +627,7 @@ html{
 }
  
 .mapRightWrap.gaode .search_result{
-	background: rgba(250, 250, 250, 0.9);
+	background: rgba(250, 250, 250, 0.95);
 	color: #333333;
 }
  
@@ -610,10 +635,10 @@ html{
 	border-bottom: 1px solid #C7C7C7;
 }
  
-.mapRightWrap.gaode .search_result .item_vehicle{
-	color: #333333;
+.mapRightWrap.gaode .search_result .item_vehicle.state_online{
+	 color: #3d3dec;
 }
-
+   
 .mapRightWrap.gaode .search_result .result_item span.sub_text{
 	color: #8E8D8D;
 }
@@ -622,6 +647,20 @@ html{
 	background: #ddd;
 	color: #333333;
 }
+
+.mapRightWrap.gaode .search_result .item_vehicle{
+	color: #333333;
+}
+
+.mapRightWrap.gaode.playBack hr{
+	    border-color: #c5c5c5;
+}
+
+.mapRightWrap.gaode .alert-info{
+    background-color: #ccc;
+    border-color: #ccc;
+    color: #555555;
+}
 /* GaoDe  style end-------  */
  
  
@@ -637,6 +676,11 @@ html{
     box-shadow: 0 0 0 5px rgba(231, 236, 241, 0.52) inset;
 }
  
+.gps_info_win{
+	width: 190px;
+	overflow: hidden;
+}
+
 .gps_info_win p{
 	margin-bottom: 13px;
 	font-size: 13px;
+/*
+ * 线路分组车辆 模块
+ */
+
+var lineGroup = (function() {
+	
+	//设备号和marker映射
+	var gpsMarker = {}
+		,cLineCode;// 当前线路编码
+	
+	/*function getCurrMap(){
+		return realMap[realMap.getMap().fName];
+	}*/
+	var storage = window.localStorage;
+	
+	function closeAll(){
+		$('.mapRightWrap .collapse.in').collapse('hide');
+	}
+	
+	// 手风琴收拢
+	$('.mapRightWrap').on('hide.bs.collapse', '.panel-collapse', function() {
+		$(this).prev().find('span.icon').addClass('rotate');
+		cLineCode = null;
+	});
+
+	// 手风琴展开
+	$('.mapRightWrap').on('show.bs.collapse', '.panel-collapse', function() {
+		$(this).prev().find('span.icon').removeClass('rotate');
+		var lineCode = $(this).data('line');
+		//收拢其他
+		closeAll();
+		cLineCode = lineCode;
+		
+		//从storage里获取路由数据
+		var route = JSON.parse(storage.getItem(lineCode + '_route'));
+		//在地图上画出线路
+		//getCurrMap().drawLine(route);
+		iMap.call('clear')
+			.call('drawLine', {route: route});
+		
+		//绘制GPS点
+		drawGps();
+	});
+	
+	//跳转到轨迹回放
+	function toPlayBack(nbbm, lineCode){
+		playBack.setDefaultCar(nbbm, lineCode);
+		$('.mapTools .item[data-click=playBack]').click();
+	}
+	
+	//绘制 GPS
+	function drawGps(){
+		var showList = [], gps, allGps = consts.allGps;
+		for(var dId in allGps){
+			if(allGps[dId].lineId == cLineCode)
+				showList.push(allGps[dId]);
+		}
+		
+		//排序
+		showList.sort(carSort);
+		
+		//显示车辆列表
+		var htmlStr = template('vehicle_panel_collapse_temp', {list: showList});
+		$('#collapse_' + cLineCode).html(htmlStr);
+		
+		//延迟一下再画GPS，动画会流畅一些
+		setTimeout(function(){
+			iMap.call('drawRealGpsMarker', {gpsList: showList, coordTransform: true});
+		}, 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() {
+		var opts = {deviceId: $(this).data('deviceid')};
+		iMap.call('goToMarker', opts)
+			.call('openWindow', opts);
+	});
+	
+	var exports = {
+		// 加载车辆信息
+		showData: function(){
+			//要展示的线路
+			var lines = JSON.parse(storage.getItem('lineControlItems'));
+			
+			var htmlStr = template('vehicle_panel_temp', {list: lines});
+			$('.mapRightWrap').html(htmlStr).addClass('vehicle');
+		},
+		showDataLazy : function() {
+			setTimeout(exports.showData, 1000);
+		},
+		drawLineAndGps: function(lineCode){
+			drawLineAndGps(lineCode);
+		},
+		clear: function(){
+			cLineCode = null;
+		},
+		toPlayBack:toPlayBack,
+		//gps刷新
+		gpsRefresh: function(){
+			drawGps();
+		}
+	};
+	
+	//车辆排序
+	function carSort(g1, g2){
+		//营运状态
+		if(g1.state != g2.state)
+			return  Math.abs(g1.state) - Math.abs(g2.state);
+		
+		//上下行
+		if(g1.upDown != g2.upDown)
+			return g1.upDown - g2.upDown;
+		
+		
+		return g1.nbbm > g2.nbbm?1:-1;
+	}
+	return exports;
+})();
 \ No newline at end of file
+/** 各个地图平台通用接口定义 */
+var iMap = (function(){
+	
+	var storage = window.localStorage;
+	// 地图DOM容器
+	var mapContainer = $('#mapContainer');
+	var maps = {};
+	//尝试从 localStorage 里获取默认的地图类型
+	var currentMap = storage.getItem('real_map');
+	var mapProxy = {
+		//添加一个地图实例
+		addMap: function(name, text, instance){
+			maps[name] = {name: name, text: text, instance: instance};
+			
+			if(!currentMap)
+				currentMap = name;
+			return mapProxy;
+		},
+		changeDefault: function(mapName){
+			if(mapName == currentMap)
+				return;
+			if(maps[mapName]){
+				//原地图 destroy
+				var oldMap = maps[currentMap].instance;
+				oldMap.destroy && oldMap.destroy();
+				$(consts.mapContainer).html('');
+				//解除实时路况按钮点击事件
+				$(consts.trafficBtn).unbind('click');
+				
+				//新地图 INIT
+				var text = maps[mapName].text;
+				layer.msg('正在切换到' + text + '...', {icon : 16,shade : [ 0.6, '#393D49' ],time : 0});
+				var newMap = maps[mapName].instance;
+				newMap.init();
+				setText(text);
+				
+				currentMap = mapName;
+				//收拢线路
+				$('.mapRightWrap .collapse.in').collapse('hide');
+			}else
+				alertErr('不存在的地图实例' + mapName);
+		},
+		createCarIcon: createCarIcon,
+		call: function(f, opts){
+			if(f == 'init')
+				setText(maps[currentMap].text);
+			
+			var instance = maps[currentMap].instance;
+			if(instance[f])
+				instance[f](opts);
+			else
+				alertErr('当前地图实例不支持操作：' + f);
+			return mapProxy;
+		}
+	}
+	
+	//绘制车辆icon
+	function createCarIcon(gps){
+		var canvas = $('<canvas></canvas>')[0];
+		var ctx = canvas.getContext('2d');
+		
+		var colours = color(gps);
+		
+		ctx.shadowOffsetX = 5; // 阴影Y轴偏移
+		ctx.shadowOffsetY = 5; // 阴影X轴偏移
+		ctx.shadowBlur = 1; // 模糊尺寸
+		ctx.shadowColor = colours.shadow; // 颜色
+		
+		//绘制背景
+		ctx.roundRect(0, 0, 70, 25, 5).stroke();
+		ctx.fillStyle=colours.bgColor;
+		ctx.fill();
+		//文字
+		ctx.font="14px arial";
+		ctx.fillStyle = "#fff";
+		ctx.fillText(gps.nbbm, 8, 18);
+		
+		return canvas.toDataURL();
+	}
+	
+	function color(g){
+		var colours = {};
+		switch (g.state) {
+		case 0:
+			if(g.upDown == 0){
+				//营运上行
+				colours['bgColor'] = 'rgba(94, 150, 210, 1)';
+				colours['shadow'] = 'rgba(94, 150, 210, 0.3)';
+			}
+			else if(g.upDown == 1){
+				//营运下行
+				colours['bgColor'] = 'rgba(201, 33, 33, 1)';
+				colours['shadow'] = 'rgba(201, 33, 33, 0.3)';
+			}
+			else{
+				//未知走向
+				colours['bgColor'] = 'rgba(0, 0, 0, 1)';
+				colours['shadow'] = 'rgba(0, 0, 0, 0.3)';
+			}
+			break;
+
+		default:
+			//非营运
+			colours['bgColor'] = 'rgba(136, 133, 133, 1)';
+			colours['shadow'] = 'rgba(136, 133, 133, 0.3)';
+			break;
+		}
+		
+		return colours;
+	}
+	
+	function alertErr(text){
+		layer.alert(text, {icon: 2, title: '来自地图的异常'});
+	}
+	
+	function setText(text) {
+		$('.leftUtils span.dropdown-toggle').html(
+				text + ' <i class="fa fa-angle-down"></i>');
+	}
+	
+	return mapProxy;
+})();
 \ No newline at end of file
+/** 百度地图相关接口封装 */
+var baiduMap = (function(){
+	
+	var map;
+	var realMarkers = {};
+	var topMarker;
+	//实时路况是否打开
+	var traffVisible;
+	//线路 Polyline
+	var linePolyline;
+	var baiduInstance = {
+		//初始化
+		init: function(){
+			map = new BMap.Map($(consts.mapContainer)[0]);
+			//中心点和缩放级别
+			map.centerAndZoom(new BMap.Point(consts.center_point.lng, consts.center_point.lat), 15);
+			map.enableScrollWheelZoom();
+			//加载完成
+			map.addEventListener("tilesloaded", function() {
+				layer.closeAll();
+				window.localStorage.setItem('real_map', 'baidu');
+			});
+			
+			// 路况控件
+			var ctrl = new BMapLib.TrafficControl();
+			map.addControl(ctrl);
+
+			$(consts.trafficBtn).on('click', function() {
+				if (traffVisible) {
+					ctrl.hide();
+					traffVisible = false;
+					showLinePolyline();
+				} else {
+					ctrl.show();
+					traffVisible = true;
+					hideLinePolyline();
+				}
+			});
+			//百度路况控件自身关闭按钮
+			$('.portlet-fullscreen').on('click', '.maplibTc .maplibTcClose', function(){
+				traffVisible = false;
+				showLinePolyline();
+			});
+
+			$('#tcWrap.maplibTc').addClass('animated bounceInLeft');
+			$('.maplibTcBtn_deskTop.anchorTR').remove();
+		},
+		destroy: function(){
+			realMarkers = {};
+			linePolyline = [];
+		},
+		clear: function(){
+			realMarkers = {};
+			map.clearOverlays();
+		},
+		//画线路图层
+		drawLine: function(opts){
+			
+			map.clearOverlays();
+			linePolyline = [];
+			//从localStorage里读取路由信息
+			var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
+				,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
+			
+			var upPos = [], downPos = [], tempArray;
+			var route = opts.route;
+			//上行
+			if(route.up){
+				$.each(route.up.split(','), function(){
+					tempArray = this.split(' ');
+					upPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+				});
+				
+				var upLine = new BMap.Polyline(upPos, upLineOps);
+				map.addOverlay(upLine);
+				
+				linePolyline.push(upLine);
+				
+				map.panTo(upPos[parseInt(upPos.length / 2)]);
+			}
+			//下行
+			if(route.down){
+				$.each(route.down.split(','), function(){
+					tempArray = this.split(' ');
+					downPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+				});
+				
+				var downLine = new BMap.Polyline(downPos, downLineOps);
+				map.addOverlay(downLine);
+				
+				linePolyline.push(downLine);
+			}
+		},
+		//绘制GPS信号
+		drawRealGpsMarker: function(opts){
+			var gpsArray = opts.gpsList;
+			var marker, coord;
+			$.each(gpsArray, function(i, gps){
+				if(opts.coordTransform){
+					//坐标转换
+					coord = TransGPS.wgsToBD(gps.lat, gps.lon);
+					gps.bd_lat = coord.lat;
+					gps.bd_lon = coord.lng;
+				}
+
+				marker = realMarkers[gps.deviceId];
+				if(marker){
+					if(gps.timestamp == marker.gpsData.timestamp)
+						return;
+					else
+						moveMarker(marker, gps);//移动marker
+				}
+				else{
+					//创建marker
+					marker = createBDMarkerByGps(gps);
+					map.addOverlay(marker);
+					//设备号和marker映射
+					realMarkers[gps.deviceId] = marker;
+				}
+			});
+		},
+		//定位到marker
+		goToMarker: function(opts){
+			var deviceId = opts.deviceId
+				,m = realMarkers[deviceId];
+			if(m){
+				map.panTo(m.point);
+				setTop(m);
+			}
+		},
+		//打开信息窗口
+		openWindow: function(opts){
+			var deviceId = opts.deviceId
+				,m = realMarkers[deviceId];
+			bdOpenWindow(m);
+		}
+	};
+	
+	return baiduInstance;
+	
+	var bd_gps_info_win_opts = {
+	  		width : 190,
+	  		height: 255,
+	  		enableMessage:true
+	};
+	function createBDMarkerByGps(gpsData){
+		var point = new BMap.Point(gpsData.bd_lon, gpsData.bd_lat);
+		var marker = new BMap.Marker(point/*, {offset: new BMap.Size(-35,-12)}*/);
+		marker.setIcon(new BMap.Icon(iMap.createCarIcon(gpsData), new BMap.Size(70,25)));
+		
+		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
+		marker.gpsData = gpsData;
+		//click
+		marker.addEventListener('click', function(){
+			bdOpenWindow(this);
+		});
+		//mouseover
+		marker.addEventListener('mouseover', function(){
+			setTop(this);
+		});
+		return marker;
+	}
+	
+	//隐藏线路线条
+	function hideLinePolyline(){
+		if(!linePolyline || linePolyline.length == 0)
+			return;
+		
+		layer.msg('隐藏线路图层',{offset: 'ct', shift : 5});
+		$.each(linePolyline, function(){
+			this.setStrokeOpacity(0.1);
+		});
+	}
+	
+	//显示线路线条
+	function showLinePolyline(){
+		if(!linePolyline || linePolyline.length == 0)
+			return;
+		
+		layer.msg('显示线路图层',{offset: 'ct', shift : 5});
+		$.each(linePolyline, function(){
+			this.setStrokeOpacity(0.5);
+		});
+	}
+	
+	function moveMarker(m, gps){
+		m.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
+		m.gpsData = gps;
+		//重新设置icon
+		m.setIcon(new BMap.Icon(iMap.createCarIcon(gps), new BMap.Size(70,25)));
+		
+		//更新 infoWindow
+		if(m.infoWindow.isOpen()){
+			bdOpenWindow(m);
+		}
+	}
+	
+	function setTop(m){
+		if(topMarker)
+			topMarker.setTop(false);
+		m.setTop(true);
+		topMarker = m;
+	}
+	
+	function bdOpenWindow(marker){
+		marker.gpsData.fromNow = moment(marker.gpsData.timestamp).fromNow();
+		
+		marker.infoWindow.setContent(template('gps_info_win_temp', marker.gpsData));
+		map.openInfoWindow(marker.infoWindow, marker.point);
+	}
+})();
 \ No newline at end of file
+/** 高德地图相关接口封装 */
+var gaodeMap = (function() {
+
+	var mapLoadAnim = '<div class="sk-cube-grid _center">'
+			+ '<div class="sk-cube sk-cube1"></div>'
+			+ '<div class="sk-cube sk-cube2"></div>'
+			+ '<div class="sk-cube sk-cube3"></div>'
+			+ '<div class="sk-cube sk-cube4"></div>'
+			+ '<div class="sk-cube sk-cube5"></div>'
+			+ '<div class="sk-cube sk-cube6"></div>'
+			+ '<div class="sk-cube sk-cube7"></div>'
+			+ '<div class="sk-cube sk-cube8"></div>'
+			+ '<div class="sk-cube sk-cube9"></div>' + '</div>';
+
+	var map;
+	var topMarkr;
+	var realMarkers = {};
+	//线路路由线条
+	var linePolyline;
+	//实时路况是否显示
+	var traffVisible;
+	var gaodeInstance = {
+		init : function() {
+			var $mapCon = $(consts.mapContainer);
+			$mapCon.html(mapLoadAnim);
+			//设置样式
+			gaodeInstance.setStyle();
+			
+			map = new AMap.Map($mapCon[0]);
+			// 地图中心和缩放级别
+			map.setZoomAndCenter(14, [ consts.center_point.lng, consts.center_point.lat ]);
+			// 加载完成
+			AMap.event.addListener(map, 'complete', function() {
+				layer.closeAll();
+				window.localStorage.setItem('real_map', 'gaode');
+				/*storage.setItem('real_map', REAL_GAODE_TEXT);
+				$('.sk-cube-grid._center').remove();*/
+			});
+
+			// 实时路况图层
+			var trafficLayer = new AMap.TileLayer.Traffic();
+			trafficLayer.setMap(map);
+			trafficLayer.hide();
+
+			$(consts.trafficBtn).on('click', function() {
+				if (traffVisible) {
+					trafficLayer.hide();
+					traffVisible = false;
+					$(this).removeClass('active');
+					showLinePolyline();
+				} else {
+					trafficLayer.show();
+					traffVisible = true;
+					$(this).addClass('active');
+					hideLinePolyline();
+				}
+			});
+		},
+		setStyle : function() {
+			$('.mapRightWrap').addClass('gaode');
+			$('.mapTools').addClass('gaode');
+			$('.leftUtils').addClass('gaode');
+		},
+		destroy:function(){
+			realMarkers = {};
+			$('.mapRightWrap').removeClass('gaode');
+			$('.mapTools').removeClass('gaode');
+			$('.leftUtils').removeClass('gaode');
+		},
+		clear: function(){
+			realMarkers = {};
+			map.clearMap();
+			linePolyline = [];
+		},
+		drawLine: function(opts){
+			linePolyline = [];
+			
+			map.clearMap();
+			
+			var upArr = [], downArr = [];
+			var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
+				,downLineOps = {path: downArr, strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
+			var route = opts.route;
+			//上行
+			if(route.up){
+				$.each(route.up_gcj.split(','), function(){
+					tempArray = this.split(' ');
+					upArr.push([tempArray[0], tempArray[1]]);
+				});
+				 var upLine = new AMap.Polyline(upLineOps);
+				//保存线条引用
+				 linePolyline.push(upLine);
+				 upLine.setMap(map);
+	             map.setCenter(upArr[parseInt(upArr.length / 2)]);
+				
+			}
+			//下行
+			if(route.down){
+				$.each(route.down_gcj.split(','), function(){
+					tempArray = this.split(' ');
+					downArr.push([tempArray[0], tempArray[1]]);
+				});
+				 var downLine = new AMap.Polyline(downLineOps);
+				 //保存线条引用
+				 linePolyline.push(downLine);
+				 downLine.setMap(map);
+			}
+			//实时路况下不显示
+			if(traffVisible)
+				hideLinePolyline();
+		},
+		drawRealGpsMarker: function(opts){
+			var gpsArray = opts.gpsList;
+			var coord;
+			$.each(gpsArray, function(i, gps){
+				if(opts.coordTransform){
+					coord = TransGPS.transformFromWGSToGCJ(gps.lat, gps.lon);
+					gps.gcj_lat = coord.lat;
+					gps.gcj_lon = coord.lng;
+				}
+				
+				marker = realMarkers[gps.deviceId];
+				if(marker){
+					if(gps.timestamp == marker.gpsData.timestamp)
+						return;
+					else
+						moveMarker(marker, gps);//移动marker
+				}
+				else{
+					var marker = createGDMarkerByGps(gps);
+					realMarkers[gps.deviceId] = marker
+				}
+			});
+		},
+		goToMarker: function(opts){
+			var deviceId = opts.deviceId
+				,m = realMarkers[deviceId];
+			if(m){
+				map.setCenter(m.getPosition());
+				setTop(m);
+			}
+		},
+		openWindow: function(opts){
+			var deviceId = opts.deviceId
+				,m = realMarkers[deviceId];
+			openWindow(m);
+		}
+	};
+
+	return gaodeInstance;
+	
+	function createGDMarkerByGps(gps){
+		var marker = new AMap.Marker({
+	        map: map,
+			position: [gps.gcj_lon, gps.gcj_lat],
+	        icon: new AMap.Icon({            
+	            size: new AMap.Size(70, 25),  //图标大小
+	            image: iMap.createCarIcon(gps)
+	        }),
+	        offset: new AMap.Pixel(-35, -12)
+	    });
+		
+		//绑定数据
+		marker.gpsData = gps;
+		marker.infoWindow = new AMap.InfoWindow();
+		
+		marker.on('mouseover', function(){
+			setTop(this);
+		});
+		//点击事件
+		marker.on('click', function(){
+			openWindow(this);
+		});
+		
+		return marker;
+	}
+	
+	function moveMarker(m, gps){
+		m.setPosition(new AMap.LngLat(gps.gcj_lon, gps.gcj_lat));
+		m.gpsData = gps;
+		//重新设置icon
+		m.setIcon(new AMap.Icon({            
+            size: new AMap.Size(70, 25),
+            image: iMap.createCarIcon(gps)
+        }));
+		
+		if(m.infoWindow.getIsOpen())
+			openWindow(m);
+	}
+	
+	//隐藏线路线条
+	function hideLinePolyline(){
+		if(!linePolyline || linePolyline.length == 0)
+			return;
+		layer.msg('隐藏线路图层',{offset: 'ct', shift : 5});
+		$.each(linePolyline, function(){
+			this.setOptions({strokeOpacity: 0});
+		});
+	}
+	
+	//显示线路线条
+	function showLinePolyline(){
+		if(!linePolyline || linePolyline.length == 0)
+			return;
+		
+		layer.msg('显示线路图层',{offset: 'ct', shift : 5});
+		$.each(linePolyline, function(){
+			this.setOptions({strokeOpacity: 0.5});
+		});
+	}
+	
+	function openWindow(marker){
+		marker.gpsData.fromNow = moment(marker.gpsData.timestamp).fromNow();
+		/*var infoWindow = new AMap.InfoWindow({
+            content: template('gps_info_win_temp', marker.gpsData)
+        });*/
+		marker.infoWindow.setContent(template('gps_info_win_temp', marker.gpsData));
+		marker.infoWindow.open(map, marker.getPosition());
+	}
+	
+	function setTop(marker){
+		if(topMarkr)
+			topMarkr.setzIndex(1);
+		marker.setzIndex(2);
+		topMarkr = marker;
+	}
+})();
 \ No newline at end of file
@@ -44,12 +44,14 @@ var playBack = (function() {
 	var lineRoute;
 	//首辆车自编号
 	var firstCar;
+	var firstDeviceId;
 	//是否启用焦点跟踪
 	var isEnableFocus;
  
-	function getCurrMap(){
+	var car2DeviceId;
+/*	function getCurrMap(){
 		return realMap[realMap.getMap().fName];
-	}
+	}*/
  
 	//事件监听
 	$('.play-back-btns .playBtn').on('click', function(){
@@ -88,7 +90,7 @@ var playBack = (function() {
 		//删掉marker映射
 		markerMap = {};
 		//清理地图
-		getCurrMap().clear();
+		iMap.call('clear');
 		//坐标归0
 		cIndex = 0;
 		$('.pback-logs').html('');
@@ -152,11 +154,10 @@ var playBack = (function() {
  
 	var exports = {
 		init : function() {
-			//清空地图
-			getCurrMap().clear();
  
-			vehiclePanel.clear();
+			lineGroup.clear();
  
+			car2DeviceId = JSON.parse(window.localStorage.getItem('car2DeviceId'));
 			var htmlStr = template('play_back_panel_temp', {})
 				,carSel = '.mapRightWrap select[name="nbbm[]"]';
 			$('.mapRightWrap').html(htmlStr);
@@ -228,16 +229,17 @@ var playBack = (function() {
 				pWidth = $('.progress-body').width();
 				secondPX = tRange / pWidth;
 				//清理地图
-				getCurrMap().clear();
+				iMap.call('clear');
  
 				firstCar = params.nbbm[0];
+				firstDeviceId = car2DeviceId[firstCar];
  
 				if(defaultLine){
 					layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3});
 					$.get('/realSchedule/findRouteByLine', {lineCode: defaultLine}
 					,function(route){
 						lineRoute = route;
-						getCurrMap().drawLine(lineRoute);
+						iMap.call('drawLine', {route: lineRoute});
  
 						cTime = sTime;
 						play();
@@ -306,8 +308,8 @@ var playBack = (function() {
  
 	function trackFocus(){
 		//定位焦点
-		if(markerMap[firstCar])
-			getCurrMap().markerToCenter(markerMap[firstCar]);
+		if(firstDeviceId)
+			iMap.call('goToMarker', {deviceId: firstDeviceId});
 	}
  
 	function start(){
@@ -353,17 +355,20 @@ var playBack = (function() {
 		}
  
 		//绘制到地图
-		var marker;
+		var marker, gpsList = [];
 		for(var nbbm in rs){
 			gps = rs[nbbm];
-			marker = markerMap[gps.nbbm];
+			gpsList.push(gps);
+			//marker = markerMap[gps.nbbm];
+			
  
-			if(marker)
+			/*if(marker)
 				getCurrMap().moveMarker(marker, gps);//移动marker
 			else
 				markerMap[gps.nbbm] = getCurrMap().addHistoryMarker(gps);//添加marker
-		}
+*/		}
  
+		iMap.call('drawRealGpsMarker', {gpsList: gpsList});
 	}
  
 	function goToByTime(time){
@@ -384,7 +389,7 @@ var playBack = (function() {
 	//removeMarker
 	function removeAllGps(){
 		for(var nbbm in markerMap)
-			getCurrMap().removeMarker(markerMap[nbbm]);
+			iMap.call('clear');
  
 		markerMap = {};
 	}
@@ -33,6 +33,10 @@
 		});
 	}
  
+	$('#openWindow').on('click', function(){
+		 window.open('/pages/mapmonitor/alone/wrap.html','alone_map' );
+	});
+	
 	// tools点击
 	$('.mapTools div.item').on('click', function() {
 		if ($(this).hasClass('active')) {
@@ -48,6 +52,8 @@
 		$('.mapTools').addClass('disable');
 		$('.mapTools div.item.active').removeClass('active');
 		$(this).addClass('active');
+		//清理地图
+		iMap.call('clear');
  
 		toolsEvent.clearStyle();
 		toolsEvent[method]();
@@ -61,7 +67,7 @@
 			/*mrw.html('').addClass('to_vehicle vehicle');
 			resetRotate(null, vehiclePanel.showData);*/
 			mrw.html('').addClass('vehicle');
-			vehiclePanel.showData();
+			lineGroup.showData();
 		},
 		search : function() {
 			/*mrw.html('').addClass('to_searchPanel search');
@@ -87,14 +93,14 @@
  
 	// 地图切换
 	$('#mapTypeDrop li').on('click', function() {
-		realMap[this.id].change();
-		var type = $('.mapTools .item.active').data('click');
+		iMap.changeDefault(this.id);
+		/*var type = $('.mapTools .item.active').data('click');
 		if(type == 'vehicle'){
 			var activePanel = $('.mapRightWrap .panel-collapse.collapse.in');
 			if(activePanel.length > 0){
 				vehiclePanel.drawLineAndGps(activePanel.data('line'));
 			}
-		}
+		}*/
 	});
  
 	// 关闭左侧栏
@@ -105,8 +111,8 @@
 	$('#mapContainer').height($(pjaxContainer).height() + 49);
  
 	mrw.html(spinnerLoad);
-	realMap.init();
-	vehiclePanel.showDataLazy();
+	//realMap.init();
+	lineGroup.showDataLazy();
  
 	//function init(){
 		/*//初始化地图
@@ -8,66 +8,91 @@ var searchPanel = (function() {
 		return realMap[realMap.getMap().fName];
 	}
  
-	var allGps;
+	var allGps, gpsArray;
+	
+	var $wrap
+	
+	var activeItem;
  
 	var exports = {
 		init : function() {
+			
 			var htmlStr = template('search_panel_temp', {});
 			$('.mapRightWrap').html(htmlStr);
  
-			//focus
+			$wrap = $('.mapRightWrap .search_result');
 			//焦点时获取所有的gps
 			$('#realSearchInput').on('focus', function(){
-				allGps = vehiclePanel.getAllGps();
-				console.log('focus', allGps);
+				getGpsData();
 			})
 			.on('keyup', function(){
-				var t = $(this).val()
-					,list = [];
-				
-				$.each(allGps, function(){
-					if(this.nbbm.indexOf(t) == -1)
-						return true;
-					
-					this.fromNow = moment(this.timestamp).fromNow();
-					list.push(this);
-				});
-				
-				var resultHtml = template('search_result_temp', {list: list});
-				$('.mapRightWrap .search_result').html(resultHtml);
+				var t = $(this).val();
+				search(t);
 			});
  
 			$('.search_result').on('click', '.result_item' ,function(){
-				console.log($(this).data('device'));
-			});
-			
-			//var allGps = vehiclePanel.getAllCars();
-			/*$('#realSearchInput').on('keyup', function(){
-				var t = $(this).val()
-					,array = [];
-				$.each(allCars, function(i, nbbm){
-					if(nbbm.indexOf(t) != -1)
-						array.push(nbbm);
-				});
-			});*/
-			// 建立一个自动完成的对象
-			/*getCurr().autocomplete('realSearchInput', function(json){
+				activeItem = $(this).data('device');
+				var deviceId = $(this).data('device')
+					,gps = allGps[deviceId];
  
-				var resultHtml = template('search_result_temp', json);
-				$('.mapRightWrap .search_result').html(resultHtml);
-				//搜索车辆
-				//console.log(json);
+				iMap.call('clear')
+					.call('drawRealGpsMarker', {gpsList: [gps], coordTransform: true})
+					.call('goToMarker', {deviceId: deviceId})
+					.call('openWindow', {deviceId: deviceId});
 			});
-			
-			//查询结果选中事件
-			$('.search_result').on('click', '.result_item'
-					,function(){
-				
-				console.log(this);
-				//getCurr().setPlace($(this).data('title'));
-			});*/
+		}
+		//gps更新事件
+		,gpsRefresh: function(){
+			//重新执行搜索
+			getGpsData();
+			search($('#realSearchInput').val());
+			//更新当前定位的点
+			if(activeItem)
+				iMap.call('drawRealGpsMarker', {gpsList: [allGps[activeItem]], coordTransform: true});
 		}
 	};
-
 	return exports;
+	
+	
+	function getGpsData(){
+		gpsArray = [];
+		allGps = consts.allGps;
+		
+		for(var deviceId in allGps)
+			gpsArray.push(allGps[deviceId]);
+	}
+	
+	function search(t){
+		var list = [];
+		
+		if(!t){
+			$wrap.html('');
+			return;
+		}
+		$.each(gpsArray, function(){
+			if(this.nbbm.indexOf(t) == -1)
+				return true;
+			
+			this.fromNow = moment(this.timestamp).fromNow();
+			list.push(this);
+		});
+		//排序
+		list.sort(carSort);
+		var resultHtml = template('search_result_temp', {list: list});
+		$wrap.html(resultHtml);
+	}
+	
+	//车辆排序
+	function carSort(g1, g2){
+		//营运状态
+		if(g1.state != g2.state)
+			return  Math.abs(g1.state) - Math.abs(g2.state);
+		
+		//上下行
+		if(g1.upDown != g2.upDown)
+			return g1.upDown - g2.upDown;
+		
+		
+		return g1.nbbm > g2.nbbm?1:-1;
+	}
 })();
 \ No newline at end of file
-/*
- * #车辆模块相关操作
- */
-
-var vehiclePanel = (function() {
-	
-	//设备号和marker映射
-	var gpsMarker = {}
-		,cLineCode;// 当前线路编码
-	
-	function getCurrMap(){
-		return realMap[realMap.getMap().fName];
-	}
-	var storage = window.localStorage;
-	
-	function closeAll(){
-		$('.mapRightWrap .collapse.in').collapse('hide');
-	}
-	
-	// 手风琴收拢
-	$('.mapRightWrap').on('hide.bs.collapse', '.panel-collapse', function() {
-		$(this).prev().find('span.icon').addClass('rotate');
-		cLineCode = null;
-	});
-
-	// 手风琴展开
-	$('.mapRightWrap').on('show.bs.collapse', '.panel-collapse', function() {
-		$(this).prev().find('span.icon').removeClass('rotate');
-		var lineCode = $(this).data('line');
-		//收拢其他
-		closeAll();
-		cLineCode = lineCode;
-		drawLineAndGps(lineCode, function(){
-			//从storage里获取路由数据
-			var route = JSON.parse(storage.getItem(lineCode + '_route'));
-			//在地图上画出线路
-			getCurrMap().drawLine(route);
-		});
-	});
-	
-	//跳转到轨迹回放
-	function toPlayBack(nbbm, lineCode){
-		playBack.setDefaultCar(nbbm, lineCode);
-		$('.mapTools .item[data-click=playBack]').click();
-	}
-	
-	//绘制线路和GPS
-	function drawLineAndGps(lineCode, callFun){
-		//过滤出该线路的GPS点
-		var showList = [], gps;
-		/*if(lineGps[lineCode]){
-			$.each(lineGps[lineCode], function(){
-				gps = allGps[this];
-				showList.push(gps);
-				gpsMarker[gps.deviceId] = gps;
-			});
-		}*/
-		for(var dId in allGps){
-			if(allGps[dId].lineId == lineCode)
-				showList.push(allGps[dId]);
-		}
-		
-		//显示车辆列表
-		var htmlStr = template('vehicle_panel_collapse_temp', {list: showList});
-		$('#collapse_' + lineCode).html(htmlStr);
-		
-		/**
-		 * 延迟一下再画地图，不然会有点卡
-		 */
-		var that = $(this);
-		setTimeout(function(){
-			callFun && callFun();
-			//画GPS
-			getCurrMap().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 = {};
-	$('#mapContainer').on('gps_refresh', function(e, add, up){
-		var temp = add;
-		if(up)
-			temp = temp.concat(up);
-		
-		var gps;
-		if(!$(this).is(":hidden")){
-			$.each(temp, function(){
-				allGps[this.deviceId] = this;
-			});
-			
-		/*	$.each(add, function(){
-				if(!lineGps[this.lineId])
-					lineGps[this.lineId] = [];
-				//线路和设备号映射
-				//lineGps[this.lineId].push(this.deviceId);
-			})*/
-		}
-		
-		//先暂时重绘，后面再优化
-		if(cLineCode){
-			drawLineAndGps(cLineCode);
-			/*var showList = [];
-			if(lineGps[cLineCode]){
-				$.each(lineGps[cLineCode], function(){
-					showList.push(allGps[this]);
-				});
-			}
-			mapObj.drawGpsMarker(showList);*/
-		}
-	});
-
-	var exports = {
-		// 加载车辆信息
-		showData: function(){
-			//要展示的线路
-			var lines = JSON.parse(storage.getItem('lineControlItems'));
-			
-			var htmlStr = template('vehicle_panel_temp', {list: lines});
-			$('.mapRightWrap').html(htmlStr).addClass('vehicle');
-			//滚动条
-			/*$('.gps-line-wrap').slimscroll({
-				height: '100%',
-				alwaysVisible: true
-			});*/
-			/*var line = {code: 10103, name: '119路'};
-			$get('/gps/real/line/' + line.code, null, function(data){
-				//过滤掉没有自编号和站点名为空的
-				var newArray = [];
-				$.each(data, function(i, obj){
-					if(obj.nbbm != null && obj.stationName != null)
-						newArray.push(obj);
-				});
-				
-				var htmlStr = template('vehicle_panel_temp', {list: newArray});
-				$('.mapRightWrap').html(htmlStr).addClass('vehicle');
-				
-				//在地图上画出线路
-				var mapObj;
-				mapObj = getCurr();
-				mapObj.drawLine(line.name, newArray);
-			});*/
-		},
-		showDataLazy : function() {
-			setTimeout(exports.showData, 1000);
-		},
-		drawLineAndGps: function(lineCode){
-			drawLineAndGps(lineCode);
-		},
-		//获取所有的车辆 - 从GPS定时定距里查询
-		getAllGps: function(){
-			var array = [];
-			/*var array = [
-			   {nbbm: 'B-91524', state: 0, timestamp: 1469427233000, stationName: '金桥路浦东大道', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 000},
-			   {nbbm: 'B-91334', state: 1, timestamp: 1469427233000, stationName: '博山东路', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 111},
-			   {nbbm: 'B-91224', state: 0, timestamp: 1469427233000, stationName: '闵浦大桥', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 222},
-			   {nbbm: 'B-91124', state: 0, timestamp: 1469427312000, stationName: '旧金山', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 333},
-			   {nbbm: 'B-91924', state: -1, timestamp: 1469427233000, stationName: '硅谷', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 444},
-			   {nbbm: 'B-92224', state: 0, timestamp: 1469427312000, stationName: '意大利', lineId: 1024, lon: 121.504921, lat: 31.086559, deviceId: 555}
-			];*/
-			for(var deviceId in allGps)
-				array.push(allGps[deviceId]);
-			return array;
-		},
-		clear: function(){
-			cLineCode = null;
-		},
-		toPlayBack:toPlayBack 
-	};
-	
-	return exports;
-})();
 \ No newline at end of file
@@ -18,6 +18,9 @@
 	<span class="item" id="trafficItem">
 		实时路况
 	</span>
+	<span class="item" id="openWindow">
+		新窗口 
+	</span>
 </div>
 </div>
  
@@ -83,11 +86,70 @@
  
 <div id="temps"></div>
  
-<script src="/pages/mapmonitor/real/js/map_platform.js" data-exclude=1></script>
-<script src="/pages/mapmonitor/real/js/vehicle.js" data-exclude=1></script>
+<script src="/assets/js/TransGPS.js" data-exclude=1></script>
+<script src="/pages/mapmonitor/real/js/map/iMap.js" data-exclude=1></script>
+<script src="/pages/mapmonitor/real/js/lineGroup.js" data-exclude=1></script>
 <script src="/pages/mapmonitor/real/js/search.js" data-exclude=1></script>
 <script src="/pages/mapmonitor/real/js/temp.js" data-exclude=1></script>
 <script src="/pages/mapmonitor/real/js/real.js" data-exclude=1></script>
 <script src="/pages/mapmonitor/real/js/playBack.js" data-exclude=1></script>
+
+<script src="/pages/mapmonitor/real/js/map/platform/baidu.js" data-exclude=1></script>
+<script src="/pages/mapmonitor/real/js/map/platform/gaode.js" data-exclude=1></script>
 <script>
+var consts = {
+	mapContainer: '#mapContainer',
+	center_point: {
+		lng : 121.544336,
+		lat : 31.221315
+	},
+	allGps: {},
+	trafficBtn: '#trafficItem'//实时路况按钮
+}
+
+setTimeout(function(){
+	iMap.addMap('baidu', '百度地图', baiduMap)
+		.addMap('gaode', '高德地图', gaodeMap)
+		.call('init');
+}, 500);
+
+
+//Canvas 带圆角的矩形
+CanvasRenderingContext2D.prototype.roundRect = function (x, y, w, h, r) {
+    if (w < 2 * r) r = w / 2;
+    if (h < 2 * r) r = h / 2;
+    this.strokeStyle ='rgba(0,102,0,.1)';
+    this.beginPath();
+    this.moveTo(x+r, y);
+    this.arcTo(x+w, y, x+w, y+h, r);
+    this.arcTo(x+w, y+h, x, y+h, r);
+    this.arcTo(x, y+h, x, y, r);
+    this.arcTo(x, y, x+w, y, r);
+    this.closePath();
+    return this;
+}
+
+//GPS刷新事件
+$('#mapContainer').on('gps_refresh', function(e, add, up){
+	if($(this).is(":hidden"))
+		return;
+	var all = add ,gps;
+	if(up)
+		all = all.concat(up);
+	
+	$.each(all, function(){
+		consts.allGps[this.deviceId] = this;
+	});
+	
+	var type = $('.mapTools .item.active').data('click');
+	console.log(type);
+	switch (type) {
+	case 'vehicle':
+		lineGroup.gpsRefresh();
+		break;
+	case 'search':
+		searchPanel.gpsRefresh();
+		break;
+	}
+});
 </script>
 <script id="search_panel_temp" type="text/html">
 <div class="input-group">
-    <input type="text" id="realSearchInput" class="form-control" placeholder="车辆自编号搜索...">
+    <input type="text" id="realSearchInput" class="form-control" placeholder="搜索车辆...">
     <span class="input-group-btn">
         <button class="btn" type="button"><i class="fa fa-search"></i> 搜索</button>
     </span>
@@ -13,11 +13,10 @@
 <script id="search_result_temp" type="text/html">
 <div class="item_vehicle_list">
 {{each list as gps i}}
-		<p class="result_item item_vehicle" data-device={{gps.deviceId}}>
-			&nbsp;{{gps.nbbm}} &nbsp;&nbsp;- {{if gps.state==0}}营运中{{else if gps.state==1}}非营运{{else}}未知营运状态{{/if}}<br>
+		<p class="result_item item_vehicle {{if gps.state==0}}state_online{{/if}}" data-device={{gps.deviceId}}>
+			&nbsp;{{gps.nbbm}} &nbsp;&nbsp;- {{if gps.state==0}}营运{{else}}非营运{{/if}}<br>
 			<span class="sub_text"> {{gps.stationName}}（{{gps.fromNow}} 更新）</span>
 		</p>
-
 {{/each}}
 </div>
 </script>
@@ -28,10 +28,16 @@
 </script>
 <script id="vehicle_panel_collapse_temp" type="text/html">
 {{each list as gpsObj i}}
-	<div class="vehicle-item online" >
+	<div class="vehicle-item {{if gpsObj.state==0}}online_{{gpsObj.upDown}}{{else}}offline{{/if}}" >
 		<div class="text">
-			 <span class="nbbm goto-marker" data-deviceId="{{gpsObj.deviceId}}"><i class="fa fa-circle"></i> &nbsp;{{gpsObj.nbbm}}</span> 
-			<span style="font-size: 13px;">{{gpsObj.stationName}}</span>
+			 <span class="nbbm goto-marker" data-deviceId="{{gpsObj.deviceId}}">
+			<i class="fa fa-circle"></i> &nbsp;{{gpsObj.nbbm}}</span> 
+			
+			{{if gpsObj.state==0}}
+				<span style="font-size: 13px;">{{gpsObj.stationName}}</span>
+			{{else}}
+				<span style="font-size: 13px;">非营运</span>
+			{{/if}}
 		</div>
 		<div class="icon">
 			 <!--<i class="fa fa-file-text-o"></i>-->
@@ -46,48 +52,41 @@
 <!-- gps信息窗口 -->
 <script id="gps_info_win_temp" type="text/html">
 <div class="gps_info_win">
-<h4 style="color:#0E6AF9;">
+<h5 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}}
+</h5>
+<h4 style="margin: 5px 0 5px 0;">
+		<span style="color: #0E6AF9;">{{nbbm}}</span>
 </h4>
 <p>
-路牌：
-{{if currSch!=null}}
-	{{currSch.lpName}}
-{{/if}}
-</p>
-<p>
 营运状态：{{if state==0}}营运{{else}}非营运{{/if}}
 </p>
 <p>
-在线状态：在线
+走向：{{if upDown==0}}上行{{else if upDown==1}}下行{{else}}未知走向{{/if}}
 </p>
 <p>速度：{{speed}}</p>
+<p>经度：{{lon}}</p>
+<p>纬度：{{lat}}</p>
+
+<p style="color: gray;">{{fromNow}} 更新</p>
 <hr>
+<p>
+{{if currSch!=null}}
+	路牌：{{currSch.lpName}}
+{{/if}}
+</p>
 <p class="banci-info">
-	开往
-	{{if currSch!=null}}{{currSch.zdzName}}{{/if}}
-	( 预计 ? 到达 )
+	{{if currSch!=null}}开往 {{currSch.zdzName}}{{/if}}
 </p>
 <p class="banci-info">
 {{if nextSch!=null}}
 	下一班{{nextSch.qdzName}} {{nextSch.fcsj}} 发车
 {{/if}}
 </p>
-<a href="javascript:vehiclePanel.toPlayBack('{{nbbm}}', '{{lineId}}')" class="link_to_pback" style="color:#006600;font-size:12px;">轨迹回放</a>
+<a href="javascript:lineGroup.toPlayBack('{{nbbm}}', '{{lineId}}')" class="link_to_pback" style="color:#006600;font-size:12px;">轨迹回放</a>
 </div>
 </script>
 \ No newline at end of file