Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 41e5778d 7707696e
Showing 21 changed files with 791 additions and 120 deletions
src/main/java/com/bsth/controller/excep/NowOutboundController.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/entity/excep/Outbound.java
src/main/java/com/bsth/service/excep/NowOutboundService.java
src/main/java/com/bsth/service/excep/impl/NowOutboundServiceImpl.java
src/main/java/com/bsth/service/excep/impl/NowSpeedingServiceImpl.java
src/main/resources/static/pages/base/interval/edit.html
src/main/resources/static/pages/base/interval/js/interval-add-form.js
src/main/resources/static/pages/base/interval/js/interval-edit-form.js
src/main/resources/static/pages/base/interval/js/interval-list-table.js
src/main/resources/static/pages/base/interval/list.html
src/main/resources/static/pages/excep/js/line-list-function.js
src/main/resources/static/pages/excep/js/map.js
src/main/resources/static/pages/excep/mhspeedingList.html
src/main/resources/static/pages/excep/outBoundMap.html
src/main/resources/static/pages/excep/outboundMap.html
src/main/resources/static/pages/excep/pdboundList.html
src/main/resources/static/pages/excep/speedingMap.html
src/main/resources/static/pages/permission/authorize_all/user_auth.html
 package com.bsth.controller.excep;
+import java.text.ParseException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Outbound;
+import com.bsth.entity.excep.Speeding;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.excep.NowOutboundService;
 import com.bsth.util.PageObject;
@@ -44,5 +48,11 @@ public class NowOutboundController extends BaseController&lt;SysUser, Integer&gt;{
 		return modelMap;
 	}
+	@RequestMapping(value = "/findPosition", method = RequestMethod.GET)
+	public List<Outbound> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
+    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
+    	List<Outbound> listOutbound = nowOutboundService.findPosition(deviceid,startdate,enddate);
+    	return listOutbound;
+	}
 }
@@ -198,6 +198,7 @@ public class SchAttrCalculator {
 	public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list){
 		String lineCode = list.get(0).getXlBm();
 		LineConfig conf = lineConfigData.get(lineCode);
+		long t = System.currentTimeMillis();
 		int outConfig = -1;
 		//限定出站既出场的停车场
 		String park = null;
@@ -221,8 +222,62 @@ public class SchAttrCalculator {
 			if(StringUtils.isNotEmpty(sch.getZdsjActual()))
 				continue;
+			if(Math.abs((t - sch.getDfsjT())) > 1000 * 60 * 60){
+				//差值较大，倒着找看有没有更合适的
+				ScheduleRealInfo schReverse = calcCurrentExecSchReverse(list, outConfig, limitPark, park);
+				if(null != schReverse && !schReverse.getId().equals(sch.getId())){
+					logger.info("calc_current_exec_sch_reverse... -" + schReverse.getId());
+					return suitableExecSch(schReverse, sch, t);
+				}
+			}
 			return sch;
 		}
 		return null;
 	}
+
+	/**
+	 * 反转匹配一个班次
+	 * @param list
+	 * @param outConfig
+	 * @param limitPark
+	 * @param park
+	 * @return
+	 */
+	private ScheduleRealInfo calcCurrentExecSchReverse(List<ScheduleRealInfo> list, int outConfig, boolean limitPark, String park){
+		ScheduleRealInfo near = null;
+		for(ScheduleRealInfo sch : list){
+			//如果是出站既出场，忽略出场班次
+			if(outConfig == 2 && isInout(sch)
+					&& (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode())))
+				continue;
+
+			//忽略烂班
+			if(sch.isDestroy())
+				continue;
+
+			if(StringUtils.isNotEmpty(sch.getZdsjActual())){
+				near = null;
+				continue;
+			}
+
+			if(null == near)
+				near = sch;
+		}
+		return near;
+	}
+
+	/**
+	 * 比较2个班次，谁是指定时间更合适执行的
+	 * @param schReverse
+	 * @param sch
+	 * @param t
+	 * @return
+	 */
+	private ScheduleRealInfo suitableExecSch(ScheduleRealInfo schReverse, ScheduleRealInfo sch, long t){
+		return Math.abs(t - schReverse.getDfsjT()) > Math.abs(t - sch.getDfsjT())?sch: schReverse;
+	}
+
+	private boolean isInout(ScheduleRealInfo sch){
+		return sch.getBcType().equals("out") || sch.getBcType().equals("in");
+	}
 }
@@ -101,6 +101,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 lateSchMap.remove(sch.getClZbh());
                 sch.setLate2(false);
                 sch.setLateMinute(0);
+                sch.setDfAuto(false);
             }
         }catch (Exception e){
             logger.error("", e);
@@ -34,9 +34,6 @@ public class Outbound {
 	 */
 	private String lineName;
-
-	
-
 	/**
 	 * 上下行（0 上行 ， 1 下行 ， -1 无效）
 	 */
@@ -57,18 +54,66 @@ public class Outbound {
 	 */
 	private String location;
+	/**
+	 * 超速结束时经度
+	 */
+	private Float endlon;
+	
+	/**
+	 * 超速结束时纬度
+	 */
+	private Float endlat;
 	/**
 	 * 	时间戳
 	 */
 	private Long timestamp;
+	public Float getEndlon() {
+		return endlon;
+	}
+
+	public void setEndlon(Float endlon) {
+		this.endlon = endlon;
+	}
+
+	public Float getEndlat() {
+		return endlat;
+	}
+
+	public void setEndlat(Float endlat) {
+		this.endlat = endlat;
+	}
+
+	public Long getEndtimestamp() {
+		return endtimestamp;
+	}
+
+	public void setEndtimestamp(Long endtimestamp) {
+		this.endtimestamp = endtimestamp;
+	}
+
+	public String getEndtimestampDate() {
+		return endtimestampDate;
+	}
+
+	public void setEndtimestampDate(String endtimestampDate) {
+		this.endtimestampDate = endtimestampDate;
+	}
+
 	/**
 	 * 时间戳转换的时间
 	 */
 	private String timestampDate;
+	//结束时间，单位：秒/s
+	@Transient
+	private Long endtimestamp;
+	
+	@Transient
+	private String endtimestampDate;
+		
 	/**
 	 * 	时间
 	 */
 package com.bsth.service.excep;
+import java.util.List;
 import java.util.Map;
 import com.bsth.entity.excep.Outbound;
@@ -8,4 +9,6 @@ import com.bsth.util.PageObject;
 public interface NowOutboundService {
 	PageObject <Outbound> Pagequery(Map<String, Object> map) ;
 	Map<String, Object> getReport( Map<String, Object> map);
+	List<Outbound> findPosition(String deviceid, String startdate,
+			String enddate);
 }
@@ -14,16 +14,16 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Outbound;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.NowOutboundService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
+import com.bsth.util.TransGPS;
+import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
 import com.github.abel533.echarts.Option;
 import com.google.gson.Gson;
@@ -37,7 +37,7 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 		ResultSet rs = null;
 		int page=Integer.parseInt(map.get("page").toString());
 		List<Outbound> list=new ArrayList<Outbound>();
-		String sql="select * from bsth_c_outbound where 1=1 ";
+		String sql="select * from bsth_c_outbound_handle where 1=1 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
@@ -61,7 +61,7 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
-					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+					sql += " and starttimestamp >="+t1 +" and endtimestamp <="+t2;
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -69,8 +69,10 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 			}
 		}
-	//	sql +=" order by id limit ?,?";
-		sql +=" order by timestamp limit ?,?";
+		
+		sql +=" and endtimestamp - starttimestamp >10000 ";//越界超过30秒的才显示，有待探讨。
+		 
+		sql +=" order by starttimestamp limit ?,?";
 		try {
 			conn = DBUtils_MS.getConnection();
@@ -90,22 +92,29 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 	}
 	static List<Outbound> resultSet2Set(ResultSet rs) throws SQLException{
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		List<Outbound> list=new ArrayList<Outbound>();
 		Outbound outbound;
+		Location location;
 		while(rs.next()){
 			outbound=new Outbound();
-	//		outbound.setId(Integer.valueOf(rs.getObject("id").toString()));
+			outbound.setId(Integer.valueOf(rs.getObject("id").toString()));
 			outbound.setLine(Integer.valueOf(rs.getObject("line").toString()));
 			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			outbound.setLon(Float.valueOf(rs.getObject("lon").toString()));
-			outbound.setLat(Float.valueOf(rs.getObject("lat").toString()));
+			//将gps的经纬度转成百度的经纬度
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(rs.getFloat("startLon"), rs.getFloat("startLat"))));
+            outbound.setLon((float)location.getLng());
+            outbound.setLat((float)location.getLat());
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(rs.getFloat("endLon"), rs.getFloat("endLat"))));
+            outbound.setEndlon((float)location.getLng());
+            outbound.setEndlat((float)location.getLat());
+			outbound.setTimestamp((Long.valueOf(rs.getObject("startTimestamp").toString())));
+			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
+			outbound.setEndtimestamp((Long.valueOf(rs.getObject("endTimestamp").toString())));
+			outbound.setEndtimestampDate(sdf.format(new Date(outbound.getEndtimestamp())));
 			//run 时注解
 			outbound.setLineName(BasicData.lineCode2NameMap.get(outbound.getLine().toString()));
-			outbound.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
-			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
 			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
-//			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
 			list.add(outbound);
 		}
 		return list;
@@ -114,7 +123,7 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 	@Override
 	public PageObject<Outbound> Pagequery(Map<String, Object> map) {
 		// TODO Auto-generated method stub  PageObject<Outbound> Pagequery
-		String sql="select count(*) record  from bsth_c_outbound where 1=1 ";
+		String sql="select count(*) record  from bsth_c_outbound_handle where 1=1 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
@@ -139,7 +148,7 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
-					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+					sql += " and starttimestamp >="+t1 +" and endtimestamp <="+t2;
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -147,6 +156,9 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 			}
 		}
+		
+		sql +=" and endtimestamp - starttimestamp >10000 ";//yue越界超过10秒的才显示，有待探讨。
+		
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
@@ -165,10 +177,9 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
 		}
-		
 		PageHelper pageHelper = new PageHelper(totalData, map);
 		List<Outbound> list=findAll(pageHelper.getMap());
-		for (int i = 0; i < list.size(); i++) {
+/*		for (int i = 0; i < list.size(); i++) {
 			String nbbm2=list.get(i).getVehicle() ;
 			Long d1=list.get(i).getTimestamp();
 			Date datess = new Date(d1);
@@ -194,7 +205,7 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 			}
-		}
+		}*/
 		PageObject<Outbound> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
@@ -319,4 +330,45 @@ public class NowOutboundServiceImpl implements NowOutboundService{
 		return dataList;
 	}
+	
+	@Override
+    public List<Outbound> findPosition(String deviceid, String startdate,
+                                       String enddate){
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where vehicle = ? and timestamp >= ? and timestamp <= ? order by timestamp ";
+        Connection conn = null;	                                        
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        List<Outbound> listResult = new ArrayList<Outbound>();
+        Outbound outbound = null;
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            long startTime = sdf.parse(startdate).getTime();
+            long endTime = sdf.parse(enddate).getTime();
+            ps.setString(1, deviceid);
+            ps.setLong(2,startTime);
+            ps.setLong(3,endTime);
+            rs = ps.executeQuery();
+            Location location;
+            while (rs.next()) {
+            	outbound = new Outbound();
+            	outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+                location = TransGPS.LocationMake(rs.getFloat("lon"), rs.getFloat("lat"));
+                location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+                outbound.setLon((float)location.getLng());
+                outbound.setLat((float)location.getLat());
+                outbound.setTimestamp(rs.getLong("timestamp"));
+                // 上下行
+                listResult.add(outbound);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        return listResult;
+
+    }
+	
 }
@@ -39,7 +39,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
 		ResultSet rs = null;
 		int page=Integer.parseInt(map.get("page").toString());
 		List<Speeding> list=new ArrayList<Speeding>();
-		String sql="select * from bsth_c_speedingmh where 1=1 ";
+		String sql="select * from bsth_c_speeding_handle where 1=1 ";
 		Object line=map.get("line");
 		Object updown=map.get("updown");
 		Object startDate=map.get("startDate");
@@ -128,7 +128,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
 	@Override
 	public PageObject<Speeding> Pagequery(Map<String, Object> map) {
-		String sql="select count(*) record from bsth_c_speedingmh where 1=1 ";
+		String sql="select count(*) record from bsth_c_speeding_handle where 1=1 ";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Object line=map.get("line");
 		Object updown=map.get("updown");
@@ -49,7 +49,7 @@
 					<div class="col-md-12" style="margin-top:10px">
 						<label class="control-label col-md-5"> 间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 	                 	<div class="col-md-4">
-	                 		<input type="text" class="form-control" name="level" id="levelInput" placeholder="间隔等级">
+	                 		<input type="text" class="form-control" name="level" id="levelInput" placeholder="间隔等级" readonly>
 	                    </div>
 	                </div>
@@ -30,21 +30,18 @@ $(function(){
 		focusInvalid : true, 
 		// 需要验证的表单元素
 		rules : {
-			// 公司名称编码
 			'level' : {
 				// 必填项
 				required : true,
 				// 最大长度
 				maxlength: 10
 			},
-			// 公司名称
 			'peak' : {
 				// 必填项
 				required : true,
 				// 最大长度
 				maxlength: 10
 			},
-			// 公司名称
 			'trough' : {
 				// 必填项
 				required : true,
@@ -12,7 +12,7 @@
 	var intervalId = $.url().param('no');
 	// 如果参数ID不为空
 	if(intervalId) {
-		// 获取线路Id元素并设值
+		// 获取间隔信息Id元素并设值
 		$('#intervalId').val(intervalId);
 		/** 根据ID查询详细信息 */
 		$get('/interval/' + intervalId ,null, function(result){
@@ -50,21 +50,18 @@
 		focusInvalid : true, 
 		// 需要验证的表单元素
 		rules : {
-			// 公司名称编码
 			'level' : {
 				// 必填项
 				required : true,
 				// 最大长度
 				maxlength: 10
 			},
-			// 公司名称
 			'peak' : {
 				// 必填项
 				required : true,
 				// 最大长度
 				maxlength: 10
 			},
-			// 公司名称
 			'trough' : {
 				// 必填项
 				required : true,
@@ -114,6 +114,25 @@
 			// 把数据填充到模版中
 			var tbodyHtml = template('interval_list_temp',{list:result.content});
 			$('#datatable_interval tbody').html(tbodyHtml);
+			/**
+			 * 绑定删除事件。
+			 */
+			$(".delete").click(function(){
+				var intervalId = $(this).data('id');
+				layer.confirm('是否要删除间隔信息?', {
+				  btn: ['确定','取消'] //按钮
+				}, function(){
+					$.ajax({
+					  	url: '/interval/' + intervalId,
+						type: 'DELETE',
+						success: function(result) {
+							window.location.href = 'list.html';
+						}
+				 	});
+				}, function(){
+				});
+			});
+			
 			// 是重新分页且返回数据长度大于0
 			if(isPon && result.content.length > 0){
 				// 重新分页
@@ -154,4 +173,5 @@
 		    }
 		});
 	}
+	
 })();
 \ No newline at end of file
@@ -25,7 +25,7 @@
 					 <span class="caption-subject font-dark sbold uppercase">间隔信息</span>
 				</div>
 				<div class="actions">
-					<div class="btn-group btn-group-devided" data-toggle="buttons">
+					<div class="btn-group btn-group-devided" data-toggle="buttons" style="display:none">
 						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加间隔信息</a>
 					</div>
 				</div>
@@ -36,7 +36,6 @@
 						<thead>
 							<tr role="row" class="heading">
 								<th >序号</th>
-								<th >间隔ID</th>
 								<th >间隔等级</th>
 								<th >高峰间隔时间</th>
 								<th >低谷间隔时间</th>
@@ -47,7 +46,6 @@
 								<td></td>
 								<td></td>
 								<td></td>
-								<td></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
 										<i class="fa fa-search"></i> 搜索
@@ -76,9 +74,6 @@
 				{{(list.page*10)+(i+1)}}
 			</td>
 			<td>
-				{{obj.id}}
-			</td>
-			<td>
 				{{obj.level}}
 			</td>
 			<td>
@@ -89,7 +84,7 @@
 			</td>
 			<td>
 				<a href="edit.html?no={{obj.id}}" class="btn btn-info btn-sm" data-pjax> 修改 </a>
-				<a  class="btn btn-danger btn-sm" onclick="del({{obj.id}})"> 删除</a>
+				<a class="btn btn-danger btn-sm delete" data-id={{obj.id}}> 删除</a>
 			</td>
 		</tr>
 	{{/each}}
@@ -99,22 +94,4 @@
 		</tr>
 	{{/if}}
 </script>
-<!-- <script src="/pages/base/line/js/tipso.js"></script> -->
-<!-- 线路信息片段JS模块 -->
-<script src="/pages/base/interval/js/interval-list-table.js"></script>
-<script>
-	function del(intervalId){
-		layer.confirm('确定要删除间隔信息吗?', {
-		  btn: ['确定','取消'] //按钮
-		}, function(){
-			$.ajax({
-			  	url: '/interval/' + intervalId,
-				type: 'DELETE',
-				success: function(result) {
-					window.location.href = 'list.html';
-				}
-		 	});
-		}, function(){
-		});
-	}
-</script>
 \ No newline at end of file
+<script src="/pages/base/interval/js/interval-list-table.js"></script>
 \ No newline at end of file
@@ -48,7 +48,7 @@ var PublicFunctions = function () {
 			linePanlThree : function(lineId,data,direction) {
 				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
 				$get('/stationroute/getStationRouteCenterPoints',{lineId:lineId,direction:direction},function(resultdata) {
-					SpeedingMap.clearMarkAndOverlays();
+					BasicMap.clearMarkAndOverlays();
 					var polyline_center;
 					// 如果站点路由数据不为空
 					if(resultdata.length>0) {
@@ -66,7 +66,7 @@ var PublicFunctions = function () {
 			  				// 设置中心点
 			  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
 			  				/** 在地图上画点 @param：<point_center：中心坐标点> */
-			  				SpeedingMap.drawingUpStationPoint(point_center,stationName,s+1);
+			  				BasicMap.drawingUpStationPoint(point_center,stationName,s+1);
 			  			}
 			  		}
@@ -91,7 +91,7 @@ var PublicFunctions = function () {
 								polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
 							}
 							/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
-							SpeedingMap.drawingUpline01(polylineArray,polyline_center,data[d]);
+							BasicMap.drawingUpline01(polylineArray,polyline_center,data[d]);
 						}
 					}
 				});	
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
+ */
+
+var BasicMap = function () {
+	
+	/** BasicMap 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
+	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
+	
+	var Bmap = {
+			
+			init : function() {
+				
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("BasicMap");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat),15);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			/** 获取第一个切路段的点  @return Point*/
+			getFirstPoint : function() {
+				return firstPoint;
+			},
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			/** 获取截取过的路段 @return 路段对象List */
+			getSectionList : function() {
+				
+				return sectionList;
+				
+			},
+			setSectionList : function(list) {
+				
+				sectionList = list;
+			},
+			initCutSectionPoint : function() {
+				sectionList = [];
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			/** 获取切路段的点下标  @return int*/
+			setPointIndex : function(index) {
+				pointIndex = index;
+			},
+			getPointIndex : function() {
+				
+				return pointIndex;
+				
+			},
+			/** 获取路段是否在编辑状态 @return boolean*/
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+					
+			/** 获取路段是否在截取状态 @return boolean*/
+			getIsCutSection : function() {
+				return isCutSection;
+			},			
+			setIsCutSection : function(v) {
+				isCutSection = v ;
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  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;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				var sectionPoint = [];
+				// 线路单击事件
+				polyUpline01.addEventListener('click',function(e) {
+					if(BasicMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					if(BasicMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					BasicMap.setIsEditStatus(true);
+				});
+				
+				// 添加路段双击事件
+				polyUpline01.addEventListener("dblclick",function(e){
+					if(BasicMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					BasicMap.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					sectionList = [];
+					var tbodyHtml = template('section_list',{list : sectionList});
+					// 截取路段
+					$('#section_table tbody').html(tbodyHtml);
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [BasicMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+				
+				// 路段右击事件
+				var editSection = function(e,ee,marker){
+					if(BasicMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					var lng = e.lng;
+					var lat = e.lat;	
+					var sectionName = null;
+					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
+					marker.isFlag = true;
+					if(pointIndex == 0) {
+						sectionPoint[pointIndex] = {lng:lng , lat:lat};
+						layer.msg('进入切路段状态，请选择本路段的终点！');
+						mapBValue.addOverlay(marker);// 添加覆盖物
+						firstPoint = {lng:lng, lat:lat};
+						pointIndex++;
+						EditSectionObj.setEitdSection(polyUpline01.data);
+						// 获取折线坐标集合
+						var editPloyLineArray = polyUpline01.getPath();
+						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					} else if (pointIndex > 0) {
+						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
+							pointList = [];
+							sectionPoint[pointIndex] = {lng:lng , lat:lat};
+							pointList[0] = sectionPoint[pointIndex-1];
+							pointList[1] = sectionPoint[pointIndex];
+							sectionList.push({name:sectionName, section:pointList});	
+							layer.close(index);
+							layer.msg('路段截取成功，请选择下一个路段的终点');
+							mapBValue.addOverlay(marker);// 添加覆盖物
+							var tbodyHtml = template('section_list',{list : sectionList});
+							// 截取路段
+							$('#section_table tbody').html(tbodyHtml);
+							pointIndex++;
+						});
+					}
+					BasicMap.setIsCutSection(true);
+				}
+				var markerMenu=new BMap.ContextMenu();
+				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+				polyUpline01.addContextMenu(markerMenu);
+				
+				
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			// 删除点刷新cutSectionTable
+			refreshCutSectionTable : function() {
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			// 删除点刷新覆盖物
+			deleteCutSectionPoint : function(point) {
+				var lng = point.lng;
+				var lat = point.lat;
+				var allOverlay = mapBValue.getOverlays();
+				// 删除最后一个点
+				for (var i = 0; i < allOverlay.length -1; i++){
+					if(allOverlay[i].isFlag) {
+						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
+							mapBValue.removeOverlay(allOverlay[i]);
+							break;
+						}
+					}
+				}		
+			},			
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 根据站点坐标匹配库中的公交站点（手动规划）
+			stationsPointsToLibraryPoint : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var station = {};
+				var stationList = [];
+				(function(){
+					if (!arguments.callee.count) {
+						arguments.callee.count = 0;
+					}
+					arguments.callee.count++;
+					var index = parseInt(arguments.callee.count) - 1;
+					if (index >= len) {
+						callback && callback(stationList);
+			        	return ; 
+			        }
+					var f = arguments.callee;
+					station = arra[index];					
+					if(arra[index].name!=''){
+						
+						$.get('/station/matchStation',station,function(resultStation) {
+							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
+							f();
+						});							 
+					 }else {
+						 f();
+					 }	
+				})()
+			},
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
+				
+			}
+			
+	}
+	
+	return Bmap;
+	
+}();
 \ No newline at end of file
@@ -128,7 +128,7 @@
 			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
 			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"  
             data-endlat="{{obj.endlat}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
-			查看轨迹										
+			轨迹回放										
 		</a>
 	</td>
 	<td>
@@ -270,7 +270,6 @@ $(function(){
 					index++;
 				});
 			})();
-			console.log(listResult);
 		});
 	}
-<link href="/pages/base/stationroute/css/bmap_base.css" rel="stylesheet" type="text/css" />
-<div class="portlet-body">
-	<!-- 地图 -->
-	<div id="bmap_basic" class="bmaps"></div>
-</div>
-<!-- load事件 -->
-<script src="/pages/excep/js/outboundmap-load.js"></script>
-<!-- 线路类 -->
-<script src="/pages/excep/js/outboundline.js"></script>
-<!-- 绘图类 -->
-<script src="/pages/base/stationroute/js/drawingManager.js"></script>
-<!-- 地图类 -->
-<script src="/pages/excep/js/outbound-map.js"></script>
-<!-- 函数与方法 -->
-<script src="/pages/excep/js/outboundmap-function.js"></script>
-<!-- ajax请求类 -->
-<script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script>
-
+<style>
+	.play_back-layer .layui-layer-title{
+    	height: 36px;
+    	border-bottom: none;
+	}
+</style>
+
+<div id="titleMap">
+<button id="run" style="margin-left:10px" class="btn btn-sm green btn-outline filter-submit margin-bottom">运行</button>
+</div>
+<div id="BasicMap">
+</div>
+<style type="text/css">
+
+#BasicMap{
+	width: 100%; 
+	border: 2px solid #fdfdfd;
+	height: calc(100% - 30px);
+	overflow: hidden;
+}
+</style>
+<script type="text/javascript" src="/pages/excep/js/map.js"></script>
+<script type="text/javascript" src="/pages/excep/js/line-list-function.js"></script>
+
+<script type="text/javascript">
+$(function(){
+		var dataArr = window.localStorage.zbhAndDate.split(",");//获取页面传递过来的车辆自编号以及超速起始时间和超速结束时间
+		localStorage.clear();//清楚前端缓存
+		var vehicle = dataArr[0];
+		var startdate = dataArr[1];
+		var enddate = dataArr[2];
+		var lon = dataArr[3];//起点经度
+		var lat = dataArr[4];//起点纬度
+		var endLon = dataArr[5];//终点经度
+		var endLat = dataArr[6];//终点纬度
+		var lineid = dataArr[7];
+		var directionData = dataArr[8];
+		var pointObj;//坐标和速度组成的对象
+		var Points = [];//坐标和速度对象的集合
+		var coordinateArr = [];//坐标点数组
+  		$.ajax({
+        	type: "GET",
+        	async:false,
+            url: '/nowbound/findPosition',
+            data: {vehicle:vehicle,startdate:startdate,enddate:enddate},
+            success: function(data){
+             	$.each(data,function(i,item){
+             		if(item.lon>1 && item.lat>1){
+             			pointObj = new Object();
+             			pointObj.coordinate = new BMap.Point(item.lon,item.lat);
+			 			pointObj.vehicle = item.vehicle;
+			 			Points.push(pointObj);
+            		} 
+ 				});
+            }
+        });      
+ setTimeout(function(){
+		var map = BasicMap.init();//创建地图
+		$get('/sectionroute/findSection',{'line.id_eq' : lineid , 'directions_eq' :directionData},function(data) {
+			// 在地图上画出线路走向
+			PublicFunctions.linePanlThree(lineid,data,directionData);
+		});
+		var myP1 = new BMap.Point(lon,lat);    //起点
+		var myP2 = new BMap.Point(endLon,endLat);    //终点
+ 		for(i in Points){
+ 			coordinateArr.push(Points[i].coordinate);
+ 		}
+ 		var polyline = new BMap.Polyline(coordinateArr, {strokeColor:"red", strokeWeight:5, strokeOpacity:0.5});//创建折线
+		var myIcon = new BMap.Icon("/pages/excep/img/bus.png", new BMap.Size(32, 70), {//小车图片
+			imageOffset: new BMap.Size(5,20) //图片的偏移量。为了是图片底部中心对准坐标点。
+		}); 
+		
+		var carMk;
+		$(document).on('click', '#run', function() {
+			map.centerAndZoom(new BMap.Point(lon,lat),16);//地图中心点坐标 */
+			if(typeof(carMk)!="undefined"){
+ 				map.removeOverlay(carMk);//清空上一次的轨迹
+			}
+ 			carMk = new BMap.Marker(coordinateArr[0],{icon:myIcon});
+			map.addOverlay(polyline);//增加折线
+			var paths = coordinateArr.length;//获得有几个点
+			map.addOverlay(carMk);
+			i=0;
+			setTimeout(function(){
+				resetMkPoint(0);
+			},500);
+			function resetMkPoint(i){
+				carMk.setPosition(coordinateArr[i]);
+				if(i < paths-1){
+					setTimeout(function(){
+						i++;
+						resetMkPoint(i);
+					},500);
+				}
+			};
+				 
+		});
+	}, 500);
+ });
+</script>
+
+
@@ -56,26 +56,21 @@
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
 								<th width="13%">车辆自编号</th>
-								<th width="100">车辆坐标</th>
-								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
-								<th width="18%">时间</th>
+								<th width="10%">越界位置</th>
+								<th width="18%">越界开始时间</th>
+								<th width="100">查看轨迹</th>
 								<th width="18%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
-<!-- 									<input type="text" class="form-control form-filter input-sm" name="userName_like"> -->
 										<select class="form-control" name="line" id="line" style="width: 150px;"></select>
 								</td>
 								<td>
-<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm"> -->
 								<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
 								</td>
 								<td>
-								</td>
-								<td></td>
-								<td>
 									<select class="form-control form-filter " name="updown">
                                          <option value="">请选择...</option>
                                          <option value="0">上行</option>
@@ -84,8 +79,11 @@
                                      </select>
 								</td>
 								<td>
+								</td>
+								<td>
 									<input class="form-control" type="date" name="date" />
 								</td>
+								<td></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -119,15 +117,6 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		<a href="/pages/excep/outBoundMap.html?no={{obj.line}},{{obj.upDown}},{{obj.lon}},{{obj.lat}}" 
-			class="btn default blue-stripe btn-sm" data-pjax>
-			查看车辆位置
-		</a>
-	</td>
-	<td>
-		{{obj.lpname}}
-	</td>
-	<td>
 		{{if obj.upDown==0}}
 			上行
 		{{else if obj.upDown==1}}
@@ -137,9 +126,20 @@
 		{{/if}}
 	</td>	
 	<td>
+		{{obj.address}}
+	</td>	
+	<td>
 		{{obj.timestampDate}}
 	</td>
 	<td>
+		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
+			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"  
+            data-endlat="{{obj.endlat}}" data-lineid="{{obj.line}}" data-updown="{{obj.upDown}}">
+			轨迹回放										
+		</a>
+	</td>
+	<td>
 	</td>
 </tr>
@@ -170,7 +170,6 @@ $(function(){
 	jsDoQuery(parameter,true);
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
-		debugger;
 		$('tr.filter input, select').val('').change();
 		jsDoQuery(null, true);
 	});
@@ -205,19 +204,55 @@ $(function(){
 		params['page'] = page;
 		var i = layer.load(2);
 		$get('/nowbound/pagequery' ,params, function(data){
-// 			$.each(data.content, function(i, obj) {
-//                 obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
-//             });
-			var bodyHtm = template('bound_list_temp', {list: data.dataList});
-			$('#datatable_bound tbody').html(bodyHtm)
-					.find('.icheck').iCheck(icheckOptions)
-					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
-				//重新分页
-				initPagination = true;
-				showPagination(data);
-			}
-			layer.close(i);
+			var listResult = data.dataList;
+			var index=0;
+			(function(){
+				var f = arguments.callee;
+				if(index >= listResult.length){
+					var bodyHtm = template('bound_list_temp', {list:listResult});
+					$('#datatable_bound tbody').html(bodyHtm).find('.icheck').iCheck(icheckOptions).on('ifChanged', iCheckChange);
+					if(pagination && data.dataList.length > 0){
+						//重新分页
+						initPagination = true;
+						showPagination(data);
+					}
+					layer.close(i);
+		  			$(".lookTrajectory").click(function(){
+		  				var vehicle = $(this).data('vehicle');
+		  				var startDate = $(this).data('startdate');
+		  				var endDate = $(this).data('enddate');
+		  				var lon = $(this).data('lon');
+		  				var lat = $(this).data('lat');
+		  				var endLon = $(this).data('endlon');
+		  				var endLat = $(this).data('endlat');
+		  				var lineid = $(this).data('lineid');
+		  				var upDown = $(this).data('updown');
+		  				var storage = window.localStorage;
+		  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
+		 				$.get('/pages/excep/outboundMap.html?',function (result) {
+					    	layer.open({
+								type: 1,
+								title:'<i class="uk-icon-play-circle"></i>轨迹回放',
+								shadeClose: true,
+								shade: true,
+								scrollbar: false,
+								maxmin: false, //开启最大化最小化按钮
+								area: ['100%', '100%'],
+							    content:result,//内容
+							});
+					    });
+					})
+					return; 
+				}
+				var result = listResult[index];
+				new BMap.Geocoder().getLocation(new BMap.Point(result.lon,result.lat), function(rs){
+					var addComp = rs.addressComponents;
+					result.address = addComp.district+addComp.street+addComp.streetNumber;
+					f();
+					index++;
+				});
+			})();
+			
 		});
 	}
@@ -345,7 +380,6 @@ $(&#39;#nbbm&#39;).select2({
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
@@ -8,23 +8,24 @@
 <div id="titleMap">
 <button id="run" style="margin-left:10px" class="btn btn-sm green btn-outline filter-submit margin-bottom">运行</button>
 </div>
-<div id="speedingMap">
+<div id="BasicMap">
 </div>
 <style type="text/css">
-#speedingMap{
+#BasicMap{
 	width: 100%; 
 	border: 2px solid #fdfdfd;
 	height: calc(100% - 30px);
 	overflow: hidden;
 }
 </style>
-<script type="text/javascript" src="/pages/excep/js/speeding-map.js"></script>
+<script type="text/javascript" src="/pages/excep/js/map.js"></script>
 <script type="text/javascript" src="/pages/excep/js/line-list-function.js"></script>
 <script type="text/javascript">
 $(function(){
 		var dataArr = window.localStorage.zbhAndDate.split(",");//获取页面传递过来的车辆自编号以及超速起始时间和超速结束时间
+		localStorage.clear();//清楚前端缓存
 		var vehicle = dataArr[0];
 		var startdate = dataArr[1];
 		var enddate = dataArr[2];
@@ -55,16 +56,14 @@ $(function(){
             }
         });      
  setTimeout(function(){
-		var map = SpeedingMap.init();//创建地图
+		var map = BasicMap.init();//创建地图
+		debugger;
 		$get('/sectionroute/findSection',{'line.id_eq' : lineid , 'directions_eq' :directionData},function(data) {
 			// 在地图上画出线路走向
 			PublicFunctions.linePanlThree(lineid,data,directionData);
 		});
 		var myP1 = new BMap.Point(lon,lat);    //起点
 		var myP2 = new BMap.Point(endLon,endLat);    //终点
-/* 		var centerLon = (parseFloat(lon)+parseFloat(endLon))/2;
-		var centerLat = (parseFloat(lat)+parseFloat(endLat))/2;
- 		map.centerAndZoom(new BMap.Point(centerLon,centerLat),18);//地图中心点坐标 */
  		for(i in Points){
  			coordinateArr.push(Points[i].coordinate);
  		}
@@ -141,7 +141,8 @@
                 '55_3': '上南公司（六分公司）', '55_1': '上南公司（二分公司）', '55_2': '上南公司（三分公司）', '55_4': '上南公司（一分公司）', '55_5': '上南公司（培训部）',
                 '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
                 '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_6': '南汇公司（航头枢纽站）',
-                '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）'
+                '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
+                '77_78': '闵行公司', '99_100': '青浦公交'
             };
             var defauleConfig;
@@ -146,6 +146,7 @@
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
                     e.preventDefault();
+                    $('[type=submit]', f).attr('disabled', 'disabled');
                     var data = $(this).serializeJSON();
                     if(data.dfsj==sch.dfsj && data.remarks=='' && data.bcType == sch.bcType){
                         return;