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 1b76fec3 20d60a35
Showing 66 changed files with 2723 additions and 833 deletions
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/safe_driv/SafeDriv.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/entity/excep/Offline.java
src/main/java/com/bsth/entity/excep/Outbound.java
src/main/java/com/bsth/entity/excep/Speeding.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound_DTO.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed_DTO.java
src/main/java/com/bsth/service/gps/entity/HistoryGps_DTO.java
@@ -111,7 +111,6 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	 */
 	@RequestMapping(value = "/findStationRouteInfo",method = RequestMethod.GET)
 	public List<Map<String, Object>> findStationRouteInfo(@RequestParam Map<String, Object> map) {
-		
 		return service.findStationRouteInfo(map);
 	}
@@ -140,4 +139,13 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
     	return service.updSwitchDir(lineIds);
     }
+    /**
+     * 
+     * @Title: upddis 
+     * @Description: TODO(更新站距) 
+     */
+    @RequestMapping(value = "/upddis",method = RequestMethod.POST)
+	public Map<String, Object> upddis(@RequestParam Map<String, Object> map) {
+		return service.upddis(map);
+	}
 }
@@ -260,7 +260,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //如果当前班次是出场，并且进的是下一个班次的终点
             if(sch.getBcType().equals("out")){
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
-                if(next.getZdzCode().equals(gps.getStopNo())){
+                if(next != null && next.getZdzCode().equals(gps.getStopNo())){
                     List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
                     //和当前进站信号最匹配的一个班次
                     ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
+package com.bsth.data.safe_driv;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+public class SafeDriv {
+
+    /**
+     * 时间
+     * 2017-04-06 08:00:00.0
+     */
+    private String Startime;
+
+    /**
+     * 时间戳
+     */
+    private Long ts;
+
+    /**
+     * 设备编号
+     */
+    private String sbbh;
+
+    /**
+     * 线路名称
+     */
+    private String xlmc;
+
+    /**
+     * 车辆自编号
+     */
+    private String clzbh;
+
+    /**
+     * 车牌号
+     */
+    private String cph;
+
+    /**
+     * 检查属性
+     * 双脱手 0 单脱手 1 其他为0都是异常
+     */
+    private String jctype;
+
+    /**
+     * 异常种类
+     * 手部检测: 1
+     * 脸部检测: 5
+     * 摄像头检测: 2
+     * 安全带检测: 3
+     * 袖章检测: 4
+     */
+    private String yczltype;
+
+    @Override
+    public int hashCode() {
+        return ("safe_" + (this.getClzbh() + this.getStartime())).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        SafeDriv s2 = (SafeDriv)obj;
+        return (this.getClzbh() + this.getStartime()).equals(s2.getClzbh() + s2.getStartime());
+    }
+
+    public String getStartime() {
+        return Startime;
+    }
+
+    public void setStartime(String startime) {
+        Startime = startime;
+    }
+
+    public String getSbbh() {
+        return sbbh;
+    }
+
+    public void setSbbh(String sbbh) {
+        this.sbbh = sbbh;
+    }
+
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
+
+    public String getClzbh() {
+        return clzbh;
+    }
+
+    public void setClzbh(String clzbh) {
+        this.clzbh = clzbh;
+    }
+
+    public String getCph() {
+        return cph;
+    }
+
+    public void setCph(String cph) {
+        this.cph = cph;
+    }
+
+    public String getJctype() {
+        return jctype;
+    }
+
+    public void setJctype(String jctype) {
+        this.jctype = jctype;
+    }
+
+    public String getYczltype() {
+        return yczltype;
+    }
+
+    public void setYczltype(String yczltype) {
+        this.yczltype = yczltype;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+}
+package com.bsth.data.safe_driv;
+
+import com.bsth.Application;
+import com.bsth.websocket.handler.SendUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
+
+    private static Set<SafeDriv> data;
+
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
+    static SendUtils sendUtils;
+
+    /**
+     * 车辆自编号 和 最新一条数据对照
+     */
+    private static Map<String, SafeDriv> safeMap;
+
+    static {
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    public static void put(SafeDriv sd){
+        sd.setTs(fmt.parseMillis(sd.getStartime()));
+        data.add(sd);
+
+        if(sd.getYczltype().indexOf("A") == -1)
+            sd.setYczltype("A" + sd.getYczltype());
+
+        SafeDriv old = safeMap.get(sd.getClzbh());
+        if(old == null || sd.getTs() > old.getTs()){
+            //通知客户端
+            sendUtils.sendSafeDriv(sd);
+        }
+
+        safeMap.put(sd.getClzbh(), sd);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        //定时加载安全驾驶数据
+        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 5, TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
+package com.bsth.data.safe_driv;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * 安全驾驶数据加载线程
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivDataLoadThread extends Thread{
+
+    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        List<SafeDriv> list = null;
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+
+                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
+                /**
+                 * 模拟数据
+
+                SafeDriv sd1 = new SafeDriv();
+                sd1.setYczltype("1");
+                sd1.setClzbh("W2B-001");
+                sd1.setStartime("2017-04-07 08:00:00.0");
+
+                SafeDriv sd2 = new SafeDriv();
+                sd2.setYczltype("2");
+                sd2.setClzbh("W2B-002");
+                sd2.setStartime("2017-04-07 08:02:00.0");
+
+                SafeDriv sd3 = new SafeDriv();
+                sd3.setYczltype("3");
+                sd3.setClzbh("W2B-003");
+                sd3.setStartime("2017-04-07 08:03:00.0");
+
+                SafeDriv sd4 = new SafeDriv();
+                sd4.setYczltype("4");
+                sd4.setClzbh("W2B-004");
+                sd4.setStartime("2017-04-07 08:04:00.0");
+
+                SafeDriv sd5 = new SafeDriv();
+                sd5.setYczltype("5");
+                sd5.setClzbh("W2B-005");
+                sd5.setStartime("2017-04-07 08:05:00.0");
+
+                list.add(sd1);
+                list.add(sd2);
+                list.add(sd3);
+                list.add(sd4);
+                list.add(sd5);
+                 */
+                for(SafeDriv sd : list){
+                    SafeDrivCenter.put(sd);
+                }
+            }
+
+            httpClient.close();
+            response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 掉线
@@ -65,7 +66,12 @@ public class Offline {
 	 */
 	private Date createDate;
-	
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
 	public Integer getId() {
 		return id;
 	}
@@ -146,5 +152,29 @@ public class Offline {
 		this.timestampDate = timestampDate;
 	}
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
+	
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 越界
@@ -72,7 +73,12 @@ public class Outbound {
 	 * 	时间
 	 */
 	private Date createDate;
-	
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
 	public Integer getId() {
 		return id;
@@ -162,5 +168,29 @@ public class Outbound {
 		this.timestampDate = timestampDate;
 	}
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 超速
@@ -66,6 +67,13 @@ public class Speeding {
 	private String timestampDate;
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
+	
 	/**
 	 * 	创建时间
 	 */
@@ -161,6 +169,30 @@ public class Speeding {
 		this.timestampDate = timestampDate;
 	}
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
 }
@@ -272,4 +272,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
     @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
 	public void stationRouteDir(Integer line);
+    
+    @Modifying
+    @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
+	public void upddis(Integer id,Double dis);
 }
@@ -82,4 +82,6 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 Map<String, Object> findByMultiLine(String lineIds);
 	 Map<String, Object> updSwitchDir(String lineIds);
+	 
+	 Map<String, Object> upddis(Map<String, Object> map);
 }
@@ -12,10 +12,15 @@ import java.util.HashMap;
 import java.util.List;
 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.Offline;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.OfflineService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -27,6 +32,8 @@ import com.google.gson.Gson;
 @Service
 public class OfflineServiceImpl implements OfflineService {
+	@Autowired
+	JdbcTemplate jdbcTemplate;
  //	@Override
 	static List<Offline> findAll(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -53,7 +60,9 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(nbbm!=null){
-			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
+			sql +=" and vehicle like '%"+nbbm+"%'";
 		}
 		if(updown!=null){
@@ -61,7 +70,7 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -112,7 +121,7 @@ public class OfflineServiceImpl implements OfflineService {
 			offline.setTimestamp(Long.valueOf(rs.getObject("timestamp").toString()));
 			offline.setTimestampDate(sdf.format(new Date(offline.getTimestamp())));
 			offline.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			offline.setVehicle(rs.getObject("vehicle").toString());
+			offline.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 			list.add(offline);
 		}
 		return list;
@@ -135,7 +144,9 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(nbbm!=null){
-			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
+			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			if(nbbm!=null)
+			sql +=" and vehicle like '%"+nbbm+"%'";
 		}
 		if(updown!=null){
@@ -143,7 +154,7 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -177,8 +188,41 @@ public class OfflineServiceImpl implements OfflineService {
 		PageHelper pageHelper = new PageHelper(totalData, map);
 //		List<T> list = this.baseDao.queryByObject(pageHelper.getMap());
 		List<Offline> list=findAll(pageHelper.getMap());
+		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);
+			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
+			String sk=new SimpleDateFormat("HH:mm").format(datess);
+			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' ";
+//							+ "and fcsj_actual > '"+sk+"' ";
+//							+ "and '"+sk+"' <dfsj";
+			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
+			        new RowMapper<ScheduleRealInfo>(){  
+			            @Override  
+			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
+			            	s.setjGh(rs.getString("j_gh"));
+			            	s.setjName(rs.getString("j_name"));
+			            	s.setLpName(rs.getString("lp_name"));
+			                return s;  
+			            }  
+					});  
+			if(pbb.size()>0){
+				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+				list.get(i).setLpname(pbb.get(0).getLpName());
+				
+			}
+			
+		}
 		PageObject<Offline> pageObject = pageHelper.getPageObject();
-		pageObject.setDataList(list);
+//		for (int i = 0; i < list.size(); i++) {
+//			if(list.get(i).getLpname()!=null){
+				pageObject.setDataList(list);
+//			}
+//		}
+	
 		return pageObject;
 	}
 	public static void main(String[] args) {
@@ -12,10 +12,14 @@ import java.util.HashMap;
 import java.util.List;
 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.OutboundService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -25,8 +29,9 @@ import com.github.abel533.echarts.Option;
 import com.google.gson.Gson;
 @Service
 public class OutboundServiceImpl implements OutboundService{
-	
-	static List<Outbound> findAll(Map<String, Object> map) {
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	static  List<Outbound> findAll(Map<String, Object> map) {
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
@@ -37,12 +42,13 @@ public class OutboundServiceImpl implements OutboundService{
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
 		Object date=map.get("date");
-		
 		if(line!=null){
 				 sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
@@ -51,7 +57,7 @@ public class OutboundServiceImpl implements OutboundService{
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -98,7 +104,7 @@ public class OutboundServiceImpl implements OutboundService{
 			outbound.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
 			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			outbound.setVehicle(rs.getObject("vehicle").toString());
+			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
 			list.add(outbound);
 		}
@@ -119,6 +125,8 @@ public class OutboundServiceImpl implements OutboundService{
 		}
 		if(nbbm!=null){
+			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
@@ -160,7 +168,34 @@ public class OutboundServiceImpl implements OutboundService{
 		PageHelper pageHelper = new PageHelper(totalData, map);
 		List<Outbound> list=findAll(pageHelper.getMap());
-		
+		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);
+			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
+			String sk=new SimpleDateFormat("HH:mm").format(datess);
+			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' ";
+//							+ "and fcsj_actual > '"+sk+"' ";
+//							+ "and '"+sk+"' <dfsj";
+			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
+			        new RowMapper<ScheduleRealInfo>(){  
+			            @Override  
+			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
+			            	s.setjGh(rs.getString("j_gh"));
+			            	s.setjName(rs.getString("j_name"));
+			            	s.setLpName(rs.getString("lp_name"));
+			                return s;  
+			            }  
+					});  
+			if(pbb.size()>0){
+				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+				list.get(i).setLpname(pbb.get(0).getLpName());
+				
+			}
+			
+		}
 		PageObject<Outbound> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
@@ -12,10 +12,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Speeding;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.SpeedingService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -27,7 +31,8 @@ import com.google.gson.Gson;
 @Service
 public class SpeedingServiceImpl implements SpeedingService {
-
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	static List<Speeding> findAll(Map<String, Object> map) {
 		Connection conn = null;
 		PreparedStatement ps = null;
@@ -45,6 +50,8 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		if(nbbm!=null){
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
@@ -53,7 +60,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -102,7 +109,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 			speeding.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			speeding.setTimestampDate(sdf.format(new Date(speeding.getTimestamp())));
 			speeding.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			speeding.setVehicle(rs.getObject("vehicle").toString());
+			speeding.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 			list.add(speeding);
 		}
 		return list;
@@ -122,9 +129,10 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		if(nbbm!=null){
+			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
-		
 		if(updown!=null){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
@@ -163,7 +171,34 @@ public class SpeedingServiceImpl implements SpeedingService {
 		PageHelper pageHelper = new PageHelper(totalData, map);
 		List<Speeding> list=findAll(pageHelper.getMap());
-		
+		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);
+			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
+			String sk=new SimpleDateFormat("HH:mm").format(datess);
+			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' ";
+//							+ "and fcsj_actual > '"+sk+"' ";
+//							+ "and '"+sk+"' <dfsj";
+			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
+			        new RowMapper<ScheduleRealInfo>(){  
+			            @Override  
+			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
+			            	s.setjGh(rs.getString("j_gh"));
+			            	s.setjName(rs.getString("j_name"));
+			            	s.setLpName(rs.getString("lp_name"));
+			                return s;  
+			            }  
+					});  
+			if(pbb.size()>0){
+				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+				list.get(i).setLpname(pbb.get(0).getLpName());
+				
+			}
+			
+		}
 		PageObject<Speeding> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
 package com.bsth.service.gps;
+import com.bsth.service.gps.entity.GpsOutbound_DTO;
+import com.bsth.service.gps.entity.GpsSpeed_DTO;
+
 import java.util.List;
 import java.util.Map;
@@ -20,4 +23,8 @@ public interface GpsService {
     Map<String,Object> gpsCompletion(long schId);
 	Map<String,Object> history_v2(String nbbm, long st, long et);
+
+	List<GpsSpeed_DTO> speeds(String nbbm, long st, long et);
+
+	List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et);
 }
@@ -11,8 +11,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.gps.entity.HistoryGps_DTO;
-import com.bsth.service.gps.entity.Road_DTO;
+import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
@@ -192,7 +191,6 @@ public class GpsServiceImpl implements GpsService {
                 return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
             }
         });
-        ;
         return list;
     }
@@ -207,10 +205,10 @@ public class GpsServiceImpl implements GpsService {
         inv = inv.substring(0, inv.length() - 1);
         // 查询到离站数据
-        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear, st, et, inv);
         String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
-                + inv + ") and ts > ? and ts < ?";
+                + inv + ") and ts > ? and ts < ? ORDER BY device_id,ts,stop_no";
         try {
             conn = DBUtils_MS.getConnection();
             ps = conn.prepareStatement(sql);
@@ -296,6 +294,9 @@ public class GpsServiceImpl implements GpsService {
                 prefix = lineId + "_" + updown + "_";
                 stationName = BasicData.getStationNameByCode(rs.getString("STOP_NO"), prefix);
+                if (StringUtils.isEmpty(stationName))
+                    continue;
+
                 arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), lineId,
                         updown, rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
                         rs.getInt("WEEKS_YEAR"), stationName);
@@ -444,7 +445,7 @@ public class GpsServiceImpl implements GpsService {
                 return rs;
             }
-            if(sch.isReissue()){
+            if (sch.isReissue()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "你不能重复这个操作");
                 return rs;
@@ -453,7 +454,7 @@ public class GpsServiceImpl implements GpsService {
             String sql = "select * from bsth_gps_template where line_id='" + sch.getXlBm() + "' and up_down=" + sch.getXlDir();
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
-            if(list.size() == 0){
+            if (list.size() == 0) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "缺少模板数据，请联系系统管理员！！");
                 return rs;
@@ -470,21 +471,20 @@ public class GpsServiceImpl implements GpsService {
             int diff = (int) (sch.getDfsjT() - Long.parseLong(fs.get("ts").toString()) - 1000 * 70);
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-            for(Map<String, Object> map : list){
+            for (Map<String, Object> map : list) {
                 map.put("device_id", deviceId);
                 map.put("ts", Long.parseLong(map.get("ts").toString()) + diff);
             }
-            String sqlBefore = "insert into bsth_c_template("
-                    ,sqlValues = " values(";
+            String sqlBefore = "insert into bsth_c_template(", sqlValues = " values(";
             Set<String> ks = fs.keySet();
-            for(String k : ks){
+            for (String k : ks) {
                 sqlBefore += (k + ",");
                 sqlValues += "?,";
             }
             sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ", create_ts)";
-            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", "+System.currentTimeMillis()+")";
+            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", " + System.currentTimeMillis() + ")";
             sql = sqlBefore + " " + sqlValues;
             Connection conn = DBUtils_MS.getConnection();
@@ -492,9 +492,9 @@ public class GpsServiceImpl implements GpsService {
             ps = conn.prepareStatement(sql);
             int fsize = ks.size();
             List<Object> vs;
-            for(Map<String, Object> map : list){
+            for (Map<String, Object> map : list) {
                 vs = new ArrayList<>(map.values());
-                for(int i = 0; i < fsize; i ++){
+                for (int i = 0; i < fsize; i++) {
                     ps.setObject(i + 1, vs.get(i));
                 }
                 ps.addBatch();
@@ -523,30 +523,62 @@ public class GpsServiceImpl implements GpsService {
         try {
             //获取历史gps 数据
             List<HistoryGps_DTO> list = HistoryGps_DTO.craete(history(new String[]{nbbm}, st, et));
-            if(list!=null && list.size() > 0){
+            if (list != null && list.size() > 0) {
                 //获取路段信息
                 String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
                 List<Road_DTO> roads = Road_DTO.craete(jdbcTemplate.queryForList(sql, list.get(0).getLineId()));
                 //为GPS数据关联路段信息
-                for(HistoryGps_DTO gps : list){
+                for (HistoryGps_DTO gps : list) {
                     matchRoadToGps(gps, roads);
                 }
             }
+            //超速数据
+            List<GpsSpeed_DTO> speedList = speeds(nbbm, st, et);
+            //越界数据
+            List<GpsOutbound_DTO> outboundList = outbounds(nbbm, st, et);
+
             rs.put("status", ResponseCode.SUCCESS);
-            rs.put("list", list);
-        }catch (Exception e){
+            rs.put("list", removeDuplicate(list));
+            rs.put("speedList", speedList);
+            rs.put("outboundList", outboundList);
+        } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
         }
         return rs;
     }
-    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads){
-        double min = -1,distance;
+    @Override
+    public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
+
+        return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
+    }
+
+    @Override
+    public List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et) {
+        /**
+         * 如果 st 和 et 跨了周分区，也只查询st 分区的数据。
+         */
+        st = st * 1000;
+        et = et * 1000;
+        //按周分区
+        Calendar weekCal = Calendar.getInstance();
+        weekCal.setTimeInMillis(st);
+        int weekYear = weekCal.get(Calendar.WEEK_OF_YEAR);
+        //设备号
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where weeks_year="+weekYear+" and vehicle=? and timestamp>? and timestamp<?";
+        return GpsOutbound_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st, et));
+    }
+
+    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads) {
+        double min = -1, distance;
         Road_DTO nearRoad = null;
-        for(Road_DTO road : roads){
+        for (Road_DTO road : roads) {
             distance = GeoUtils.getDistanceFromLine(road.getLineStr(), gps.getPoint());
             if (min > distance || min == -1) {
@@ -559,6 +591,20 @@ public class GpsServiceImpl implements GpsService {
         gps.setRoadMinDistance(min);
     }
+    /**
+     * 去重复
+     *
+     * @param list
+     * @return
+     */
+    private Set<HistoryGps_DTO> removeDuplicate(List<HistoryGps_DTO> list) {
+        Set<HistoryGps_DTO> set = new HashSet<>();
+        for (HistoryGps_DTO gps : list) {
+            set.add(gps);
+        }
+        return set;
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
+package com.bsth.service.gps.entity;
+
+/**
+ * 越界异常  --ms数据库格式
+ * Created by panzhao on 2017/4/9.
+ */
+public class GpsOutbound {
+
+    private String vehicle;
+
+    private String line;
+
+    private int up_down;
+
+    private float lon;
+
+    private float lat;
+
+    private long timestamp;
+
+    public String location(){
+        return lon + "," + lat;
+    }
+
+    public String getVehicle() {
+        return vehicle;
+    }
+
+    public void setVehicle(String vehicle) {
+        this.vehicle = vehicle;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+
+    public int getUp_down() {
+        return up_down;
+    }
+
+    public void setUp_down(int up_down) {
+        this.up_down = up_down;
+    }
+
+    public float getLon() {
+        return lon;
+    }
+
+    public void setLon(float lon) {
+        this.lon = lon;
+    }
+
+    public float getLat() {
+        return lat;
+    }
+
+    public void setLat(float lat) {
+        this.lat = lat;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
+/**
+ * 越界异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsOutbound_DTO {
+
+    public static List<GpsOutbound_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsOutbound> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsOutbound.class);
+        GpsOutbound outbound;
+
+        //排序
+        Collections.sort(list, new Comparator<GpsOutbound>() {
+            @Override
+            public int compare(GpsOutbound o1, GpsOutbound o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 60;
+        int size = list.size();
+        StringBuffer locations = new StringBuffer("");
+
+        List<GpsOutbound_DTO> rsList = new ArrayList<>();
+        GpsOutbound_DTO dto = null;
+
+        for(int i = 0; i < size; i++){
+            outbound = list.get(i);
+            locations.append(outbound.location() + ";");
+            if(dto == null){
+                dto = new GpsOutbound_DTO();
+                dto.setDeviceId(outbound.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(outbound.getVehicle()));
+                dto.setSt(outbound.getTimestamp());
+            }
+            else{
+                //越界结束
+                if((i < size - 1 && list.get(i + 1).getTimestamp() - outbound.getTimestamp() > space)){
+                    dto.setEt(outbound.getTimestamp());
+                    dto.setLocations(locations.toString());
+
+                    rsList.add(dto);
+                    dto = null;
+                    locations = new StringBuffer("");
+                    continue;
+                }
+
+                if(i == size - 1)
+                    rsList.add(dto);
+            }
+        }
+
+        return rsList;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 越界开始时间
+     */
+    private long st;
+
+    /**
+     * 越界结束时间
+     */
+    private long et;
+
+    /**
+     * 越界点位集合
+     */
+    private String locations;
+
+    private String abnormalType = "outbound";
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public String getLocations() {
+        return locations;
+    }
+
+    public void setLocations(String locations) {
+        this.locations = locations;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+}
+package com.bsth.service.gps.entity;
+
+/**
+ * 超速异常 -ms数据库格式
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsSpeed {
+
+    private String vehicle;
+
+    private String line;
+
+    private int up_down;
+
+    private float lon;
+
+    private float lat;
+
+    private float speed;
+
+    private long timestamp;
+
+    public String getVehicle() {
+        return vehicle;
+    }
+
+    public void setVehicle(String vehicle) {
+        this.vehicle = vehicle;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+
+    public int getUp_down() {
+        return up_down;
+    }
+
+    public void setUp_down(int up_down) {
+        this.up_down = up_down;
+    }
+
+    public float getLon() {
+        return lon;
+    }
+
+    public void setLon(float lon) {
+        this.lon = lon;
+    }
+
+    public float getLat() {
+        return lat;
+    }
+
+    public void setLat(float lat) {
+        this.lat = lat;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
+/**
+ * 超速异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsSpeed_DTO {
+
+    public static List<GpsSpeed_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsSpeed> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsSpeed.class);
+        GpsSpeed gs;
+        //排序
+        Collections.sort(list, new Comparator<GpsSpeed>() {
+            @Override
+            public int compare(GpsSpeed o1, GpsSpeed o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 60;
+        int size = list.size();
+
+        List<GpsSpeed_DTO> rsList = new ArrayList<>();
+        GpsSpeed_DTO dto = null;
+
+        for(int i = 0; i < size; i++){
+            gs = list.get(i);
+            if(dto == null){
+                dto = new GpsSpeed_DTO();
+                dto.setDeviceId(gs.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(gs.getVehicle()));
+                dto.setSt(gs.getTimestamp());
+                dto.setSpeed(gs.getSpeed());
+            }
+            else{
+                //超速结束
+                if((i < size - 1 && list.get(i + 1).getTimestamp() - gs.getTimestamp() > space)){
+                    dto.setEt(gs.getTimestamp());
+                    rsList.add(dto);
+                    dto = null;
+                    continue;
+                }
+
+                //记录最大速度
+                if(gs.getSpeed() > dto.getSpeed())
+                    dto.setSpeed(gs.getSpeed());
+
+                if(i == size - 1)
+                    rsList.add(dto);
+            }
+        }
+        return rsList;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 超速开始时间
+     */
+    private long st;
+
+    /**
+     * 超速结束时间
+     */
+    private long et;
+
+    /**
+     * 速度
+     */
+    private float speed;
+
+    private String abnormalType = "speed";
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+}
@@ -17,12 +17,12 @@ import java.util.Map;
  */
 public class HistoryGps_DTO {
-    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList){
+    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList) {
         List<HistoryGps_DTO> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTO.class);
         GeometryFactory geometryFactory = new GeometryFactory();
         Point point;
-        for(HistoryGps_DTO gps : list){
+        for (HistoryGps_DTO gps : list) {
             point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
             gps.setPoint(point);
         }
@@ -56,11 +56,32 @@ public class HistoryGps_DTO {
     @JsonIgnore
     private Point point;
-    /** 路段 */
+    /**
+     * 路段
+     */
     private Road_DTO road;
-    /** 和路段的最短距离 */
+    /**
+     * 和路段的最短距离
+     */
     private double roadMinDistance;
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        HistoryGps_DTO g2 = (HistoryGps_DTO) obj;
+        return this.toString().equals(g2.toString());
+    }
+
+
+    @Override
+    public String toString() {
+        return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
+    }
+
     public double getGcj_lon() {
         return gcj_lon;
     }
@@ -1100,4 +1100,24 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return rs;
 	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> upddis(Map<String, Object> map) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			Iterator it = map.entrySet().iterator();
+			while(it.hasNext()){
+			      java.util.Map.Entry entry = (java.util.Map.Entry)it.next();
+			      Integer id = Integer.parseInt(entry.getKey().toString().split("_")[1]);      //返回对应的键
+			      Double dis = Double.parseDouble(entry.getValue().toString()) / 1000;  //返回对应的值
+			      repository.upddis(id, dis);
+			}
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
@@ -94,7 +94,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 	/**
 	 * 根据线路推送消息
 	 */
-	public synchronized void sendMessageToLine(String lineCode, String msg) {
+	public void sendMessageToLine(String lineCode, String msg) {
 		TextMessage message = new TextMessage(msg.getBytes());
@@ -117,4 +117,28 @@ public class RealControlSocketHandler implements WebSocketHandler {
 			}
 		}
 	}
+
+
+
+	/**
+	 * 全局推送
+	 */
+	public void sendMessage(String msg) {
+
+		TextMessage message = new TextMessage(msg.getBytes());
+
+		Iterator<WebSocketSession> iterator = users.iterator();
+
+		WebSocketSession user;
+		while(iterator.hasNext()){
+			user = iterator.next();
+			try {
+				if (user.isOpen()) {
+					user.sendMessage(message);
+				}
+			} catch (Exception e) {
+				logger.error("sendMessage error ...."+msg);
+			}
+		}
+	}
 }
@@ -5,6 +5,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.SignalState;
+import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -184,4 +185,18 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	public void sendSafeDriv(SafeDriv sd){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "safeDriv");
+		map.put("t", sd);;
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessage(mapper.writeValueAsString(map));
+
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -168,6 +168,13 @@ var GetAjaxData = function(){
 			},
 			// 查询路段信息
+			getStationRouteInfo : function(lineId,direction,callback) {
+				$get('/stationroute/all',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
+					callback && callback(resultdata);
+				});
+			},
+			
+			// 查询路段信息
 			getSectionRouteInfo : function(lineId,direction,callback) {
 				$get('/sectionroute/findSection',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
 					callback && callback(resultdata);
@@ -122,6 +122,27 @@ $(function(){
 		});*/
 	});
+	$('#wrenchUpDis').on('click',function() {
+		var Line = LineObj.getLineObj();
+		GetAjaxData.getStation(Line.id,directionUpValue,function(rd) {
+			// 加载其它规划选择弹出层mobal页面
+			$.get('tzzj.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,Line.id,PublicFunctions,rd[0].children[0].children]);
+			});
+		});
+	})
+	
+	$('#wrenchDownDis').on('click',function() {
+		var Line = LineObj.getLineObj();
+		GetAjaxData.getStation(Line.id,directionDownValue,function(rd) {
+			// 加载其它规划选择弹出层mobal页面
+			$.get('tzzj.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,Line.id,PublicFunctions,rd[0].children[0].children]);
+			});
+		});
+	})
 	$('#quoteDown').on('click',function() {
 		// 弹出提示层.
@@ -63,6 +63,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="wrenchUpDis"><i class="fa fa-wrench"></i>  设置上行站距</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
 			                                                </li>
 			                                                <!-- <li>
@@ -154,6 +158,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="wrenchDownDis"><i class="fa fa-wrench"></i>  设置下行站距</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i>  引用上行路段</a>
 			                                                </li>
 			                                                <!-- <li>
+<!-- 调整站距 -->
+<div class="modal fade" id="tzzj_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">调整站距 </h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post" id="tzbcForm" role="form">
+					<!-- alert-danger 组件START -->
+					<div class="alert alert-danger display-hide" id="tzbcAlert">
+						<button class="close" data-close="alert"></button>
+							您的输入有误，请检查下面的输入项
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_bctz">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="1%"></th>
+										<th width="33%">站点序号</th>
+										<th width="33%">站点路由</th>
+										<th width="33%">站距(米/单位)</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+						</div>
+					</div>
+			    </form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="tzbcnext">保存</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="tzzj_temp">
+{{each list as obj i }}
+	<tr role="row" class="filter">
+		<td></td>
+		<td>
+			<!--<input type="text" readonly  class="form-control form-filter input-sm"  value="{{i+1}}">-->
+			{{i+1}}
+		</td>
+		<td>
+			<!-- <input type="text" readonly  class="form-control form-filter input-sm" name="station_{{i+1}}" value="{{obj.name}}">-->
+			{{obj.name}}
+		</td>
+		<td>
+			<input type="text" class="form-control form-filter input-sm" name="dis_{{obj.stationRouteId}}" value="{{obj.stationRouteDistances * 1000}}">
+		</td>
+	</tr>
+{{/each}}
+{{if list.length == 0}}
+		<tr>
+			<td colspan=4><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#tzzj_mobal').on('tzzjMobal.show', function(e,map,gd,dir,lineid,pf,rd){
+	setTimeout(function(){
+		// 加载延迟200毫秒显示mobal
+		$('#tzzj_mobal').modal({show : true,backdrop: 'static', keyboard: false});
+	},200);
+	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+	$('#tzzj_mobal').on('show.bs.modal', function () {
+		console.log(rd);
+		// 把数据填充到模版中
+		var tbodyHtml = template('tzzj_temp',{list:rd});
+		// 把渲染好的模版html文本追加到表格中
+		$('#datatable_bctz tbody').html(tbodyHtml);
+	});
+	// 获取表单元素
+	var form = $('#tzbcForm');
+	// 错误提示元素
+	var tzbcAlert = $('#tzbcAlert', form);
+	// 下一步点击事件
+	$('#tzbcnext').on('click', function() {
+		form.submit();// 表单提交
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span', 
+		errorClass : 'help-block help-block-error', 
+		focusInvalid : false, 
+		rules : {
+		},
+		invalidHandler : function(event, validator) {  
+			tzbcAlert.show();
+			App.scrollTo(reladplusname, -200);
+		},
+		highlight : function(element) { 
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		unhighlight : function(element) { 
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		success : function(label) {
+			label.closest('.form-group').removeClass('has-error'); 
+		},
+		submitHandler : function(f) {
+			// 获取表单内容,并序列化
+			var params = form.serializeJSON();
+			$post('/stationroute/upddis',params,function(data) {
+				// 隐藏错误提示
+				tzbcAlert.hide();
+				// 隐藏 reladplus_mobal 弹出层 
+				$('#tzzj_mobal').modal('hide');
+				if(data.status=='SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+					map.clearMarkAndOverlays();
+					// 刷新左边树
+					pf.resjtreeDate(lineid,dir);
+					pf.resjtreeDate(lineid,dir);
+					/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+					gd.getSectionRouteInfo(lineid,dir,function(data) {
+						/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+						pf.linePanlThree(lineid,data,dir);
+					});
+				}else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+			});
+		}
+	});
+});
+</script>
 \ No newline at end of file
@@ -9,7 +9,6 @@
     width: 69%;
 }
 </style>
-
 <!-- 片段标题 START -->
 <div class="page-head">
 	<div class="page-title">
@@ -17,8 +16,6 @@
 	</div>
 </div>
 <!-- 片段标题 END -->
-
-
 <!-- 线路信息导航栏组件 START -->
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
@@ -26,8 +23,6 @@
 	<li><span class="active">时刻表明细制作建模</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
-
-
 <div class="portlet light bordered" id="form-wizard-info">
 	<div class="portlet-title">
 		<div class="caption">
@@ -44,7 +39,6 @@
 		</div>
 	</div>
 	<div class="portlet-body form">
-	
 		<!-- START FORM 表单容器 -->
 		<form class="form-horizontal" id="submit_argus_form"  action="/" method="POST" novalidate="novalidate">
 			<div class="form-wizard">
@@ -94,7 +88,6 @@
 							<button class="close" data-dismiss="alert"></button> 
 							 验证成功! 
 						</div>
-						
 						<!-- 线路名称 -->
                        	<div class="tab-pane active" id="tab1">
                        		<h3 class="block"> 选择时刻表 </h3>
 /**
- * 表单的导航向导、验证、提交
- * 
+ * @description : (TODO) 表单的导航向导、验证、提交
  */
 var SKBFormWizard = function() {
+	
+	var bxrcGs = [ {'type':'六工一休','hoursV':6.66,  'minueV':'6:40'},
+		           {'type':'五工一休','hoursV':6.85,  'minueV':'6:51'},
+		           {'type':'四工一休','hoursV':7.14,  'minueV':'7:08'},
+		           {'type':'三工一休','hoursV':7.61,  'minueV':'7:37'},
+		           {'type':'二工一休','hoursV':8.57,  'minueV':'8:34'},
+		           {'type':'一工一休','hoursV':11.42, 'minueV':'11:25'},
+		           {'type':'五工二休','hoursV':7.99,  'minueV':'8:00'},
+		           {'type':'无工休',  'hoursV':5.43,  'minueV':'5:43'}];
+	
+	/**
+	 * @description : (TODO) 获取停站时间.
+	 * 
+	 * @param [o--当前班次对象;d--班次数组对象;sj--当前班次时间]
+	 * 
+	 * @return 返回相邻班次的停站时间.
+	 * */
+	function gettzsj(o,d,sj) {
+		// 定义停站时间.
+		var tzsj = 0;
+		// 变量班次数组对象.
+		for(var i = 0 ;i<d.length;i++) {
+			// 判断是否为同一个路牌.
+			if(o.lp.lpNo == d[i].lp.lpNo && o.lp.id == d[i].lp.id) {
+				// 判断是否为当前班次的下一个班次.
+				if(d[i].fcno - o.fcno ==1){
+					// 计算停站时间.
+					tzsj = (strToTime(d[i].fcsj) -strToTime(sj)) / 60000; 
+					continue;
+				}
+			}
+		}
+		// 返回停站时间.
+		return tzsj;
+	}
+	
+	/**
+	 * @description : (TODO) 是否切换线路值转换.
+	 * 
+	 * @param [d--是否切换线路原始值].
+	 * 
+	 * @return 返回一个是否切换线路值的转换.
+	 * */
+	function isSwitchXlTodm(d) {
+		var rstr = 0;
+		if(d)
+			rstr = 1;
+		return rstr;
+	}
+	
+	/**
+	 * @description : (TODO) 是否分班值转换.
+	 * 
+	 * @param [d--是否分班原始值].
+	 * 
+	 * @return 返回一个是否分班值的转换.
+	 * */
+	function isfbTodm(b) {
+		var rstr = 0;
+		if(b)
+			rstr = 1;
+		return rstr;
+	}
+	
+	/**
+	 * @description : (TODO) 获取某个班次的到达时间字符串.
+	 * 
+	 * @param [tStr--发车时间格式字符串;bcsj--班次历时].
+	 * 
+	 * @return 返回一个某个班次的到达时间字符串.
+	 * */
+	function getddsj(tStr,bcsj) {
+		// 定义当前时间对象.
+		var date = new Date();
+		// 分割字符串.
+		var _str = tStr.split(':');
+		// 设值小时.
+		date.setHours(parseInt(_str[0]));
+		// 设值分钟.
+		date.setMiutes(parseInt(_str[1]) + bcsj);
+		// 返回到达时间字符串.
+		return getTimeStr(date);
+	}
+	
+	/**
+	 * @description : (TODO) 时间点格式字符串转时间对象.
+	 * 
+	 * @param [t--时间点格式字符串]
+	 * 
+	 * @return 返回一个时间点格式字符串转时间对象.
+	 * */
+	var strToTime = function(t) {
+		// 定义当前时间对象.
+		var d = new Date;
+		// 判断是否为空.
+		if(t) {
+			// 分割字符串.
+			var _str = t.split(':');
+			// 设值小时.
+			d.setHours(parseInt(_str[0]));
+			// 设值分钟.
+			d.setMinutes(parseInt(_str[1]));
+		}
+		// 返回一个时间点格式字符串转时间对象.
+		return d;
+	}
+	
+	/**
+	 * @description : (TODO) 时间对象转时间点格式字符串.
+	 * 
+	 * @param [t--时间对象]
+	 * 
+	 * @return 返回一个时间对象转时间点格式字符串.
+	 * */
+	function getTimeStr(t) {
+		// 定义返回值.
+		var _str = '';
+		// 判断是否为空.
+		if(t) {
+			// 重新赋值.
+			_str = ((t.getHours()<10? '0' + t.getHours() : t.getHours()) == '00' ? '24' :(t.getHours()<10? '0' + t.getHours() : t.getHours()))
+			  		+':' 
+			  		+(t.getMinutes()<10? '0' + t.getMinutes() : t.getMinutes());
+		}
+		// 返回时间对象转时间点格式字符串.
+		return _str;
+	}
+	
+	/**
+	 * @description : (TODO) 方向值转换.
+	 * 
+	 * @param [d--方向原始值].
+	 * 
+	 * @return 返回一个方向值转换.
+	 * */
+	function dmToDh(t) {
+		// 定义返回值.
+		var reslStr = '';
+		// 上行.
+		if(t=='0')
+			reslStr = 'relationshipGraph-up';
+		// 下行.
+		else if(t=='1')
+			reslStr = 'relationshipGraph-down';
+		// 返回一个方向值转换.
+		return reslStr; 
+	}
+	
+	/**
+	 * @description : (TODO) 获取线路标准详情.
+	 * 
+	 * @param [lineId--线路ID;cb--回调函数].
+	 * 
+	 * @return 返回线路标准详情.
+	 * 
+	 * @status OK.
+	 * */
 	var getLineInfo = function(lineId,cb) {
-		// 根据线路标准ID查询详情
+		// 1、get异步请求.根据线路ID查询详情.
 		$get('/lineInformation',{'line.id_eq':lineId},function(result) {
+			// 2、返回线路标准详情.
 			return cb && cb(result);
 		});
 	}
+	
+	/**
+	 * @description : (TODO) 获取所有的停车场详情.
+	 * 
+	 * @param [cb--回调函数].
+	 * 
+	 * @return 返回所有的停车场详情.
+	 * 
+	 * @status OK.
+	 * */
 	var gettccInfo = function (cb) {
+		// 1、get异步请求.获取所有的停车场详情.
 		$get('/carpark/all',null, function(cd){
+			// 2、返回所有的停车场详情.
 			return cb && cb(cd);
 		});
 	}
+	/**
+	 * @description : (TODO) 时间格式字符串转时间对象.
+	 * 
+	 * @param [time--时间格式字符串].
+	 * 
+	 * @return 返回一个时间对象.
+	 * 
+	 * @status OK.
+	 * */
 	var getDateTime = function(time) {
+		// 1、定义一个时间对象.
 		var dateTime = new Date();
+		// 2、判断参数是否为空或者为undefined.
 		if(time !=null && time !='' && typeof(time) !='undefined') {
+			// 3、给时间对象重新赋值.
 			dateTime = new Date(Date.parse(time.replace(/-/g, "/")));
 		}
+		// 4、返回时间对象.
 		return dateTime;
 	}
-	
+	/**
+	 * @description : (TODO) 客流方式填充表单时.根据表单参数封装时间段内的车辆数.
+	 * 
+	 * @param : [map--表单参数]
+	 * 
+	 * @returns 返回一个根据表单参数封装时间段内的车辆数数组.
+	 * 
+	 * @status OK.
+	 * */
 	function getsjdArr(map) {
+		// 1、获取营运的开始与结束时间点.
 		var seMap = getStartAndEndDate(map);
-		return [{'num':0,'time':seMap.s + '-' + map.earlyStartTime},
-		        {'num':0,'time':map.earlyStartTime + '-' + map.earlyEndTime},
-		        {'num':0,'time':map.earlyEndTime + '-' + map.lateStartTime},
-		        {'num':0,'time':map.lateStartTime + '-' + map.lateEndTime},
-		        {'num':0,'time':map.lateEndTime + '-' + seMap.e}];
+		// 2、返回一个根据表单参数封装时间段内的车辆数数组.
+		return [{'num':0,'time':seMap.s + '-' + map.earlyStartTime},// 早高峰之前时间段内的车辆.
+		        {'num':0,'time':map.earlyStartTime + '-' + map.earlyEndTime}, // 早高峰时间段内的车辆.
+		        {'num':0,'time':map.earlyEndTime + '-' + map.lateStartTime},// 高峰之间时间段内的车辆
+		        {'num':0,'time':map.lateStartTime + '-' + map.lateEndTime},// 晚高峰时间段内的车辆.
+		        {'num':0,'time':map.lateEndTime + '-' + seMap.e}];// 晚高峰之后时间段内的车辆.
 	}
-	
-	function getStartAndEndDate(map) {
-		return {'s':getMinDate(map.line.startStationFirstTime,map.line.endStationFirstTime),
-				'e':getMaxDate(map.line.startStationEndTime,map.line.endStationEndTime)}
-	}
-	
+	 
+	/**
+	 * @description : (TODO) 获取最小时间(字符串).
+	 * 
+	 * @param [d1--时间1;d2--时间2].
+	 * 
+	 * @return 返回一个最小时间(字符串).
+	 * 
+	 * @status OK.
+	 * */
 	function getMinDate(d1,d2) {
+		// 1、定义返回字符串.
 		var str = '';
+		// 2、判断时间大小.
 		if(strToTime(d1)>strToTime(d2))
 			str = d2;
 		else
 			str = d1;
+		// 3、返回最小时间(字符串).
 		return str;
 	}
-	function strToTime(t) {
-		var d = new Date();
-		if(t) {
-			var _str = t.split(':');
-			d.setHours(parseInt(_str[0]));
-			d.setMinutes(parseInt(_str[1]));
-		}
-		return d;
-	}
-	
+	/**
+	 * @description : (TODO) 获取最大时间(字符串).
+	 * 
+	 * @param [d1--时间1;d2--时间2].
+	 * 
+	 * @return 返回一个最大时间(字符串).
+	 * 
+	 * @status OK.
+	 * */
 	function getMaxDate(d1,d2) {
+		// 1、定义返回时间字符串.
 		var str = '';
+		// 2、判断时间大小.
 		if(strToTime(d1)>strToTime(d2))
 			str = d1;
 		else
 			str = d2;
+		// 3、返回一个最大时间(字符串).
 		return str;
 	}
+	/**
+	 * @description : (TODO) 判断是否这时间段内.
+	 * 
+	 * @param [st--开始时间;ed--结束时间;sj--当前判断的时间]
+	 * 
+	 * @return 返回一个布尔值.
+	 * 
+	 * @status OK.
+	 * */
 	function issjd(st,ed,sj) {
+		// 1、定义返回值.
 		var tag = false;
+		// 2、判断时间大小.
 		if(sj<=ed  && sj>=st)
+			// 3、重新赋值返回值.
 			tag = true;
+		// 4、返回判断结果布尔值.
 		return tag;
 	}
+	/**
+	 * @description : (TODO) 获取客流数据.
+	 * 
+	 * @params [url--请求地址;data--请求参数;cb--回调函数]
+	 * 
+	 * */
+	function getJSONP(url, data, cb) {
+		$.ajax({
+			url : url,
+			type : "GET",
+			dataType : 'jsonp',
+			jsonp : 'jsoncallback',
+			data : data,
+			success : cb
+		});
+	}
+	
+	/**
+	 * @description : (TODO) 根据获取参数方式来获取表单参数详情html模版页.
+	 * 
+	 * @param [n--获取参数方式;map--表单参数;lineId--线路ID;krl--客容量;cb--回调函数]
+	 * 
+	 * @return 返回表单参数详情html模版页.
+	 * 
+	 * @status OK.
+	 * */
 	var getHtmlTemp = function(n,map,lineId,krl,cb) {
-		var zzsj =  parseInt(map.upTravelTime) + 10*2 + parseInt(map.downTravelTime);
+		// 1、定义模版名称.
 		var tempName = '';
-		var date = new Date(),
-			rq = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + (date.getDate()-3);
-		var startDateTime = rq + ' ' + '00:00';
-		var endDateTime  =  rq  + ' ' + '23:59';
-		var params = {'xlid':'10773','startDateTime':startDateTime,'endDateTime':endDateTime,'zzsj':zzsj};
-		if(n==0) {
+		if(n==0) 
 			tempName = 'carnum_temp';
-    	}else if(n==1) {
-    		tempName = 'bctype_temp';
-    	} 
+		else if(n==1)
+			tempName = 'bctype_temp';
+		// 2、获参数详情模版html内容.
 		$.get('/pages/base/timesmodel/tepms/'+ tempName + '.html', function(html){
 			$('#tab3').append(html);
-			map.lb = 15;
-			map.workeLunch = 20;
-			map.workeDinner = 20;
-			map.mixstopTime = 3;
-			map.maxstopTime = 20;
-			map.stopTime = 10;
+			map.lb = 15;// 定义例保时间.
+			map.workeLunch = 20;// 定义午餐时间.
+			map.workeDinner = 20;// 定义晚餐时间.
+			map.mixstopTime = 3;// 定义最小停站间隙
+			map.maxstopTime = 22;// 定义最大停站间隙.
+			map.stopTime = 10;// 定义停站时间.
 			if(n==0) {
-				getJSONP("http://139.196.13.237:8080/bsth-busfareflow-gj/Crlcxb/selectsjbctgl.do",params,function(json){ 
-					console.log(json);
+				// 定义一个周转时间.
+				var zzsj =  parseInt(map.upTravelTime) + 10*2 + parseInt(map.downTravelTime);
+				// 定义时间对象.
+				var date = new Date(),
+					rq = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + (date.getDate()-7);
+				// 定义开始时间字符串.
+				var startDateTime = rq + ' ' + '00:00';
+				// 定义结束时间自妇产.
+				var endDateTime  =  rq  + ' ' + '23:59';
+				// 定义请求参数集合.
+				var params = {'xlid':lineId,'startDateTime':startDateTime,'endDateTime':endDateTime,'zzsj':zzsj};
+				/**
+				 * getJSONP请求获取客流数据.
+				 * 
+				 * 返回的是一个每次以半小时为间隔作为开始时间点, 在加上周转时间作为结束时间点的 时段段内的客流最大通过量.
+				 * */ 
+				getJSONP("http://139.196.13.237:8080/bsth-busfareflow-gj/Crlcxb/selectsjbctgl.do",params,function(json){
+					// 定义时段集合,可容量.
 					var sjdArr = getsjdArr(map),krlInt = parseInt(krl);
+					// 遍历时段集合.
 					for(var s = 0 ; s<sjdArr.length;s++) {
+						// 分割时间段.
 						var strA = sjdArr[s].time.split('-');
+						// 定义开始时间与结束时间,车辆数.
 						var st = getDateTime(rq + ' '  + strA[0]),et = getDateTime(rq + ' '  + strA[1]),num = 0;
+						// 遍历时间段内的客流数据集合.
 						for(var j = 0 ; j < json.length; j ++) {
+							// 定义当前客流班次产生的时间.
 							var dqsj = getDateTime(json[j].sj);
+							// 判断是否这时间段内.
 							if(issjd(st,et,dqsj)) {
+								// 车辆数相加.
 								num = num + Math.ceil(parseInt(json[j].tgl)/krlInt);
 							}
 						}
 						sjdArr[s].num = num;
 					}
-					/*map.zgfbeforepcs = sjdArr[0].num; 
-					map.zgfpcs = sjdArr[1].num;
-					map.gfzjpcs = sjdArr[2].num;
-					map.wgfpcs = sjdArr[3].num;
-					map.wgfafterpcs = sjdArr[4].num;*/
-					map.zgfbeforepcs = 3; 
-					map.zgfpcs = 10;
-					map.gfzjpcs = 8;
-					map.wgfpcs = 10;
-					map.wgfafterpcs = 5;
-					
+					map.zgfbeforepcs = sjdArr[0].num;// 早高峰前配车数
+					map.zgfpcs = sjdArr[2].num;// 早高峰配车数
+					map.gfzjpcs = sjdArr[4].num;// 高峰之间配车数
+					map.wgfpcs = sjdArr[2].num ;// 晚高峰配车数
+					map.wgfafterpcs = sjdArr[1].num + sjdArr[3].num;// 晚高峰后配车数
+					// 返回参数详情模版.
 					return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
 				}); 
 			}else if(n==1) {
+				// 返回参数详情模版.
 				return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
 			}
 		});
 	}
-	var getCarNumber = function (param,cb) {
-		$post('url',param,function(data) {
-			return cb && cb(data);
-		})
+	
+	/**
+	 * @description (TODO) 格式化成渲染图形数据格式.
+	 * 
+	 * @param [d--查询出的时刻表明细数据.]
+	 * 
+	 * @return 返回渲染图形的数据格式.
+	 * */
+	function formatData(d) {
+		// 定义返回值.
+		var resultD = new Array();
+		for(var i =0;i<d.length;i++) {
+			var obj = {};
+			var ddsj = getddsj(d[i].fcsj,d[i].bcsj);// 到达时间.
+			obj.bcType = d[i].bcType;// 班次类型
+			obj.bcs = d[i].bcs;// 班次数
+			obj.bcsj = d[i].bcsj;// 班次时间
+			obj.fcno = d[i].fcno;// 发车序号
+			obj.fcsj = d[i].fcsj;// 发车时间
+			obj.ARRIVALTIME = ddsj// 到达时间
+			obj.jhlc = d[i].jhlc;// 计划里程
+			obj.lp = d[i].lp==null ? null : d[i].lp.id;// 路牌id
+			obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;// 路牌类型
+			obj.parent = d[i].lp.lpName;// 路牌名称
+			obj.lpNo = d[i].lp.lpNo;// 路牌编码
+			obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;// 停车场id
+			obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;// 时刻表id
+			obj.xl = d[i].xl==null ? null : d[i].xl.id;// 线路id
+			obj.xlDir = dmToDh(d[i].xlDir);// 方向【0：relationshipGraph-up 上行；1：relationshipGraph-down 下行】
+			obj.qdz = d[i].qdz==null ? null : d[i].qdz.id;// 起点站id
+			obj.zdz = d[i].zdz==null ? null : d[i].zdz.id;//终点站id
+			obj.isfb = isfbTodm(d[i].isFB);// 是否分班【0:false；1:true】
+			obj.isSwitchXl = isSwitchXlTodm(d[i].isSwitchXl);// 是否切换线路【0:false；1:true】
+			obj.STOPTIME = gettzsj(d[i],d,ddsj);// 停站时间.
+			resultD.push(obj);
+		}
+		// 返回渲染图形的数据格式.
+		return resultD;
 	}
+	
+	/**
+	 * @description : (TODO) 获取开始与结束时间字符串.
+	 * 
+	 * @param [map--表单配置参数]
+	 * 
+	 * @return 返回开始与结束时间字符串集合.
+	 * */
+	function getStartAndEndDate(map) {
+		return {'s':getMinDate(map.line.startStationFirstTime,map.line.endStationFirstTime),
+				'e':getMaxDate(map.line.startStationEndTime,map.line.endStationEndTime)}
+	}
+	 
 	return {
 		// 启动初始化向导导航
 		init : function() {
@@ -160,11 +461,11 @@ var SKBFormWizard = function() {
 					'earlyEndTime' : {required : true},// 早高峰结束时间,必填项 .
 					'lateStartTime' : {required : true},// 晚高峰开始时间,必填项 .
 					'lateEndTime' : {required : true},// 晚高峰结束时间,必填项.
-					'zgfbeforepcs' : {required : true,number : true,digits : true},// 早高峰前车辆数,必填项、必须为整数.
-					'zgfpcs' : {required : true,number : true,digits : true},// 早高峰车辆数,必填项、必须为整数.
-					'wgfafterpcs' : {required : true,number : true,digits : true},// 晚高峰后车俩数,必填项、必须为整数.
-					'wgfpcs' : {required : true,number : true,digits : true},// 晚高峰车俩数,必填项、必须为整数.
-					'gfzjpcs' : {required : true,number : true,digits : true},// 高峰中间车辆数,必填项、必须为整数.
+					'zgfbeforepcs' : {required : true,number : true,digits : true, isNum0:true},// 早高峰前车辆数,必填项、必须为整数.
+					'zgfpcs' : {required : true,number : true,digits : true, isNum0:true, isMax: true},// 早高峰车辆数,必填项、必须为整数.
+					'wgfafterpcs' : {required : true,number : true,digits : true, isNum0:true},// 晚高峰后车俩数,必填项、必须为整数.
+					'wgfpcs' : {required : true,number : true,digits : true, isNum0:true, isMax: true},// 晚高峰车俩数,必填项、必须为整数.
+					'gfzjpcs' : {required : true,number : true,digits : true, isNum0:true},// 高峰中间车辆数,必填项、必须为整数.
 					'upTravelTime' : {required : true,number : true},// 上行行驶时间,必填项、必须为整数.
 					'downTravelTime' : {required : true,number : true},// 下行行驶时间,必填项、必须为整数.
 					'upMileage' : {required : true,number : true},// 上行行驶里程,必填项、必须为整数.
@@ -192,7 +493,7 @@ var SKBFormWizard = function() {
 					'downInMileage' : {number : true},// 下行进场里程,必须为数字.
 					'downOutMileage' : {number : true},// 下行出场里程,必须为数字.
 					'lb' : {number : true},// 早晚例行保养,必须为数字.
-					'clzs':{required : true,number : true,digits : true},// 车辆总数,必填项、必须为整数.
+					'clzs':{required : true,number : true,digits : true, isBcType : true},// 车辆总数,必填项、必须为整数.
 					'bxrc' : {required : true},// 早晚例行保养,必须为数字.
 				},
@@ -243,10 +544,15 @@ var SKBFormWizard = function() {
 				 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
 				 */
 				submitHandler : function(f) {
+					// 定义localStorage对象.
 					var storage = window.localStorage;
+					// 表单序列化.
 					var argus = form.serializeJSON();
+					// 获取站点路由.
 					$get('/stationroute/all',{'line.id_eq':argus.lineName.split('_')[0]},function(result) {
+						// 判断.
 						if(result) {
+							// 定义上行起点站,上行终点站,下行起点站,下行终点站.
 							var upB ='',upE='',downB='',downE='';
 							for(var r = 0 ; r<result.length;r++) {
 								if(result[r].directions==0 && result[r].stationMark =='B')
@@ -260,14 +566,16 @@ var SKBFormWizard = function() {
 							}
 							argus.up_s = upB + '_' + upE;
 							argus.down_s = downB + '_' + downE;
+							// 获取停车车场.
 							$get('/carpark/all',{'parkCode_eq':argus.tcc},function(cp) {
 								var tcc_id = '';
 								if(cp) {
 									tcc_id = cp[0].id;
 								}
-								argus.tcc_id = tcc_id;
-								argus.skbmc = $('#skbNameSelect').select2('data')[0].text;
-								argus.xlmc = $('#lineSelect').select2('data')[0].text;
+								argus.tcc_id = tcc_id; // 停车场ID.
+								argus.skbmc = $('#skbNameSelect').select2('data')[0].text;// 时刻名称.
+								argus.xlmc = $('#lineSelect').select2('data')[0].text;// 线路名称.
+								// 获取时刻表明细.
 								$get('/tidc/all',{'ttinfo.id_eq':parseInt(argus.skbName)},function(data) {
 									if(data.status=='SUCCESS' && data.data.length>0) {
 										argus.istidc = 1;
@@ -277,7 +585,7 @@ var SKBFormWizard = function() {
 										  btn: ['确定并使用','取消并继续'] //按钮
 										}, function(){
 											layer.closeAll();
-											submit(JSON.stringify(gsData(data.data)),argus);
+											submit(JSON.stringify(formatData(data.data)),argus);
 										}, function(){
 											submit(null,argus);
 										});
@@ -291,6 +599,8 @@ var SKBFormWizard = function() {
 							layer.msg('系统不存在该线路的上、下行起终点站！');
 						}
 					});
+					
+					// 表单提交.
 					function submit(p,argus) {
 						storage.setItem("Gantt_AgursData",JSON.stringify(argus));
 						storage.setItem('isDoDate',p);
@@ -298,110 +608,99 @@ var SKBFormWizard = function() {
 					}
 				}
 			});
-			function gsData(d) {
-				var resultD = new Array();
-				for(var i =0;i<d.length;i++) {
-					var obj = {};
-					var ddsj = getddsj(d[i].fcsj,d[i].bcsj);
-					obj.bcType = d[i].bcType;//班次类型
-					obj.bcs = d[i].bcs;// 班次数
-					obj.bcsj = d[i].bcsj;// 班次时间
-					obj.fcno = d[i].fcno;// 发车序号
-					obj.fcsj = d[i].fcsj;//发车时间
-					obj.ARRIVALTIME = ddsj//到达时间
-					obj.jhlc = d[i].jhlc;//计划里程
-					obj.lp = d[i].lp==null ? null : d[i].lp.id;//路牌id
-					obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;//路牌类型
-					obj.parent = d[i].lp.lpName;// 路牌名称
-					obj.lpNo = d[i].lp.lpNo;//路牌编码
-					obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;//停车场id
-					obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;//时刻表id
-					obj.xl = d[i].xl==null ? null : d[i].xl.id;//线路id
-					obj.xlDir = dmToDh(d[i].xlDir);// 方向【0：relationshipGraph-up 上行；1：relationshipGraph-down 下行】
-					obj.qdz = d[i].qdz==null ? null : d[i].qdz.id;// 起点站id
-					obj.zdz = d[i].zdz==null ? null : d[i].zdz.id;//终点站id
-					obj.isfb = isfbTodm(d[i].isFB);//是否分班【0:false；1:true】
-					obj.isSwitchXl = isSwitchXlTodm(d[i].isSwitchXl);// 是否切换线路【0:false；1:true】
-					obj.STOPTIME = gettzsj(d[i],d,ddsj);
-					resultD.push(obj);
-				}
-				console.log(resultD);
-				return resultD;
-			}
-			function gettzsj(o,d,sj) {
-				var tzsj = 0;
-				for(var i = 0 ;i<d.length;i++) {
-					if(o.lp.lpNo == d[i].lp.lpNo && o.lp.id == d[i].lp.id) {
-						if(d[i].fcno - o.fcno ==1){
-							tzsj = (strToTime(d[i].fcsj) -strToTime(sj)) / 60000; 
-							continue;
-						}
-							
-					}
-				}
-				return tzsj;
-			}
-			
-			function isSwitchXlTodm(d) {
-				var rstr = 0;
-				if(d)
-					rstr = 1;
-				return rstr;
-			}
-			
-			function isfbTodm(b) {
-				var rstr = 0;
-				if(b)
-					rstr = 1;
-				return rstr;
-			}
-			
-			function getddsj(tStr,bcsj) {
-				var rt = '';
-				var date = new Date();
-				var _str = tStr.split(':');
-				date.setHours(parseInt(_str[0]));
-				date.setMinutes(parseInt(_str[1]) + bcsj);
-				return getTimeStr(date);
-			}
-			
-			var strToTime = function(t) {
-				var d = new Date;
-				if(t) {
-					var _str = t.split(':');
-					d.setHours(parseInt(_str[0]));
-					d.setMinutes(parseInt(_str[1]));
-				}
-				return d;
-			}
-			function getTimeStr(t) {
-				var _str = '';
-				if(t) {
-					_str = ((t.getHours()<10? '0' + t.getHours() : t.getHours()) == '00' ? '24' :(t.getHours()<10? '0' + t.getHours() : t.getHours()))
-					  		+':' 
-					  		+(t.getMinutes()<10? '0' + t.getMinutes() : t.getMinutes());
-				}
-				return _str;
-			}
+			// 验证配车数不能为零.
+			$.validator.addMethod('isNum0', function(value,element) {
+				// 定义返回值.
+				var tag = true;
+				var zgfbeforepcs = $('#zgfbeforepcsInput').val(),// 早高峰前配车数.
+					zgfpcs = $('#zgfpcsInput').val(),// 早高峰配车数.
+					gfzjpcs = $('#gfzjpcsInput').val(),// 高峰之间配车数.
+					wgfpcs = $('#wgfpcsInput').val(),// 晚高峰配车数.
+					wgfafterpcs = $('#wgfafterpcsInput').val();// 晚高峰后配车数.
+				// 判断是否为零.
+				if(parseInt(zgfbeforepcs) == 0 || parseInt(zgfbeforepcs) ==0 || 
+						parseInt(gfzjpcs) ==0 || parseInt(wgfpcs) ==0 || parseInt(wgfafterpcs) ==0)
+					tag = false;
+				return tag;
+			},function(){return '配车数不能为零!';	});
-			function dmToDh(t) {
-				var reslStr = '';
-				if(t=='0')
-					reslStr = 'relationshipGraph-up';
-				else if(t=='1')
-					reslStr = 'relationshipGraph-down';
-				return reslStr; 
-			}
+			// 验证高峰时段内的配车数是否高于其它时段配车数.
+			$.validator.addMethod('isMax', function(value,element) {
+				var tag = true;
+				var zgfbeforepcs = parseInt($('#zgfbeforepcsInput').val()),// 早高峰前配车数.
+					zgfpcs = parseInt($('#zgfpcsInput').val()),// 早高峰配车数.
+					gfzjpcs = parseInt($('#gfzjpcsInput').val()),// 高峰之间配车数.
+					wgfpcs = parseInt($('#wgfpcsInput').val()),// 晚高峰配车数.
+					wgfafterpcs = parseInt($('#wgfafterpcsInput').val());// 晚高峰后配车数.
+				// 判断高峰时段内的配车数是否高于其它时段配车数.
+				if(zgfpcs<zgfbeforepcs || zgfpcs<gfzjpcs   ||  zgfpcs<wgfafterpcs ||  wgfpcs<zgfbeforepcs || wgfpcs<gfzjpcs   ||  wgfpcs<wgfafterpcs )
+					tag = false;
+				return tag;
+			},function(){return '高峰时段配车数必须高于其它时段配车数!';});
+			// 验证客流数据分析时客容量为必填项.
 			$.validator.addMethod("isBaseRes", function(value,element) {
+				// 定义返回值.
 				var tag = true;
+				// 定义选择获取参数方式值
 				var baseChecked =  $('#submit_argus_form input[name="baseRes"]:checked').val();
+				// 判断
 				if(baseChecked == '0' && $('#krlInput').val()== '')
 					tag = false;
 				return tag; 
 			}, '客流大数据分析,客流总量为必填项！');
+			// 验证配车数不能为零.
+			$.validator.addMethod('isBcType', function(value,element) {
+				// 定义返回值.
+				var tag = true;
+				// 定义车辆总数,班型人次.
+				var clzs = $('#clzsInput').val(),
+					bxrc = $('#state_tagsinput').val();
+				// 判断.
+				if(bxrc=='' || bxrc==null || clzs=='' || clzs==0)
+					return false;
+				// 定义首末班次开始结束时间集合.
+				var map = {'line':{'startStationFirstTime':$('#qdzsbsjInput').val(),
+						   'startStationEndTime':$('#qdzmbsjInput').val(),
+						   'endStationFirstTime':$('#zdzsbsjInput').val(),
+						   'endStationEndTime':$('#zdzmbsjInput').val()}};
+				// 定义开始~结束时间.
+				var setMap = getStartAndEndDate(map);
+				console.log(setMap);
+				// 定义最大工时.
+				var maxGs =  parseInt( ((strToTime(setMap.e)  - strToTime(setMap.s)) / 60000) / 60) * parseInt(clzs);
+				// 切割班型人次,定义班次人次所用总工时.
+				var bxrcAr = bxrc.split(','),countGs = 0;
+				// 遍历
+				for(var s = 0 ; s< bxrcAr.length;s++) {
+					// 切割单个班型人次.
+					var s1a = bxrcAr[s].split('/');
+					// 定义人次.
+					var rs = parseInt(s1a[1]);
+					// 定义小时系数.
+					var hoursV = 0.0;
+					for(var g = 0 ; g < bxrcGs.length; g++) {
+						// 判断班型是否一致.
+						if(bxrcGs[g].type == s1a[0]) {
+							// 重新赋值小时系数.
+							hoursV = bxrcGs[g].hoursV;
+						}
+					}
+					// 重新计算班次人次所用总工时.
+					countGs = countGs + parseFloat(hoursV.toFixed(2)) * rs;
+				}
+				// 判断
+				if(parseFloat(countGs.toFixed(2))>maxGs)
+					tag = false;
+				return tag;
+			},function(){return '配车总数与班型人次搭配不合理!';	});
+			
+			/**
+			 * @description : (TODO) 监听获取参数方式值改变事件.
+			 * 
+			 * */
 			$('input:radio[name="baseRes"]').on('change',function(v) {
 				if($(this).val()=='1')
 					$('#krlGroup').hide();
@@ -484,25 +783,29 @@ var SKBFormWizard = function() {
                         return false;
                     }
                     if(index==1) {
+                    	// 初始化客容量值.
                     	if($('#krlInput').val() == '')
                     		$('#krlInput').val(50);
                     }else if(index == 2) {
-                    	var baseRes = $('#submit_argus_form input[name="baseRes"]:checked').val(),
-                			lineId = $('#lineSelect').val().split('_')[0],
-                			krl = $('#krlInput').val();
+                    	var baseRes = $('#submit_argus_form input[name="baseRes"]:checked').val(),// 获取参数方式值.
+                			lineId = $('#lineSelect').val().split('_')[0],// 线路ID.
+                			krl = $('#krlInput').val();// 客容量
                     	getLineInfo(lineId,function(r) {
                     		getHtmlTemp(baseRes,r.content[0],lineId,krl,function(htlMap) {
                         		$('#tab3').html(htlMap.forminput);
                         		$('#tab4').html(htlMap.datadisplay);
                         		if(baseRes==1)
-                        			ComponentsBootstrapTagsinput.init();
+                        			ComponentsBootstrapTagsinput.init();// 初始化班型人次Input Tag.
                         		// 日期控件
-                        		$('#qdzsbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#endServiceTimeInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#morningPeakStartInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#morningPeakEndInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#eveningPeakStartInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#eveningPeakEndInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                        		$('#qdzsbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 起始站首班时间
+                        		$('#qdzmbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 起始站末班时间
+                        		$('#zdzsbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 终点站首班时间
+                        		$('#zdzmbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 终点站末班时间
+                        		$('#zgfkssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 早高峰开始时间
+                        		$('#zgfjssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 早高峰结束时间
+                        		$('#wgfkssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 晚高峰开始时间
+                        		$('#wgfjssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 晚高峰结束时间
+                        		// 初始化停车场下拉框.
                         		gettccInfo(function(cd) {
                         			var options = '<option value="">请选择...</option><optgroup label="停车场">';
                         			var $_len = cd.length;
@@ -543,15 +846,4 @@ var SKBFormWizard = function() {
 			$('#submit_argus_form').find('.button-previous').hide();
 		}
 	}
-	function getJSONP(url, data, cb) {
-		$.ajax({
-			url : url,
-			type : "GET",
-			dataType : 'jsonp',
-			jsonp : 'jsoncallback',
-			data : data,
-			success : cb
-		});
-	}
-	
-}();
+}();
 \ No newline at end of file
@@ -1217,7 +1217,6 @@ var BaseFun = function() {
 						qt.push(arr[a]);
 					}
 				}
-				// debugger;
 				var tempup = baseF.sortDirArray(upArr);
 				var tempdown = baseF.sortDirArray(downArr);
 				return {'upArr':tempup,'downArr':tempdown,'qt':qt};
@@ -1233,7 +1232,6 @@ var BaseFun = function() {
 			 * @status OK.
 			 * */
 			sortDirArray : function(arr) {
-				///debugger;
 				//console.log(arr.length);
 				var list = new Array(),tempArray = new Array();
 				for(var a =0;a<arr.length;a++) {
@@ -1249,7 +1247,6 @@ var BaseFun = function() {
 							list.push(arr[d]);
 					}
 				}
-				//debugger;
 				//console.log(list.length);
 				return list;
 			},
@@ -1261,7 +1258,6 @@ var BaseFun = function() {
 			 * @return : 返回一个数组.这里返回的是调整过后 发车间距均匀的班次数组
 			 **/
 			jhfcjx : function(bcArr,dir,zzsj,dataMap) {
-				// debugger;
 				console.log(bcArr.length);
 				//console.log('调整' + dir + '发车间隙...');
 				// 1、定义某个方向下的首末班次时间结点.
@@ -1286,7 +1282,6 @@ var BaseFun = function() {
 						return;
 					var fcnosj = new Date(kssj);
 					// 2.4、调整班次
-					//debugger;
 					for(var l = 0 ;l<bcArr.length-1;l++) {
 						var _t = baseF.getDateTime(bcArr[l].fcsj);
 						if(_t>temp )
@@ -325,17 +325,18 @@ var _animation = function(d3Node) {return d3Node.transition().delay(function(d,i
  *  @returns {Object} table.outerHTML
  ************************************************************************************************************************************************/
 var createTooltip = function createTooltip(self) {
-    var hiddenKeys = ['_PRIVATE_','fcno' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR', /*'INTERVAL',*/'num'],
-        showKeys = self.configuration.showKeys;
     return d3.tip().attr('class', 'relationshipGraph-tip').offset([-8, -10]).html(function (obj) {
         var keys = Object.keys(obj),
             table = document.createElement('table'),
             count = keys.length,
             rows = [];
+        var showKeys = self.configuration.showKeys;
+        var hiddenKeys = ['_PRIVATE_' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR','lpNo','lpName','lp','lpType',
+                          'jhlc','tcc','ttinfo','xl','isfb','qdz','zdz','isSwitchXl','bz','bcs','fcno'];
         while (count--) {
-            var element = keys[count],
-                upperCaseKey = element.toUpperCase();
-            if (!RelationshipGraph.contains(hiddenKeys, upperCaseKey) && !upperCaseKey.startsWith('__') && obj[element] !='tjz') {
+            var element = keys[count];
+                // upperCaseKey = element.toUpperCase();
+            if (!RelationshipGraph.contains(hiddenKeys, element) && !element.startsWith('__') && obj[element] !='tjz') {
                 var row = document.createElement('tr'),
                     key = showKeys ? document.createElement('td') : null,
                     value = document.createElement('td');
@@ -352,7 +353,7 @@ var createTooltip = function createTooltip(self) {
                        else if(element=='xlDir')
                        		changeKey = '行驶方向:';
                        else if(element=='parent')
-                      		changeKey = '当前车辆:';
+                      		changeKey = '当前路牌:';
                        else if(element=='bcType')
                      		changeKey = '班次类型:';
                        else if(element=='tjbx')
@@ -363,7 +364,7 @@ var createTooltip = function createTooltip(self) {
                     row.appendChild(key);
                 }
-                if (upperCaseKey == 'VALUE' && !self.configuration.valueKeyName) {
+                if (element == 'VALUE' && !self.configuration.valueKeyName) {
                     continue;
                 }
@@ -101,7 +101,8 @@
 				'jclcArr' : BaseFun.formatPairing(gatps.upInMileage,gatps.downInMileage),// 进场里程。[下标0代表上；下标1代表下]
 				'cclcArr' : BaseFun.formatPairing(gatps.upOutMileage,gatps.downOutMileage),// 出场里程。[下标0代表上；下标1代表下]
 				'pcxssjArr' : BaseFun.formatPairing(gatps.upTravelTime,gatps.downTravelTime),// 平常行驶时间。[下标0代表上；下标1代表下]
-				'gfxxsjArr' : BaseFun.formatPairing(gatps.lateUpTime,gatps.lateDownTime),// 高峰行驶时间。[下标0代表上；下标1代表下]
+				'gfxxsjArr' : BaseFun.formatPairing(gatps.lateUpTime=='' ? gatps.upTravelTime : gatps.lateUpTime,
+													gatps.lateDownTime=='' ? gatps.downTravelTime : gatps.lateDownTime),// 高峰行驶时间。[下标0代表上；下标1代表下]
 				'pcxslcArr' : BaseFun.formatPairing(gatps.upMileage,gatps.downMileage),// 行驶里程。[下标0代表上；下标1代表下]
 				'qdzArr' : BaseFun.qzdz(gatps.up_s.split('_')[0],gatps.down_s.split('_')[0]),// 起始站。[下标0代表上；下标1代表下]
 				'zdzArr':BaseFun.qzdz(gatps.up_s.split('_')[1],gatps.down_s.split('_')[1]),// 终点站。[下标0代表上；下标1代表下]
@@ -25,10 +25,30 @@ var ComponentsBootstrapTagsinput = function() {
             itemValue: 'value',
             itemText: 'text'
         });
+        
+        $('#state_tagsinput').on('beforeItemAdd', function(event) {
+        	var bctypeValue = $('#state_tagsinput_bctype').val();
+        	var rcnum  = $('#state_tagsinput_value').val();
+        	var bxrcAr = $('#state_tagsinput').val().split(',');
+        	for(var s = 0 ; s< bxrcAr.length;s++) {
+        		var s1a = bxrcAr[s].split('/');
+        		 if(s1a[0]==bctypeValue) {
+        			 $('#state_tagsinput').tagsinput('remove', bxrcAr[s]);
+        		 }
+        	 }
+        });
+        
         $('#state_tagsinput_add').on('click', function(){
         	var bctypeValue = $('#state_tagsinput_bctype').val();
         	var rcnum  = $('#state_tagsinput_value').val();
         	if(isNull(bctypeValue,rcnum)) {
+        		var bxrcAr = $('#state_tagsinput').val().split(',');
+            	for(var s = 0 ; s< bxrcAr.length;s++) {
+            		var s1a = bxrcAr[s].split('/');
+            		 if(s1a[0]==bctypeValue) {
+            			 rcnum = parseInt(rcnum) + parseInt(s1a[1]);
+            		 }
+            	 }
         		 elt.tagsinput('add', { 
                      "value": bctypeValue  + '/' + rcnum, 
                      "text":  bctypeValue + '/' + rcnum, 
@@ -55,9 +55,9 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
-								<th width="13%">内部编码</th>
-								<th width="100">经度</th>
-								<th width="11%">纬度</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">工号/名字</th>
+								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
 								<th width="18%">时间</th>
 								<th width="18%">操作</th>
@@ -66,10 +66,11 @@
 								<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: 180px;"></select>
+										<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">
+<!-- 									<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>
@@ -119,10 +120,10 @@
 	</td>
 	<td>
-		{{obj.lon}}
+		{{obj.jsy}}
 	</td>
 	<td>
-		{{obj.lat}}
+		{{obj.lpname}}
 	</td>
 	<td>
 		{{if obj.upDown==0}}
@@ -271,45 +272,67 @@ $(function(){
 	});
 	//搜索线路
-	$('#line').select2({
-		ajax: {
-			url: '/realSchedule/findLine',
-			type: 'post',
-			dataType: 'json',
-			delay: 150,
-			data: function(params){
-				return{line: params.term};
-			},
-		    processResults: function (data) {
-		      return {
-		        results: data
-		      };
-		    },
-			cache: true
-		},
-		templateResult: function(repo){
-			if (repo.loading) return repo.text;
-			var h = '<span>'+repo.text+'</span>';
-			return h;
-		},
-		escapeMarkup: function (markup) { return markup; },
-		minimumInputLength: 1,
-		templateSelection: function(repo){
-			return repo.text;
-		},
-		language: {
-	       noResults: function(){
-	           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-	       },
-	       inputTooShort : function(e) {
-				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-		   },
-	       searching : function() {
-				return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-		   }
-		}
+ $.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			data.push({id: " ", text: "全部线路"});
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#line',data,'');
+
 	});
-});
+
+	$("#line").on("change",initXl);
+	
+function initXl(){
+$('#nbbm').select2({
+    placeholder: '搜索车辆...',
+    ajax: {
+        url: '/report/carList',
+        dataType: 'json',
+        delay: 150,
+        data: function (params) {
+        	   return {nbbm: params.term,
+           	    gsbm:" ",
+           	    fgsbm:" ",
+           	    xlbm:$('#line').val()}; 	
+        },
+        processResults: function (data) {
+            return {
+                results: data
+            };
+        },
+        cache: true
+    },
+    templateResult: function (repo) {
+        if (repo.loading) return repo.text;
+        var h = '<span>' + repo.text + '</span>';
+        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+        return h;
+    },
+    escapeMarkup: function (markup) {
+        return markup;
+    },
+    minimumInputLength: 1,
+    templateSelection: function (repo) {
+        return repo.text;
+    },
+    language: {
+        noResults: function () {
+            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+        },
+        inputTooShort: function (e) {
+            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+        },
+        searching: function () {
+            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+        }
+    }
+})
+};
+
+
+
 //改变状态
 function changeEnabled(id,enabled){
 	debugger
@@ -317,4 +340,5 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+});
 </script>
 \ No newline at end of file
@@ -55,9 +55,9 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
-								<th width="13%">内部编码</th>
-								<th width="100">经度</th>
-								<th width="11%">纬度</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">工号/名字</th>
+								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
 								<th width="18%">时间</th>
 								<th width="18%">操作</th>
@@ -66,10 +66,12 @@
 								<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: 180px;"></select>
+										<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">
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm" id="nbbm"> -->
+									
+									<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
 								</td>
 								<td>
 								</td>
@@ -119,10 +121,10 @@
 	</td>
 	<td>
-		{{obj.lon}}
+		{{obj.jsy}}
 	</td>
 	<td>
-		{{obj.lat}}
+		{{obj.lpname}}
 	</td>
 	<td>
 		{{if obj.upDown==0}}
@@ -275,43 +277,64 @@ $(function(){
 	});
 	//搜索线路
-	$('#line').select2({
-		ajax: {
-			url: '/realSchedule/findLine',
-			type: 'post',
-			dataType: 'json',
-			delay: 150,
-			data: function(params){
-				return{line: params.term};
-			},
-		    processResults: function (data) {
-		      return {
-		        results: data
-		      };
-		    },
-			cache: true
-		},
-		templateResult: function(repo){
-			if (repo.loading) return repo.text;
-			var h = '<span>'+repo.text+'</span>';
-			return h;
-		},
-		escapeMarkup: function (markup) { return markup; },
-		minimumInputLength: 1,
-		templateSelection: function(repo){
-			return repo.text;
-		},
-		language: {
-	       noResults: function(){
-	           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-	       },
-	       inputTooShort : function(e) {
-				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-		   },
-	       searching : function() {
-				return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-		   }
-		}
+	
+	$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			data.push({id: " ", text: "全部线路"});
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#line',data,'');
+
 	});
+
+	$("#line").on("change",initXl);
+function initXl(){
+	$('#nbbm').select2({
+	    placeholder: '搜索车辆...',
+	    ajax: {
+	        url: '/report/carList',
+	        dataType: 'json',
+	        delay: 150,
+	        data: function (params) {
+	        	   return {nbbm: params.term,
+	           	    gsbm:"",
+	           	    fgsbm:"",
+	           	    xlbm:$('#line').val()}; 	
+	        },
+	        processResults: function (data) {
+	            return {
+	                results: data
+	            };
+	        },
+	        cache: true
+	    },
+	    templateResult: function (repo) {
+	        if (repo.loading) return repo.text;
+	        var h = '<span>' + repo.text + '</span>';
+	        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+	        return h;
+	    },
+	    escapeMarkup: function (markup) {
+	        return markup;
+	    },
+	    minimumInputLength: 1,
+	    templateSelection: function (repo) {
+	        return repo.text;
+	    },
+	    language: {
+	        noResults: function () {
+	            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+	        },
+	        inputTooShort: function (e) {
+	            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+	        },
+	        searching: function () {
+	            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+	        }
+	    }
+	});
+}
+
 });
 </script>
 \ No newline at end of file
@@ -55,9 +55,9 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
-								<th width="13%">内部编码</th>
-								<th width="100">经度</th>
-								<th width="11%">纬度</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">工号/名字</th>
+								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
 								<th width="18%">时间</th>
 								<th width="18%">操作</th>
@@ -69,10 +69,11 @@
 										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
 								</td>
 								<td>
-									<input type="text" class="form-control form-filter input-sm" name="nbbm">
+<!-- 									<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>
-									<input class="form-control" type="date" name="date" />
+									
 								</td>
 								<td></td>
 								<td>
@@ -83,7 +84,7 @@
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td></td>
+								<td> <input class="form-control" type="date" name="date" /></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -118,10 +119,10 @@
 	</td>
 	<td>
-		{{obj.lon}}
+	{{obj.jsy}}
 	</td>
 	<td>
-		{{obj.lat}}
+		{{obj.lpname}}
 	</td>
 	<td>
 		{{if obj.upDown==0}}
@@ -270,45 +271,65 @@ $(function(){
 	});
 	//搜索线路
-	$('#line').select2({
-		ajax: {
-			url: '/realSchedule/findLine',
-			type: 'post',
-			dataType: 'json',
-			delay: 150,
-			data: function(params){
-				return{line: params.term};
-			},
-		    processResults: function (data) {
-		      return {
-		        results: data
-		      };
-		    },
-			cache: true
-		},
-		templateResult: function(repo){
-			if (repo.loading) return repo.text;
-			var h = '<span>'+repo.text+'</span>';
-			return h;
-		},
-		escapeMarkup: function (markup) { return markup; },
-		minimumInputLength: 1,
-		templateSelection: function(repo){
-			return repo.text;
-		},
-		language: {
-	       noResults: function(){
-	           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-	       },
-	       inputTooShort : function(e) {
-				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-		   },
-	       searching : function() {
-				return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-		   }
+	$.get('/basic/lineCode2Name',function(result){
+		var data=[];
+		data.push({id: " ", text: "全部线路"});
+		for(var code in result){
+			data.push({id: code, text: result[code]});
 		}
-	});
+		initPinYinSelect2('#line',data,'');
+
+});
+
+$("#line").on("change",initXl);
+function initXl(){
+$('#nbbm').select2({
+    placeholder: '搜索车辆...',
+    ajax: {
+        url: '/report/carList',
+        dataType: 'json',
+        delay: 150,
+        data: function (params) {
+        	   return {nbbm: params.term,
+           	    gsbm:"",
+           	    fgsbm:"",
+           	    xlbm:$('#line').val()}; 	
+        },
+        processResults: function (data) {
+            return {
+                results: data
+            };
+        },
+        cache: true
+    },
+    templateResult: function (repo) {
+        if (repo.loading) return repo.text;
+        var h = '<span>' + repo.text + '</span>';
+        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+        return h;
+    },
+    escapeMarkup: function (markup) {
+        return markup;
+    },
+    minimumInputLength: 1,
+    templateSelection: function (repo) {
+        return repo.text;
+    },
+    language: {
+        noResults: function () {
+            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+        },
+        inputTooShort: function (e) {
+            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+        },
+        searching: function () {
+            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+        }
+    }
 });
+}
+
+
 //改变状态
 function changeEnabled(id,enabled){
 	debugger
@@ -316,4 +337,5 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+});
 </script>
 \ No newline at end of file
@@ -31,76 +31,160 @@
         <div class="portlet-title">
             <div class="caption">
                 <i class="icon-equalizer font-red-sunglo"></i> <span
-                    class="caption-subject font-red-sunglo bold uppercase" >批量信息修改</span>
+                    class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
             </div>
         </div>
         <div class="portlet-body form">
             <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
                 <div class="form-body">
-
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">方向：</label>
-                        <div class="col-md-5">
-                            <sa-Radiogroup model="ctrl.tt.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">线路*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.xlname"
+                                   readonly/>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">起点站：</label>
-                        <div class="col-md-5">
-                            <sa-Select5 name="qdz"
-                                        model="ctrl.tt"
-                                        cmaps="{'qdz.id' : 'stationid'}"
-                                        dcname="qdz.id"
-                                        icname="stationid"
-                                        dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
-                                        iterobjname="item"
-                                        iterobjexp="item.stationname"
-                                        searchph="请输拼音..."
-                                        searchexp="this.stationname"
-                                         >
-                            </sa-Select5>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">时刻表名称*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.ttname"
+                                   readonly/>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">终点站：</label>
-                        <div class="col-md-5">
-                            <sa-Select5 name="zdz"
-                                        model="ctrl.tt"
-                                        cmaps="{'zdz.id' : 'stationid'}"
-                                        dcname="zdz.id"
-                                        icname="stationid"
-                                        dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
-                                        iterobjname="item"
-                                        iterobjexp="item.stationname"
-                                        searchph="请输拼音..."
-                                        searchexp="this.stationname"
-                                         >
-                            </sa-Select5>
+
+                    <div class="form-group" ng-if="ctrl.isZdModify == true">
+                        <label class="col-md-2 control-label">方向：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.tt.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup>
                         </div>
+
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">停车场：</label>
-                        <div class="col-md-5">
-                            <sa-Select5 name="tcc"
-                                        model="ctrl.tt"
-                                        cmaps="{'tcc.id': 'id'}"
-                                        dcname="tcc.id"
-                                        icname="id"
-                                        dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
-                                        iterobjname="item"
-                                        iterobjexp="item.parkName"
-                                        searchph="请输拼音..."
-                                        searchexp="this.parkName"
-                                         >
-                            </sa-Select5>
+
+                    <div ng-if="ctrl.isZdModify == true">
+
+                        <!--- 出场班次判定 -->
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'out'">
+                            <label class="col-md-2 control-label">停车场：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="tcc"
+                                            model="ctrl.tt"
+                                            cmaps="{'tcc.id': 'id'}"
+                                            dcname="tcc.id"
+                                            icname="id"
+                                            dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.parkName"
+                                            searchph="请输拼音..."
+                                            searchexp="this.parkName"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'out'">
+                            <label class="col-md-2 control-label">终点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="zdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'zdz.id' : 'stationid'}"
+                                            dcname="zdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+
+                        <!--- 进场班次判定 -->
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'in'">
+                            <label class="col-md-2 control-label">起点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="qdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'qdz.id' : 'stationid'}"
+                                            dcname="qdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'in'">
+                            <label class="col-md-2 control-label">停车场：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="tcc"
+                                            model="ctrl.tt"
+                                            cmaps="{'tcc.id': 'id'}"
+                                            dcname="tcc.id"
+                                            icname="id"
+                                            dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.parkName"
+                                            searchph="请输拼音..."
+                                            searchexp="this.parkName"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+
+                        <!-- 其他班次类型 -->
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType != 'in' && ctrl.tt.bcType != 'out'">
+                            <label class="col-md-2 control-label">起点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="qdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'qdz.id' : 'stationid'}"
+                                            dcname="qdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType != 'in' && ctrl.tt.bcType != 'out'">
+                            <label class="col-md-2 control-label">终点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="zdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'zdz.id' : 'stationid'}"
+                                            dcname="zdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
                         </div>
+
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">发车时间：</label>
-                        <div class="col-md-5">
+                        <label class="col-md-2 control-label">发车时间：</label>
+                        <div class="col-md-3">
                             <input type="text" class="form-control" name="fcsj"
                                    ng-model="ctrl.tt.fcsj"
                                    ng-pattern="ctrl.time_regex"
@@ -113,8 +197,8 @@
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">计划里程：</label>
-                        <div class="col-md-5">
+                        <label class="col-md-2 control-label">计划里程：</label>
+                        <div class="col-md-3">
                             <input type="text" class="form-control" name="jhlc"
                                    ng-model="ctrl.tt.jhlc"
                                    ng-pattern="ctrl.float_regex"
@@ -127,8 +211,8 @@
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">班次历时：</label>
-                        <div class="col-md-5">
+                        <label class="col-md-2 control-label">班次历时：</label>
+                        <div class="col-md-3">
                             <input type="text" class="form-control" name="bcsj"
                                    ng-model="ctrl.tt.bcsj"
                                    ng-pattern="ctrl.number_regex"
@@ -140,9 +224,10 @@
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">班次类型：</label>
-                        <div class="col-md-5">
+                    <div class="form-group"
+                         ng-if="ctrl.isZdModify == true">
+                        <label class="col-md-2 control-label">班次类型：</label>
+                        <div class="col-md-3">
                             <sa-Select5 name="bcType"
                                         model="ctrl.tt"
                                         cmaps="{'bcType': 'code'}"
@@ -159,6 +244,14 @@
                     </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">开始分班：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.tt.isFB" dicgroup="truefalseType" name="isFB"></sa-Radiogroup>
+                        </div>
+
+                    </div>
+
                 </div>
                 <div class="form-actions">
@@ -184,6 +184,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                         ttinfodetailIds[index].qdz = value.qdz || undefined;
                                         ttinfodetailIds[index].zdz = value.zdz || undefined;
                                         ttinfodetailIds[index].tcc = value.tcc || undefined;
+                                        ttinfodetailIds[index].isfb = value.isFB || undefined;
                                         ttinfodetailIds[index].validInfo();
@@ -585,10 +586,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$stateParams',
         '$state',
         function(service, $stateParams, $state) {
-            // TODO：
-
             var self = this;
-            var TTInfoDetail = service.getQueryClass();
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            self.xlid = $stateParams.xlid; // 获取传过来的线路id
+            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
+            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
+            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 批量修改班次信息";
+
+            //var TTInfoDetail = service.getQueryClass();
             // 时间正则表达式（格式hh:mm，如：06:39）
             self.time_regex = /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/;
@@ -599,11 +606,14 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 欲保存的busInfo信息，绑定
             //self.tt = new TTInfoDetail;
+
             self.tt = {
                 xlDir: undefined,
                 tcc: {id: undefined},
                 qdz: {id: undefined},
                 zdz: {id: undefined},
+                bcType: undefined,
+                isFB: undefined,
                 reSetTTinfoDetail: function(value) {
                     for (var key in this) {
                         if (!angular.isFunction(this[key])) {
@@ -611,7 +621,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                                 if (this[key].id) {
                                     value[key] = this[key];
                                 }
-                            } else if (this[key]) {
+                            } else if (this[key] != undefined) {
                                 value[key] = this[key];
                             }
                         }
@@ -619,13 +629,32 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 }
             };
-            // 获取传过来的id，有的话就是修改，获取一遍数据
-            self.xlid = $stateParams.xlid; // 获取传过来的线路id
-            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
-            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
-            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            // 修正self.tt
-            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+            self.isZdModify = false; // 是否可以修改站点（如果不是同一圈的数据是不能修改站点的）
+            var colIndexs_maps = {};
+            var detailInfos = service.getEditInfo().detailInfos;
+            for (var i = 0; i < detailInfos.length; i++) {
+                for (var j = 0; j < detailInfos[i].length; j++) {
+                    if (detailInfos[i][j].canDelete()) {
+                        colIndexs_maps[j] = j;
+                    }
+                }
+            }
+            var colIndexs = [];
+            for (var kk in colIndexs_maps) {
+                colIndexs.push(kk);
+            }
+            if (colIndexs.length == 1) {
+                self.isZdModify = true;
+                var columnBcInfo = service.getEditInfo().columnBcInfo[colIndexs[0]];
+
+                self.tt.xlDir = columnBcInfo.xldir;
+                self.tt.bcType = columnBcInfo.bc_type;
+                self.tt.qdz.id = columnBcInfo.qdz;
+                self.tt.zdz.id = columnBcInfo.zdz;
+                self.tt.tcc.id = columnBcInfo.tcc;
+            }
             // 提交方法
             self.submit = function() {
@@ -646,6 +675,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 //    });
                 //});
+                console.log(self.tt);
+
                 service.editInfos(self.tt).then(function() {
                     $state.go("ttInfoDetailManage_edit3", {
                         xlid: self.xlid,
@@ -114,15 +114,15 @@
 }
 .line-schedule-table dl dt:nth-of-type(7), .line-schedule-table dl dd:nth-of-type(7) {
-    width: 10%;
+    width: calc(10% + 10px);
 }
 .line-schedule-table dl dt:nth-of-type(8), .line-schedule-table dl dd:nth-of-type(8) {
-    width: calc(51% - 238px);
+    width: calc(51% - 233px);
 }
 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
-    width: 70px;
+    width: 65px;
     border-right: 0;
 }
@@ -923,4 +923,41 @@ option.oil_station_opt{
 }
 .park-and-station-wrap select{
     width: auto !important;
+}
+
+/** 安全驾驶相关css */
+.safe_driv_pop_wrap{
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+}
+
+.safe_driv_pop{
+    height: 45px;
+    background: #d44b4b;
+    color: #f2f2f2;
+    font-size: 15px;
+    padding: 9px 10px 0;
+    border: 1px solid #f4f0f0;
+    border-radius: 5px;
+    cursor: pointer;
+    box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+}
+
+.safe_driv_pop:hover{
+    background: #bc2a2a;
+}
+
+.safe_driv_pop .title{
+    font-weight: 600;
+}
+
+.safe_driv_pop i.uk-icon-times-circle{
+    margin-right: 5px;
+}
+.safe_driv_pop .desc{
+    display: block;
+    font-size: 12px;
+    margin: 2px 0 0 20px;
+    color: #e3e3e3;
 }
 \ No newline at end of file
-.uk-modal{
+.uk-modal.ct_move_modal{
     background: rgba(0,0,0,.4) !important;
 }
-.uk-modal-dialog{
+.uk-modal.ct_move_modal .uk-modal-dialog{
     border: 1px solid #dd6952;
     position: absolute !important;
     margin: 0 !important;
 }
-.uk-modal-dialog.uk-modal-dialog-blank{
+.uk-modal.ct_move_modal .uk-modal-dialog.uk-modal-dialog-blank{
     border: none !important;
 }
-.uk-modal-header{
+.uk-modal.ct_move_modal .uk-modal-header{
     cursor: move;
     user-select: none;
 }
 \ No newline at end of file
-<div class="uk-modal ct-form-modal" id="schedule-addsch-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal">
     <div class="uk-modal-dialog">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="schedule-dftz-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-dftz-modal">
     <div class="uk-modal-dialog">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="schedule-fcxxwt-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-fcxxwt-modal">
     <div class="uk-modal-dialog">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="schedule-jhlb-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-jhlb-modal">
     <div class="uk-modal-dialog" style="width: 370px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="schedule-lj_zrw-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-lj_zrw-modal">
     <div class="uk-modal-dialog" style="width: 930px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
@@ -270,7 +270,7 @@
                 if (sum != sch.jhlcOrig) {
                     if (i > 1)
                         calcs += ('=' + sum);
-                    calcs += (' ≠ ' + sch.jhlc);
+                    calcs += (' ≠ ' + sch.jhlcOrig);
                     calcs = calcs.substr(3);
                     var htmlStr = template('sub_task-fail-status-temp', {calcs: calcs});
                     $('#childTaskTitle', modal).append(htmlStr);
-<div class="uk-modal" id="schedule-lp_change-modal">
+<div class="uk-modal ct_move_modal" id="schedule-lp_change-modal">
     <div class="uk-modal-dialog" style="width: 1240px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal" id="schedule-multi-dftz-modal">
+<div class="uk-modal ct_move_modal" id="schedule-multi-dftz-modal">
     <div class="uk-modal-dialog" style="width: 710px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal" id="schedule-multi-tzrc-modal">
+<div class="uk-modal ct_move_modal" id="schedule-multi-tzrc-modal">
     <div class="drag-container"></div>
     <div class="uk-modal-dialog" style="width: 860px;">
         <a href="" class="uk-modal-close uk-close"></a>
-<div class="uk-modal ct-form-modal" id="schedule-sftz-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-sftz-modal">
     <div class="uk-modal-dialog" style="width: 350px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal" id="add-sub-task-inpark-modal">
+<div class="uk-modal ct_move_modal" id="add-sub-task-inpark-modal">
     <div class="uk-modal-dialog">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
@@ -476,7 +476,7 @@
                     $('input[name=mileage]', serviceForm).val(sMileage);
                 //营运结束时间
-                var et = sch.dfsjT + (parseInt(sMileage / sch.jhlc * sch.bcsj) * 60 * 1000)
+                var et = sch.dfsjT + (parseInt(sMileage / sch.jhlcOrig * sch.bcsj) * 60 * 1000)
                         ,ets = et > sch.zdsjT?sch.zdsj:moment(et).format('HH:mm');
                 $('input[name=endDate]', serviceForm).val(ets);
-<div class="uk-modal ct-form-modal" id="schedule-addsch_oil-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch_oil-modal">
     <div class="uk-modal-dialog" style="width: 1201px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="add-sub-task-other-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="add-sub-task-other-modal">
     <div class="uk-modal-dialog" style="width: 635px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal" id="add-sub-task-inpark-modal">
+<div class="uk-modal ct_move_modal" id="add-sub-task-inpark-modal">
     <div class="uk-modal-dialog">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="add-sub-task-range_turn-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="add-sub-task-range_turn-modal">
     <div class="uk-modal-dialog" style="width: 1200px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="oil_station-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="oil_station-modal">
     <div class="uk-modal-dialog" style="width: 450px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-<div class="uk-modal ct-form-modal" id="schedule-tzrc-modal">
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-tzrc-modal">
     <div class="uk-modal-dialog" style="width: 680px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
@@ -3,13 +3,14 @@ $(document).on(&#39;hide.uk.modal&#39;, &#39;.uk-modal&#39;, function () {
     $(this).remove();
 });
-$(document).on('show.uk.modal', '.uk-modal', function () {
+$(document).on('show.uk.modal', '.uk-modal.ct_move_modal', function () {
     if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
         return;
-    //临时放过g'ji轨迹回放
-    if($(this).attr('id')=='map-playback-modal')
-        return;
+    /*    //临时放过轨迹回放
+     if($(this).attr('id')=='map-playback-modal')
+     return;*/
+
     //计算居中位置
     var win = $('body');
     var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
@@ -19,7 +20,7 @@ $(document).on(&#39;show.uk.modal&#39;, &#39;.uk-modal&#39;, function () {
 var show_modal = function (id, dom) {
     $(document.body).append(dom);
     return UIkit.modal(id, {
-        bgclose: false
+        bgclose: false, modal: false
     }).show();
 };
@@ -39,7 +40,8 @@ var open_modal_dom = function (dom, data, opt) {
     $(document.body).append(dom);
     UIkit.modal(id, opt).show();
     //move
-    modal_move($('.uk-modal-header',id));
+    if($(id).hasClass('ct_move_modal'))
+        modal_move($('.uk-modal-header',id));
     if (data)
         $(id).trigger('init', data);
@@ -64,7 +66,6 @@ var modal_move = function (m_header) {
     });
     $(m_header).parents('.uk-modal').mousemove(function (e) {
-        e.preventDefault();
         if(!_moveFlag || !_moveObj)
             return;
@@ -91,5 +92,4 @@ var modal_move = function (m_header) {
         _moveFlag = false;
         _moveObj = null;
     });
-
 };
 \ No newline at end of file
+/**
+ * 安全驾驶相关
+ */
+var gb_safe_driv = (function () {
+
+    var codes = {
+        'A1': '手部违规',
+        'A2': '摄像头偏离',
+        'A3': '安全带',
+        'A4': '未戴袖章',
+        'A5': '眨眼/疲劳驾驶',
+        'A6': '打哈欠/打瞌睡',
+        'A7': '与人交谈'
+    };
+
+    var $wrap = $('.safe_driv_pop_wrap');
+    var max = 5;
+
+    var pop = function (sd) {
+        //只有admin用户能收到
+        var user = gb_northToolbar.user();
+        if(!user || user.userName.indexOf('admin') == -1)
+            return;
+
+        var htmlStr = '<div class="safe_driv_pop uk-animation-slide-bottom">'+
+            ' <span class="title"><i class="uk-icon-times-circle"></i>安全驾驶 '+moment(sd.ts).format('HH:mm')+'</span>'+
+            ' <span class="text"> '+sd.clzbh+' 违规驾驶（'+codes[sd.yczltype]+'）</span><span class="desc">请至安全驾驶监管平台查看图像信息</span>'+
+            '</div>';
+
+        var items = $wrap.find('.safe_driv_pop'), len = items.length;
+        if(len >= max)
+            $wrap.find('.safe_driv_pop:lt('+(len - max)+')').remove();
+
+        $wrap.append(htmlStr);
+    };
+
+    $wrap.on('click', '.safe_driv_pop', function () {
+        $(this).remove();
+    });
+
+    return {
+        pop: pop
+    }
+})();
 \ No newline at end of file
@@ -70,6 +70,10 @@ var gb_sch_websocket = (function () {
         calcUntreated(msg.data.lineId);
     };
+    var safeDriv = function (msg) {
+        gb_safe_driv.pop(msg.t);
+    };
+    
     var waitRemoves = [];
     //车辆发出
     var faChe = function (msg) {
@@ -150,7 +154,8 @@ var gb_sch_websocket = (function () {
         d80Confirm: d80Confirm,
         directive: directiveStatus,
         signal_state: signalState,
-        deviceOffline: deviceOffline
+        deviceOffline: deviceOffline,
+        safeDriv: safeDriv
     };
     function currentSecond() {
@@ -60,6 +60,7 @@
     </div>
 </div>
+<div class="safe_driv_pop_wrap"></div>
 <script>
     delete window.exports;
     delete window.module;
@@ -182,8 +183,10 @@
 <!-- 处理表单片段嵌入问题 -->
 <script src="/real_control_v2/js/forms/form_embed.js"></script>
-
+<!-- 模态框扩展 -->
 <script src="/real_control_v2/js/modal_extend.js"></script>
+<!-- 安全驾驶相关 -->
+<script src="/real_control_v2/js/safe_driv/safeDriv.js" ></script>
 </body>
 </html>
@@ -800,4 +800,103 @@ input[type=checkbox].disabled{
 .cc_info_accordion{
     height: calc(100% - 40px);
     overflow: auto;
+}
+
+.map-wrap-tools{
+    position: absolute;
+    top: 0;
+    width: 100%;
+    background: #ffffff;
+    z-index: 10;
+    box-shadow: 3px 1px 8px 0 rgba(0, 0, 0, 0.12), 1px 0px 8px 0 rgba(0, 0, 0, 0.12);
+    height: 70px;
+    display: none;
+}
+
+.map-container{
+    width: 100%;
+    height: 100%;
+}
+
+#map-playback2-modal .uk-modal-close{
+    z-index: 11;
+}
+
+.map-wrap-tools .ct-progress-bar{
+    position: absolute;
+    height: 11px;
+    width: 100%;
+    bottom: 0;
+    cursor: pointer;
+    /*border-top: 5px solid white;*/
+}
+
+.map-wrap-tools .ct-progress-bar .scale{
+    width: 85%;
+    height: 6px;
+    border-top: 5px solid white;
+    background: #2bc2d5;
+}
+
+.map-wrap-tools .btns{
+    padding: 5px 10px 0 25px;
+}
+
+.map-wrap-tools .btns>span.ct_btn{
+    cursor: pointer;
+}
+
+.map-wrap-tools .btns>.play_btn{
+    width: 48px;
+    height: 48px;
+    display: inline-block;
+    background: url("/real_control_v2/assets/imgs/icon/play.png");
+    margin-right: 10px;
+}
+
+.map-wrap-tools .btns>.play_btn.play{
+    background: url("/real_control_v2/assets/imgs/icon/pause.png");
+}
+
+.map-wrap-tools .btns>.play_btn:hover{
+    box-shadow: 0px 0px 8px 0 rgba(220, 35, 35, 0.61), 0px 0px 8px 0 rgba(206, 50, 50, 0.26);
+    border-radius: 35px;
+}
+
+.map-wrap-tools .btns>.multi-items{
+    display: inline-block;
+    vertical-align: top;
+    background: #e7e4e4;
+    padding: 7px 15px;
+    margin: 12px 5px;
+    border-radius: 5px;
+}
+
+.map-wrap-tools .btns>.multi-items label{
+    margin-right: 10px;
+}
+
+.map-wrap-tools .btns>.multi-items label:last-child{
+    margin-right: 0;
+}
+
+.map-wrap-tools .ct_btn.text-panel{
+    vertical-align: top;
+    display: inline-block;
+    margin-top: 8px;
+    margin-left: 15px;
+    font-size: 13px;
+}
+
+.map-wrap-tools .ct_btn.a.export-excel {
+    color: #F44336;
+}
+
+.map-wrap-tools .ct_btn.clock{
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 22px;
+    font-size: 22px;
+    color: #8b8686;
+    margin-right: 10px;
 }
 \ No newline at end of file
@@ -78,127 +78,6 @@
                                 </dl>
                             </div>
                             <div class="ct_table_body">
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(180)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>超速(80)</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-                                <dl>
-                                    <dd>越界</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd>05:00.20</dd>
-                                    <dd></dd>
-                                </dl>
-
                             </div>
                         </div>
                     </div>
@@ -245,154 +124,6 @@
                                             </dl>
                                         </div>
                                         <div class="ct_table_body">
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-                                            <dl>
-                                                <dd>金桥路朴珊德拉</dd>
-                                                <dd>05:02.4</dd>
-                                                <dd>05:04.6</dd>
-                                                <dd>5</dd>
-                                                <dd>12</dd>
-                                            </dl>
-
                                         </div>
                                     </div>
                                 </div>
@@ -402,7 +133,55 @@
                     </div>
                 </div>
             </div>
-            <div class="uk-width-medium-7-10 uk-height-viewport map-wrap">
+            <div class="uk-width-medium-7-10 uk-height-viewport map-wrap" style="padding-left: 0;position: relative;">
+                <div class="map-wrap-tools uk-animation-slide-top">
+                    <div class="btns">
+                        <span class="ct_btn play_btn"></span>
+                        <span class="ct_btn clock">
+                            08:20.10
+                        </span>
+                        <div class="multi-items">
+                            <form class="uk-form">
+                                <label>
+                                    <input type="radio" name="playSpeed"> x1
+                                </label>
+                                <label>
+                                    <input type="radio" name="playSpeed"> x5
+                                </label>
+                                <label>
+                                    <input type="radio" name="playSpeed"> x10
+                                </label>
+                                <label>
+                                    <input type="radio" name="playSpeed"> x20
+                                </label>
+                            </form>
+                        </div>
+                        <div class="multi-items">
+                            <form class="uk-form">
+                                <label>
+                                    <input type="checkbox"> 站点
+                                </label>
+                                <label>
+                                    <input type="checkbox"> 缓冲区
+                                </label>
+                                <label>
+                                    <input type="checkbox"> 站点名称
+                                </label>
+                                <label>
+                                    停车场 <i class="uk-icon-angle-down"></i>
+                                </label>
+                            </form>
+                        </div>
+                        <span class="ct_btn text-panel">
+                            <span>约12.58公里，1258个GPS点</span><br>
+                            <a class="export-excel"><i class="uk-icon-file-excel-o"></i> 导出轨迹</a>
+                        </span>
+                    </div>
+                    <div class="ct-progress-bar" >
+                        <div class="scale"></div>
+                    </div>
+                </div>
+                <div class="map-container"></div>
             </div>
         </div>
     </div>
@@ -429,16 +208,49 @@
         </dl>
         {{/each}}
     </script>
+
+    <script id="multi_inout_info_cont_temp" type="text/html">
+        {{each list as item i}}
+        <dl>
+            <dd>{{item.stopName}}</dd>
+            <dd>{{item.in_time_str}}</dd>
+            <dd>{{item.out_time_str}}</dd>
+            <dd></dd>
+            <dd></dd>
+        </dl>
+        {{/each}}
+    </script>
+
+    <script id="abnormal_table_cont_temp" type="text/html">
+        {{each array as item i}}
+            <dl>
+                <dd>
+                    {{if item.abnormalType == 'speed'}}
+                        超速({{item.speed}})
+                    {{else if item.abnormalType == 'outbound'}}
+                        越界
+                    {{/if}}
+                </dd>
+                <dd>{{item.st_str}}</dd>
+                <dd>{{item.et_str}}</dd>
+                <dd></dd>
+            </dl>
+        {{/each}}
+    </script>
     <script>
         (function () {
             var modal = '#map-playback2-modal', gpsArray;
             $(modal).on('init', function (e, data) {
-                //初始化地图
-                map = new BMap.Map($('.map-wrap', modal)[0]);
-                //中心点和缩放级别
-                map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
-                map.enableScrollWheelZoom();
+                try {
+                    //初始化地图
+                    map = new BMap.Map($('.map-container', modal)[0]);
+                    //中心点和缩放级别
+                    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
+                    map.enableScrollWheelZoom();
+                } catch (e) {
+                    console.log(e);
+                }
                 //固定表头
                 gb_ct_table.fixedHead($('.road_table_wrap', modal));
@@ -494,72 +306,89 @@
              */
             var searchForm = (function () {
-                var f = $('.playBackForm', modal);
-
-                var init = function (data) {
-                    //设置初始值
-                    if (data.nbbm)
-                        $('[name=nbbm]', f).val(data.nbbm);
-                    var st = moment().subtract(2, 'hour');
-                    if (data.st)
-                        st = moment(data.st, 'YYYY-MM-DD HH:mm');
-                    $('[name=sDate]', f).val(st.format('YYYY-MM-DD'));
-                    $('[name=sTime]', f).val(st.format('HH:mm'));
-                    var et = moment();
-                    if (data.et)
-                        et = moment(data.et, 'YYYY-MM-DD HH:mm');
-                    $('[name=eDate]', f).val(et.format('YYYY-MM-DD'));
-                    $('[name=eTime]', f).val(et.format('HH:mm'));
-
-                    //搜索事件
-                    $('button[type=submit]', f).on('click', search);
-                };
+                        var f = $('.playBackForm', modal);
-                var setNbbm = function (v) {
-                    $('[name=nbbm]', f).val(v);
-                };
+                        var init = function (data) {
+                            //设置初始值
+                            /*if (data.nbbm)
+                             $('[name=nbbm]', f).val(data.nbbm);
+                             var st = moment().subtract(2, 'hour');
+                             if (data.st)
+                             st = moment(data.st, 'YYYY-MM-DD HH:mm');
+                             $('[name=sDate]', f).val(st.format('YYYY-MM-DD'));
+                             $('[name=sTime]', f).val(st.format('HH:mm'));
+                             var et = moment();
+                             if (data.et)
+                             et = moment(data.et, 'YYYY-MM-DD HH:mm');
+                             $('[name=eDate]', f).val(et.format('YYYY-MM-DD'));
+                             $('[name=eTime]', f).val(et.format('HH:mm'));*/
-                var ONE_DAY = 60 * 60 * 24;
-                var MIN_SPACE = 60;
-                var search = function (e) {
-                    e.stopPropagation();
-                    var data = f.serializeJSON();
-
-                    //校验时间间隔
-                    var fs = 'YYYY-MM-DDHH:mm';
-                    var st = parseInt(moment(data.sDate + data.sTime, fs).format('X'));
-                    var et = parseInt(moment(data.eDate + data.eTime, fs).format('X'));
-
-                    if (et < st)
-                        notify_err('结束时间不能小于开始时间');
-                    else if ((et - st) > ONE_DAY)
-                        notify_err('最大间隔24小时！');
-                    else if ((et - st) < MIN_SPACE)
-                        notify_err('最小间隔1分钟！');
-                    else {
-                        $.ajax({
-                            url: '/gps/history_v2/' + data.nbbm,
-                            traditional: true,
-                            data: {st: st, et: et},
-                            success: function (rs) {
-                                gpsArray = rs.list;
-                                if (!rs || rs.length == 0) {
-                                    notify_err('没有搜索到轨迹数据！');
-                                    return;
-                                }
-
-                                //行车轨迹
-                                trailTableObj.showInitData(gpsArray);
+
+                            $('[name=nbbm]', f).val('W0A-018');
+                            $('[name=sDate]', f).val('2017-04-06');
+                            $('[name=sTime]', f).val('04:49');
+
+                            $('[name=eDate]', f).val('2017-04-06');
+                            $('[name=eTime]', f).val('09:49');
+                            //搜索事件
+                            $('button[type=submit]', f).on('click', search);
+                        };
+
+                        var setNbbm = function (v) {
+                            $('[name=nbbm]', f).val(v);
+                        };
+
+                        var ONE_DAY = 60 * 60 * 24;
+                        var MIN_SPACE = 60;
+                        var search = function (e) {
+                            e.stopPropagation();
+                            var data = f.serializeJSON();
+
+                            //校验时间间隔
+                            var fs = 'YYYY-MM-DDHH:mm';
+                            var st = parseInt(moment(data.sDate + data.sTime, fs).format('X'));
+                            var et = parseInt(moment(data.eDate + data.eTime, fs).format('X'));
+
+                            if (et < st)
+                                notify_err('结束时间不能小于开始时间');
+                            else if ((et - st) > ONE_DAY)
+                                notify_err('最大间隔24小时！');
+                            else if ((et - st) < MIN_SPACE)
+                                notify_err('最小间隔1分钟！');
+                            else {
+                                $.ajax({
+                                    url: '/gps/history_v2/' + data.nbbm,
+                                    traditional: true,
+                                    data: {st: st, et: et},
+                                    success: function (rs) {
+                                        gpsArray = rs.list;
+                                        if (!rs || rs.length == 0) {
+                                            notify_err('没有搜索到轨迹数据！');
+                                            return;
+                                        }
+
+                                        //排序
+                                        gpsArray.sort(function (a, b) {
+                                            return parseInt((a.ts - b.ts) + '' + (a.stop_no - b.stop_no));
+                                        });
+                                        //行车轨迹
+                                        trailTableObj.showInitData(gpsArray);
+                                        //到离站信息
+                                        inOutStationTableObj.showInitData(gpsArray);
+                                        //异常信息
+                                        abnormalTableObj.showInitData(rs['outboundList'], rs['speedList']);
+                                        //show 工具条
+                                        mapTools.show();
+                                    }
+                                });
                             }
-                        });
-                    }
-                    return false;
-                };
-                return {
-                    init: init,
-                    setNbbm: setNbbm
-                };
-            })();
+                            return false;
+                        };
+                        return {
+                            init: init,
+                            setNbbm: setNbbm
+                        };
+                    })();
             /**
              * 行车轨迹表格
@@ -575,7 +404,8 @@
                             if (i > 0 && array[array.length - 1].road.road_CODE == gps.road.road_CODE)
                                 array.pop();
                         }
-                        catch (e) {}
+                        catch (e) {
+                        }
                         if (gps.road)
                             array.push(gps);
@@ -589,6 +419,141 @@
                     showInitData: showInitData
                 };
             })();
+
+            /**
+             * 到离站信息表格
+             * @type {{}}
+             */
+            var inOutStationTableObj = (function () {
+
+                var data, f, prev;
+                var showInitData = function (list) {
+                    clear();
+                    data = [];
+
+                    $.each(list, function (i, gps) {
+
+                        prev = data[data.length - 1];
+                        if (gps['inout_stop'] == -1)
+                            return true;
+
+                        if (gps['inout_stop'] == 0) {
+                            //连续进站信号，取第一个
+                            if(prev && prev['out_ts'] == null
+                                && prev['stopName'] == gps['inout_stop_info'].stopName){
+                                return true;
+                            }
+                            data.push(createIn(gps));
+                        }
+                        else if (gps['inout_stop'] == 1) {
+                            f = matchOut(prev, gps);
+                            if(f)
+                                data.push(f);
+                        }
+                    });
+
+                    //格式化时间
+                    $.each(data, function () {
+                        if (this.in_ts)
+                            this.in_time_str = moment(this.in_ts).format('HH:mm.ss');
+                        if (this.out_ts)
+                            this.out_time_str = moment(this.out_ts).format('HH:mm.ss');
+                    });
+
+                    var htmlStr = template('multi_inout_info_cont_temp', {list: data});
+                    $('.inout_table_wrap .ct_table_body', modal).html(htmlStr);
+                };
+
+                var add = function (gps) {
+
+                };
+
+                var clear = function () {
+
+                };
+
+                var createIn = function (gps) {
+                    var info = gps['inout_stop_info'];
+                    return {
+                        in_ts: info.ts,
+                        stopNo: info.stopNo,
+                        stopName: info.stopName
+                    }
+                };
+
+
+                var matchOut = function (prevInfo, gps) {
+                    var oi = gps['inout_stop_info'];
+                    if(prevInfo && prevInfo.stopName == oi.stopName){
+                        prevInfo['out_ts'] = oi.ts;
+                        return null;
+                    }
+                    else {
+                        return {
+                            out_ts: oi.ts,
+                            stopNo: oi.stopNo,
+                            stopName: oi.stopName
+                        }
+                    }
+                };
+
+                return {
+                    showInitData: showInitData
+                };
+            })();
+
+            /**
+             * 异常信息表格
+             * @type {{showInitData}}
+             */
+            var abnormalTableObj = (function () {
+
+                var showInitData = function () {
+                    var array = [];
+                    for(var i = 0; i < arguments.length; i ++){
+                        array = array.concat(arguments[i]);
+                    }
+                    //格式化时间
+                    $.each(array, function () {
+                       if(this.st)
+                           this.st_str = moment(this.st).format('HH:mm.ss');
+                        if(this.et)
+                            this.et_str = moment(this.et).format('HH:mm.ss');
+                    });
+
+                    var htmlStr = template('abnormal_table_cont_temp', {array: array});
+                    $('.abnormal_table .ct_table_body', modal).html(htmlStr);
+                };
+
+                return {
+                    showInitData: showInitData
+                }
+            })();
+
+            /**
+             * 工具条相关
+             */
+            var mapTools = (function () {
+
+                $('.map-wrap-tools .play_btn', modal).on('click', function () {
+                    if($(this).hasClass('play')){
+                        //暂停
+                        $(this).removeClass('play');
+                    }
+                    else {
+                        //播放
+                        $(this).addClass('play');
+                    }
+                });
+
+                var show = function () {
+                    $('.map-wrap-tools').show();
+                };
+
+                return {
+                    show: show
+                }
+            })();
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -3,7 +3,7 @@
 var gb_map_play_back = (function () {
     var dom;
-    $.get('/real_control_v2/mapmonitor/fragments/playback/main.html', function (rs) {
+    $.get('/real_control_v2/mapmonitor/fragments/playback_v2/main.html', function (rs) {
         dom = rs;
     });
@@ -13,10 +13,11 @@ var gb_map_play_back = (function () {
             gb_map_imap.call('closeWin', deviceId);
         //show modal
-        var modal = '#map-playback-modal';
-        $(document.body).append(dom);
-        UIkit.modal(modal, {bgclose: false}).show();
-        $(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
+        open_modal_dom(dom, {deviceId: deviceId, nbbm: nbbm});
+        //var modal = '#map-playback2-modal';
+        //$(document.body).append(dom);
+        //UIkit.modal(modal, {bgclose: false}).show();
+        //$(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
     };
     //导出excel