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 2ced7989 a0469a02
Showing 34 changed files with 2313 additions and 694 deletions
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/repository/SectionRepository.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/StationRouteService.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/HistoryGps_DTO.java
src/main/java/com/bsth/service/gps/entity/Road_DTO.java
src/main/java/com/bsth/service/impl/SectionRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/base/stationroute/editsection.html
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
@@ -72,4 +72,14 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return routeService.findUpSectionRouteCode(map);
 	}
+	
+	/**
+	 * @Description :TODO(引用路段)
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@RequestMapping(value = "/quoteSection" , method = RequestMethod.POST)
+	public Map<String, Object> quoteSection(@RequestParam Map<String, Object> map) {
+		return routeService.quoteSection(map);
+	}
 }
@@ -127,8 +127,17 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
      */
     @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
     public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
-    	
     	return service.findByMultiLine(lineIds);
     }
+    /**
+     * 
+     * @Title: updSwitchDir 
+     * @Description: TODO(上下行切换) 
+     */
+    @RequestMapping(value = "/updSwitchDir", method = RequestMethod.POST)
+    public Map<String, Object> updSwitchDir(@RequestParam String lineIds){
+    	return service.updSwitchDir(lineIds);
+    }
+	
 }
@@ -96,4 +96,16 @@ public class GpsController {
     public Map<String, Object> gpsCompletion(@RequestParam long schId) {
         return gpsService.gpsCompletion(schId);
     }
+
+    /**
+     * 历史GPS查询 ，第二版轨迹回放用
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v2/{nbbm}")
+    public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
+        return gpsService.history_v2(nbbm, st, et);
+    }
 }
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.entity.Line;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 @RestController
 @RequestMapping("/basic")
@@ -126,4 +126,23 @@ public class BasicDataController {
 	public Map<String, String> nbbm2PlateNo(){
 		return basicData.getNbbm2PlateNo();
 	}
+
+
+	/**
+	 * 获取线路配车信息
+	 * @return
+	 */
+	@RequestMapping("/ccInfo")
+	public Map<String, Collection<String>> ccInfo(){
+
+		ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
+		Set<String> ks = BasicData.nbbm2LineMap.keySet();
+
+		Line line;
+		for(String nbbm : ks){
+			line = BasicData.nbbm2LineMap.get(nbbm);
+			listMultimap.put(line.getLineCode(), nbbm);
+		}
+		return listMultimap.asMap();
+	}
 }
@@ -113,5 +113,4 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 							  Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate,
 							  Integer updateBy,String updateDate);
-	
 }
@@ -28,6 +28,14 @@ import com.bsth.entity.SectionRoute;
 @Repository
 public interface SectionRouteRepository extends BaseRepository<SectionRoute, Integer> {
+	// 查询最大ID
+	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_sectionroute) k" , nativeQuery=true)
+	public long sectionRouteMaxId();
+	
+	// 查询最大ID
+	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(sectionroute_code) as num FROM bsth_c_sectionroute where line_code = 601010 and directions = 1 and destroy = 0) k" , nativeQuery=true)
+	public int sectionRouteCodeMaxId();
+	
 	/**
 	 * @Description :TODO(查询路段信息)
 	 * 
@@ -162,4 +170,8 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
     @Modifying 
 	@Query(value="UPDATE bsth_c_sectionroute set is_roade_speed = ?1  where line= ?2 and directions=?3 ",nativeQuery = true)
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
+	
+    @Modifying
+    @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
+	public void sectionRouteDir(Integer line);
 }
@@ -268,4 +268,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
 	List<Object[]> findAllLineWithYgc();
+	
+    @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);
 }
@@ -41,4 +41,6 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	 * @return List<Map<String, Object>> 
 	 */
 	 List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map);
+	 
+	 Map<String, Object> quoteSection(Map<String, Object> map);
 }
@@ -79,5 +79,7 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  */
 	 List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map);
-	Map<String, Object> findByMultiLine(String lineIds);
+	 Map<String, Object> findByMultiLine(String lineIds);
+	 
+	 Map<String, Object> updSwitchDir(String lineIds);
 }
@@ -18,4 +18,6 @@ public interface GpsService {
     Map<String,Object> findRoadSpeed(String lineCode);
     Map<String,Object> gpsCompletion(long schId);
+
+	Map<String,Object> history_v2(String nbbm, long st, long et);
 }
@@ -5,11 +5,14 @@ import com.bsth.data.BasicData;
 import com.bsth.data.arrival.ArrivalEntity;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.data.schedule.DayOfSchedule;
 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.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
@@ -235,6 +238,9 @@ public class GpsServiceImpl implements GpsService {
                 bdLoc = TransGPS.bd_encrypt(gdLoc);
                 map.put("bd_lon", bdLoc.getLng());
                 map.put("bd_lat", bdLoc.getLat());
+                //原始坐标
+                map.put("lon", lon);
+                map.put("lat", lat);
                 map.put("deviceId", rs.getString("DEVICE_ID"));
                 map.put("ts", rs.getLong("TS"));
@@ -510,6 +516,49 @@ public class GpsServiceImpl implements GpsService {
         return rs;
     }
+    @Override
+    public Map<String, Object> history_v2(String nbbm, long st, long et) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            //获取历史gps 数据
+            List<HistoryGps_DTO> list = HistoryGps_DTO.craete(history(new String[]{nbbm}, st, et));
+            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){
+                    matchRoadToGps(gps, roads);
+                }
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        }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;
+        Road_DTO nearRoad = null;
+        for(Road_DTO road : roads){
+            distance = GeoUtils.getDistanceFromLine(road.getLineStr(), gps.getPoint());
+
+            if (min > distance || min == -1) {
+                min = distance;
+                nearRoad = road;
+            }
+        }
+
+        gps.setRoad(nearRoad);
+        gps.setRoadMinDistance(min);
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.arrival.ArrivalEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 历史GPS DTO
+ * Created by panzhao on 2017/4/5.
+ */
+public class HistoryGps_DTO {
+
+    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){
+            point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+            gps.setPoint(point);
+        }
+        return list;
+    }
+
+    private double gcj_lon;
+    private double gcj_lat;
+
+    private double bd_lon;
+    private double bd_lat;
+
+    private double lon;
+    private double lat;
+
+    private String deviceId;
+    private long ts;
+    private long timestamp;
+    private String stopNo;
+    private float direction;
+
+    private String lineId;
+    private float speed;
+    private ArrivalEntity inout_stop_info;
+    private int inout_stop;
+
+    private String nbbm;
+    private int state;
+    private int upDown;
+
+    @JsonIgnore
+    private Point point;
+
+    /** 路段 */
+    private Road_DTO road;
+    /** 和路段的最短距离 */
+    private double roadMinDistance;
+
+    public double getGcj_lon() {
+        return gcj_lon;
+    }
+
+    public void setGcj_lon(double gcj_lon) {
+        this.gcj_lon = gcj_lon;
+    }
+
+    public double getGcj_lat() {
+        return gcj_lat;
+    }
+
+    public void setGcj_lat(double gcj_lat) {
+        this.gcj_lat = gcj_lat;
+    }
+
+    public double getBd_lon() {
+        return bd_lon;
+    }
+
+    public void setBd_lon(double bd_lon) {
+        this.bd_lon = bd_lon;
+    }
+
+    public double getBd_lat() {
+        return bd_lat;
+    }
+
+    public void setBd_lat(double bd_lat) {
+        this.bd_lat = bd_lat;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public float getDirection() {
+        return direction;
+    }
+
+    public void setDirection(float direction) {
+        this.direction = direction;
+    }
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public ArrivalEntity getInout_stop_info() {
+        return inout_stop_info;
+    }
+
+    public void setInout_stop_info(ArrivalEntity inout_stop_info) {
+        this.inout_stop_info = inout_stop_info;
+    }
+
+    public int getInout_stop() {
+        return inout_stop;
+    }
+
+    public void setInout_stop(int inout_stop) {
+        this.inout_stop = inout_stop;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public Road_DTO getRoad() {
+        return road;
+    }
+
+    public void setRoad(Road_DTO road) {
+        this.road = road;
+    }
+
+    public double getRoadMinDistance() {
+        return roadMinDistance;
+    }
+
+    public void setRoadMinDistance(double roadMinDistance) {
+        this.roadMinDistance = roadMinDistance;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 路段信息DTO
+ * Created by panzhao on 2017/4/5.
+ */
+public class Road_DTO {
+
+    public static List<Road_DTO> craete(List<Map<String, Object>> mapList){
+        List<Road_DTO> list = JSONObject.parseArray(JSON.toJSONString(mapList), Road_DTO.class);
+        //处理路段坐标
+        String polygonStr;
+        String[] coords;
+        int i, len;
+        String[] temps;//1, temps2;
+        List<Coordinate> cds;
+
+        GeometryFactory geometryFactory = new GeometryFactory();
+        for(Road_DTO road : list){
+            polygonStr = road.getGROAD_VECTOR();
+            coords = polygonStr.substring(11, polygonStr.length() - 1).split(",");
+            len = coords.length;
+
+            cds = new ArrayList<>();
+            //每2个点连一条线
+            for(i = 0; i < len; i ++){
+                temps = coords[i].split(" ");
+                cds.add(new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0])));
+            }
+
+            Coordinate[] cdsArray = new Coordinate[cds.size()];
+            road.setLineStr(geometryFactory.createLineString(cds.toArray(cdsArray)));
+        }
+        return list;
+    }
+
+    private long ID;
+
+    @JsonIgnore
+    private String GROAD_VECTOR;
+
+    private String ROAD_CODE;
+
+    private String ROAD_NAME;
+
+    private double SPEED;
+
+    @JsonIgnore
+    private LineString lineStr;
+
+    public long getID() {
+        return ID;
+    }
+
+    public void setID(long ID) {
+        this.ID = ID;
+    }
+
+    public String getGROAD_VECTOR() {
+        return GROAD_VECTOR;
+    }
+
+    public void setGROAD_VECTOR(String GROAD_VECTOR) {
+        this.GROAD_VECTOR = GROAD_VECTOR;
+    }
+
+    public String getROAD_CODE() {
+        return ROAD_CODE;
+    }
+
+    public void setROAD_CODE(String ROAD_CODE) {
+        this.ROAD_CODE = ROAD_CODE;
+    }
+
+    public String getROAD_NAME() {
+        return ROAD_NAME;
+    }
+
+    public void setROAD_NAME(String ROAD_NAME) {
+        this.ROAD_NAME = ROAD_NAME;
+    }
+
+    public double getSPEED() {
+        return SPEED;
+    }
+
+    public void setSPEED(double SPEED) {
+        this.SPEED = SPEED;
+    }
+
+    public LineString getLineStr() {
+        return lineStr;
+    }
+
+    public void setLineStr(LineString lineStr) {
+        this.lineStr = lineStr;
+    }
+}
@@ -8,7 +8,12 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Line;
+import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.service.SectionRouteService;
@@ -34,6 +39,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	@Autowired
 	SectionRouteRepository repository;
+	@Autowired
+	SectionRepository repository2; 
+	
+	@Autowired
+	LineRepository lineRepository;
+	
 	/**
 	 * @Description :TODO(查询路段信息)
 	 * 
@@ -43,21 +54,13 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	 */
 	@Override
 	public List<Map<String, Object>> getSectionRoute(Map<String, Object> map) {
-		
 		int lineId = map.get("line.id_eq").equals("") ? 0 : Integer.parseInt(map.get("line.id_eq").toString());
-		
 		int directions = map.get("directions_eq").equals("") ? 0 : Integer.parseInt(map.get("directions_eq").toString());
-		
 		List<Object[]> listObjArray = repository.getSectionRoute(lineId, directions);
-		
 		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); 
-		
 		if(listObjArray.size()>0) {
-			
 			for(int i = 0 ; i<listObjArray.size() ; i++){
-				
 				Map<String, Object> tempM = new HashMap<String, Object>();
-				
 				tempM.put("sectionrouteId",listObjArray.get(i)[0]);
 				tempM.put("sectionrouteLine",listObjArray.get(i)[1]);
 				tempM.put("sectionrouteLineCode",listObjArray.get(i)[2]);
@@ -81,12 +84,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 				tempM.put("sectionTime",listObjArray.get(i)[20]);
 				tempM.put("sectiondbType",listObjArray.get(i)[21]);
 				tempM.put("sectionSpeedLimet",listObjArray.get(i)[22]);
+				tempM.put("destroy",listObjArray.get(i)[23]);
+				tempM.put("versions",listObjArray.get(i)[24]);
+				tempM.put("descriptions",listObjArray.get(i)[25]);
 				resultList.add(tempM);
-				
 			}
-			
 		}
-		
 		return resultList;
 	}
@@ -228,5 +231,68 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		return list;
 	}
+
+	@Override
+	public Map<String, Object> quoteSection(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			Integer line = map.get("lineId") ==null ? null : Integer.parseInt(map.get("lineId").toString());
+			Integer dir = map.get("dir")==null ? null : Integer.parseInt(map.get("dir").toString());
+			Integer toDir = map.get("toDir")==null ? null : Integer.parseInt(map.get("toDir").toString());
+			if(line!=null && dir!=null) {
+				List<Object[]> list = repository.getSectionRoute(line, dir);
+				int src = repository.sectionRouteCodeMaxId();
+				for(int i = 0 ; i<list.size() ; i++) {
+					int sectionId =  Integer.parseInt(String.valueOf(repository2.sectionMaxId())) + 1 ;
+					String sectionCode =  String.valueOf(sectionId);
+					String sectionName = list.get(i)[9] == null ? null : list.get(i)[9].toString(); 
+					String crosesRoad = list.get(i)[10] == null ? null : list.get(i)[10].toString(); 
+					String endNode = list.get(i)[11] == null ? null : list.get(i)[11].toString(); 
+					String startNode = list.get(i)[12] == null ? null : list.get(i)[12].toString(); 
+					String middleNode = list.get(i)[13] == null ? null : list.get(i)[13].toString(); 
+					String sectionType = list.get(i)[14] == null ? null : list.get(i)[14].toString();
+					String csectionVector = list.get(i)[15] == null ? null : list.get(i)[15].toString();
+					String bsectionVector = list.get(i)[16] == null ? null : list.get(i)[16].toString();
+					String gsectionVector = list.get(i)[17] == null ? null : list.get(i)[17].toString();
+					String roadCoding = list.get(i)[18] == null ? null : list.get(i)[18].toString();
+					Double sectionDistance = list.get(i)[19] == null ? null : Double.parseDouble(list.get(i)[19].toString());
+					Double sectionTime = list.get(i)[20] == null ? null : Double.parseDouble(list.get(i)[20].toString());
+					String dbType = list.get(i)[21] == null ? null : list.get(i)[21].toString();
+					Double speedLimit = list.get(i)[22] == null ? null : Double.parseDouble(list.get(i)[22].toString());
+					Integer destroy = list.get(i)[23] == null ? null : Integer.parseInt(list.get(i)[23].toString());
+					Integer versions = list.get(i)[24] == null ? null : Integer.parseInt(list.get(i)[24].toString());
+					String descriptions = list.get(i)[25] == null ? null : list.get(i)[25].toString();
+					repository2.systemSave(sectionCode, 
+							sectionName, crosesRoad, endNode, startNode, middleNode, 
+							gsectionVector, bsectionVector, 
+							sectionType, csectionVector, roadCoding, 
+							sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
+					int sectionRouteId = Integer.parseInt(String.valueOf(repository.sectionRouteMaxId())) + 1 ;
+					SectionRoute sr = new SectionRoute();
+					Line lineObject = lineRepository.findOne(line);
+					Section section = repository2.findOne(sectionId);
+					Integer xh = (src ==  0 ? (toDir ==1? (list.size()-i)*10 : (list.size()+i)*10) : toDir==1? (src + (list.size()-i)*10) : (src + (list.size()+i)*10)) ;
+					sr.setId(sectionRouteId);
+					sr.setSectionrouteCode(xh);
+					sr.setLineCode(lineObject.getLineCode());
+					sr.setSectionCode(sectionCode);
+					sr.setDirections(toDir);
+					sr.setVersions(versions);
+					sr.setDestroy(destroy);
+					sr.setLine(lineObject);
+					sr.setSection(section);
+					sr.setSectionCode(section.getSectionCode());
+					sr.setDescriptions(descriptions);
+					sr.setIsRoadeSpeed(1);
+					repository.save(sr);
+				}
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
 }
@@ -17,6 +17,7 @@ import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -1080,4 +1081,23 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return rs;
 	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> updSwitchDir(String lineIds) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			if(lineIds!=null && lineIds !="") {
+				Integer lineId = Integer.parseInt(lineIds);
+				// 上行站点切换到下行.
+				repository.stationRouteDir(lineId);
+				routeRepository.sectionRouteDir(lineId);
+			}
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
@@ -3365,7 +3365,7 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <sql>select &#xa;t.id as id&#xa;, g.lp_name as lp&#xa;, g.xl as xl&#xa;, qdz&#xa;, zdz&#xa;, tcc&#xa;, fcsj&#xa;, jhlc&#xa;, bc_type &#xa;, bcs&#xa;, fcno&#xa;, xl_dir&#xa;, isfb&#xa;from bsth_c_s_ttinfo_detail t left join &#xa;bsth_c_s_gbi g on t.lp &#x3d; g.id &#xa;where &#xa;g.xl &#x3d; &#x3f; and&#xa;t.ttinfo &#x3d; &#x3f; &#xa;order by t.bcs asc</sql>
+    <sql>select &#xa;t.id as id&#xa;, concat&#x28;g.id, &#x27;_&#x27;, g.lp_name&#x29; as lp&#xa;, g.xl as xl&#xa;, qdz&#xa;, zdz&#xa;, tcc&#xa;, fcsj&#xa;, jhlc&#xa;, bc_type &#xa;, bcs&#xa;, fcno&#xa;, xl_dir&#xa;, isfb&#xa;from bsth_c_s_ttinfo_detail t left join &#xa;bsth_c_s_gbi g on t.lp &#x3d; g.id &#xa;where &#xa;g.xl &#x3d; &#x3f; and&#xa;t.ttinfo &#x3d; &#x3f; &#xa;order by t.bcs asc</sql>
     <limit>0</limit>
     <lookup>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</lookup>
     <execute_each_row>N</execute_each_row>
@@ -196,7 +196,7 @@ tr.row-active td {
 			<!-- LOGO -->
 			<div class="page-logo">
 				<a href="index.html" class="logo-default logo-default-text">
-					浦东公交调度系统 </a>
+					闵行公交调度系统 </a>
 				<div class="menu-toggler sidebar-toggler"></div>
 			</div>
 			<!-- END LOGO -->
@@ -181,7 +181,7 @@
 	<div class="wrapper ng-scope">
 		<div id="loginPanel" class="dialog dialog-shadow">
 			<br>
-			<h3 class="logo-text">浦东公交调度系统</h3>
+			<h3 class="logo-text">闵行公交调度系统</h3>
 			<hr>
 			<form style="padding: 0px 35px;">
 				<div class="form-group" style="margin-bottom: 0">
 <!-- 编辑路段 -->
 <div class="modal fade" id="edit_section_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" role="form" id="edit_section__form" action="/module" method="post">
-				
 					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
 						您的输入有误，请检查下面的输入项
 					</div>
-					
 					<!-- 线路ID -->
-					
 					<input type="hidden" name="sectionId" id="sectionIdInput">
-					
 					<input type="hidden" name="sectionRouteId" id="sectionRouteIdInput">
-					
 					<input type="hidden" name="sectionRouteLine" id="sectionRouteLineInput">
-					
 					<input type="hidden" name="lineCode" id="lineCodeInput">
-					
 					<input type="hidden" name="bsectionVector" id="bsectionVectorInput" />
-					
 					<input type="hidden" name="csectionVector" id="csectionVectorInput" value=""/>
-					
 					<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
-					
 					<!-- 路段名称 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -45,7 +30,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 路段编码 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -57,7 +41,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 路段序号 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -70,24 +53,6 @@
 							</div>
 						</div>
 					</div>
-					
-					<!-- 路段类型 -->
-					<!-- <div class="form-body">
-						<div class="form-group">
-							<label class="control-label col-md-3">
-          						<span class="required"> * </span>路段类型：
-                    		</label>
-							<div class="col-md-6">
-								<select name="sectionType" class="form-control" id="sectionTypeSelect">
-									<option value="">-- 请选择路段类型 --</option>
-									<option value="B">起点站</option>
-									<option value="Z">中途站</option>
-									<option value="E">终点站</option>
-								</select>
-							</div>
-						</div>
-					</div> -->
-					
 					<!-- 路段方向 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -103,7 +68,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 道路编码-->
 					<div class="form-body">
 						<div class="form-group">
@@ -113,7 +77,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 路段限速 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -125,7 +88,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 路段时长 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -136,7 +98,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 路段长度 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -147,7 +108,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 版本号 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -157,7 +117,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 范围图形类型 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -171,7 +130,6 @@
 							</div>
 						</div>
 					</div>
-					
 					<!-- 描述/说明 -->
 	                <div class="form-group">
 	                	<label class="control-label col-md-3"> 描述/说明： </label>
@@ -191,99 +149,56 @@
 <script type="text/javascript">
 $('#edit_section_mobal').on('editSectionMobal_show', function(e, map_,ajaxd,section,fun){
- 
 	var Section = section.getEitdSection();
-	
 	fun.setSectionFormValue(Section);
-	
 	// 方向
 	var dir = Section.sectionrouteDirections;
-	
 	var lineId = Section.sectionrouteLine;
-	
 	// 获取路段号元素，并添加下拉属性值
 	ajaxd.getStation(lineId,dir,function(treeData) {
-		
 		var options = '<option value="">请选择...</option>';
-		
 		var dArray = treeData[0].children[1].children;	
-		
 		var eq_stationRouteCode =  Section.sectionrouteCode;
-		
 		for(var i = 0 ; i<dArray.length; i++){
-			
 			var ptions_v = dArray[i].sectionrouteCode;
-			
 			// 排除本站
-			if(eq_stationRouteCode == ptions_v){
-				
+			if(eq_stationRouteCode == ptions_v)
 				continue;
-				
-			}
-			
 			options += '<option value="'+ ptions_v +'">'+dArray[i].sectionName+'</option>'
-			
 		}
-	 
 		$('#sectionrouteCodeSelect').html(options);
-		
 		ajaxd.findUpSectionRouteCode(lineId,dir,eq_stationRouteCode,function(str) {
-			
 			if(str.length>0){
-				
 				var upStationRouteCode = str[0].sectionrouteCode
-				
 				$('#sectionrouteCodeSelect').val(upStationRouteCode);
-				
 			}
-			
 		});
-		
 	});
-	
 	// 显示mobal
 	$('#edit_section_mobal').modal({show : true,backdrop: 'static',keyboard: false});
-	
 	// 当调用 hide 实例方法时触发
 	$('#edit_section_mobal').on('hide.bs.modal', function () {
-		
 		closeMobleSetClean();
-		
 	});
-	
 	function closeMobleSetClean() {
-		
 		// 清除地图覆盖物
 		map_.clearMarkAndOverlays();
-		
 		/** 设置修改路段集合对象为空 */
 		section.setEitdSection({});
-		
 		fun.resjtreeDate(lineId,dir);
-		
 		fun.editAChangeCssRemoveDisabled();
-		
 		ajaxd.getSectionRouteInfo(lineId,dir,function(data) {
-			
 			fun.linePanlThree(lineId,data,dir);
-			
 		});
-		
 	}
-	
 	// 编辑表单元素
 	var form = $('#edit_section__form');
-	
 	// 获取错误提示元素
 	var error = $('.alert-danger', form);
-	
 	// 提交数据按钮事件
 	$('#editSectionButton').on('click', function() {
-		
-		
 		// 表单提交
 		form.submit();
-		
 	});
 	// 表单验证
@@ -392,42 +307,23 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 		},
 		submitHandler : function(f) {
-			
 			var params = form.serializeJSON();
-			
 			error.hide();
-			
-			console.log(params);
-			
 			ajaxd.sectionUpdate(params,function(resuntDate) {
-				
 				if(resuntDate.status=='SUCCESS') {
-					
 					// 弹出添加成功提示消息
 					layer.msg('修改成功...');
-					
-					
 				}else {
-					
 					// 弹出添加失败提示消息
 					layer.msg('修改失败...');
-					
 				}
-
 				$('#edit_section_mobal').modal('hide');
-				
 				var dir = params.directions
-				
 				// 刷行左边树
 				fun.resjtreeDate(lineId,dir);
-				
 				closeMobleSetClean();
-				
 			});
-			
 		}
 	});
-	
-	
 });
 </script>
 \ No newline at end of file
@@ -169,13 +169,9 @@ var GetAjaxData = function(){
 			// 查询路段信息
 			getSectionRouteInfo : function(lineId,direction,callback) {
-				
 				$get('/sectionroute/findSection',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
-					
 					callback && callback(resultdata);
-							
 				});
-				
 			},
 			// 手动规划线路保存
@@ -22,199 +22,222 @@ $(function(){
 	// 上行站点其它规划点击事件
 	$('.upManual').on('click',function() {
-		
 		// 加载其它规划选择弹出层mobal页面
 		$.get('add_manual_select.html', function(m){
-			
 			$(pjaxContainer).append(m);
-			
 			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
-			
 		});
 	});
 	// 上行站点新增事件
 	$('.module_tools #addUpStation').on('click', function() {
-		
 		/** 设置新增站点对象方向属性值 @param：<directionUpValue：方向（0：上行；1：下行）> */
 		AddStationObj.setAddStationDiraction(directionUpValue);
-		
 		// 加载选择新增方式mobal
 		$.get('add_select.html', function(m){
-			
 			$(pjaxContainer).append(m);
-			
 			$('#add_select_mobal').trigger('AddSelectMobal.show', [WorldsBMap,DrawingManagerObj,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
-		
 		});
-		
 	});
 	// 修改上行站点mobal页面
 	$('.module_tools #editUpStation').on('click', function(){
-		
 		var sel = PublicFunctions.getCurrSelNode(directionUpValue);
-		
 		if(sel.length==0 || sel[0].original.chaildredType !='station'){
-			
 			layer.msg('请先选择要编辑的上行站点！');
-			
 			return;
 		}
-		
 		$.get('edit_select.html', function(m){
-			
 			$(pjaxContainer).append(m);
-			
 			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionUpValue]);
 		});
-		
 	});
 	// 撤销上行站点
 	$('.module_tools #deleteUpStation').on('click', function() {
-		
 		PublicFunctions.stationRevoke(directionUpValue);
-	 
 	});
-	// 编辑线路上行走向
-	$('.module_tools #editUplineTrend').on('click', function() {
-		
-		PublicFunctions.editLinePlan(directionUpValue);
-		
+	// 切换上下行.
+	$('.retweet').on('click',function() {
+		layer.confirm('您是否确定将【上、下】行站点和路段进行对换!', {
+			btn : [ '确认提示并提交', '取消' ]
+		},function () {
+			// 关闭所有提示弹出层.
+			layer.closeAll();
+			// 弹出提示层.
+    		var index = layer.load(1, {
+    			  shade: [0.1,'#fff'] // 透明度的白色背景
+    		});
+    		 var Line = LineObj.getLineObj();
+    		$post('/stationroute/updSwitchDir?lineIds='+ Line.id,null,function(data) {
+    			layer.close(index);
+    			if(data.status=='SUCCESS') {
+    				// 弹出添加成功提示消息
+    				layer.msg('操作成功...');
+    			}else {
+    				// 弹出添加失败提示消息
+    				layer.msg('操作成功...');
+    			}
+    			 WorldsBMap.clearMarkAndOverlays();
+				 // 刷新左边树
+				 PublicFunctions.resjtreeDate(Line.id,0);
+				 PublicFunctions.resjtreeDate(Line.id,1);
+				 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+				 GetAjaxData.getSectionRouteInfo(Line.id,0,function(data) {
+					/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+					PublicFunctions.linePanlThree(Line.id,data,0);
+				 });
+    		});
+		});
 	});
+	$('#quoteUp').on('click',function() {
+		// 弹出提示层.
+		var index = layer.load(1, {
+			  shade: [0.1,'#fff'] // 透明度的白色背景
+		});
+		 var Line = LineObj.getLineObj();
+		 var params = {'lineId':Line.id ,'dir':0,'toDir':1};
+		 quote(params,index);
+		/*$post('/sectionroute/quoteSection',{'lineId':Line.id ,'dir':0,'toDir':1} ,function(data) {
+			layer.close(index);
+			if(data.status=='SUCCESS') {
+				// 弹出添加成功提示消息
+				layer.msg('操作成功...');
+			}else {
+				// 弹出添加失败提示消息
+				layer.msg('操作成功...');
+			}
+			 WorldsBMap.clearMarkAndOverlays();
+			 // 刷新左边树
+			 PublicFunctions.resjtreeDate(Line.id,0);
+			 PublicFunctions.resjtreeDate(Line.id,1);
+			 *//** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 *//*
+			 GetAjaxData.getSectionRouteInfo(Line.id,0,function(data) {
+				*//** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> *//* 
+				PublicFunctions.linePanlThree(Line.id,data,0);
+			 });
+		});*/
+	});
+	
+	
+	$('#quoteDown').on('click',function() {
+		// 弹出提示层.
+		var index = layer.load(1, {
+			  shade: [0.1,'#fff'] // 透明度的白色背景
+		});
+		 var Line = LineObj.getLineObj();
+		 var params = {'lineId':Line.id ,'dir':1,'toDir':0} ;
+		 quote(params,index);
+	});
+	
+	function quote(params,index) {
+		$post('/sectionroute/quoteSection',params,function(data) {
+			layer.close(index);
+			if(data.status=='SUCCESS') {
+				// 弹出添加成功提示消息
+				layer.msg('操作成功...');
+			}else {
+				// 弹出添加失败提示消息
+				layer.msg('操作成功...');
+			}
+			 WorldsBMap.clearMarkAndOverlays();
+			 // 刷新左边树
+			 PublicFunctions.resjtreeDate(Line.id,0);
+			 PublicFunctions.resjtreeDate(Line.id,1);
+			 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+			 GetAjaxData.getSectionRouteInfo(Line.id,0,function(data) {
+				/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+				PublicFunctions.linePanlThree(Line.id,data,0);
+			 });
+		});
+	}
+	// 编辑线路上行走向
+	$('.module_tools #editUplineTrend').on('click', function() {PublicFunctions.editLinePlan(directionUpValue);});
+	
 	// 线路上行
 	$('#leftUpOrDown #upLine').on('click', function(){
-		
 		var lineIdEvents = LineObj.getLineObj();
-		
 		GetAjaxData.getSectionRouteInfo(lineIdEvents.id,directionUpValue,function(data) {
-			
 			PublicFunctions.linePanlThree(lineIdEvents.id,data,directionUpValue);
-			
 		});
-		
 	});
 	// 系统规划下行站点
 	$('.downSystem').on('click',function() {
-	
 		// 隐藏下行规划
 		$('#downToolsMobal').hide();
-		
 		// 弹出正在加载层
 		var i = layer.load(0,{offset:['200px', '280px']});
-		
 		/** 修正线路名称 @param：<directionUpValue：方向（上行）> */
 		PublicFunctions.lineNameIsHaveInterval(directionDownValue);
-		
 	});
 	// 下行站点其它规划点击事件
 	$('.downManual').on('click',function() {
-		
 		// 加载其它规划选择弹出层mobal页面
 		$.get('add_manual_select.html', function(m){
-			
 			$(pjaxContainer).append(m);
-			
 			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
-			
 		});
-		
 	});
 	// 下行站点新增事件
 	$('.module_tools #addDownStation').on('click', function() {
-		
 		/** 设置新增站点对象方向属性值 @param：<directionUpValue：方向（0：上行；1：下行）> */
 		AddStationObj.setAddStationDiraction(directionDownValue);
-		
 		// 加载选择新增方式mobal
 		$.get('add_select.html', function(m){
-			
 			$(pjaxContainer).append(m);
-			
 			$('#add_select_mobal').trigger('AddSelectMobal.show', [WorldsBMap,DrawingManagerObj,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
-		
 		});
-		
 	});	
 	// 修改下行站点mobal页面
 	$('.module_tools #editDownStation').on('click', function(){
-		
 		var sel = PublicFunctions.getCurrSelNode(directionDownValue);
-		
 		if(sel.length==0 || sel[0].original.chaildredType !='station'){
-			
 			layer.msg('请先选择要编辑的下行站点！');
-			
 			return;
 		}
-		
 		$.get('edit_select.html', function(m){
-			
 			$(pjaxContainer).append(m);
-			
 			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionDownValue]);
 		});
-		
 	});
 	// 撤销下行站点
 	$('.module_tools #deleteDownStation').on('click', function() {
-		
 		PublicFunctions.stationRevoke(directionDownValue);
-	 
 	});
 	// 编辑线路下行走向
 	$('.module_tools #editDownlineTrend').on('click', function() {
-		
 		PublicFunctions.editLinePlan(directionDownValue);
-		
 	});
 	// 线路下行
 	$('#leftUpOrDown #downLine').on('click', function(){
-		
 		var lineIdEvents = LineObj.getLineObj();
-		
 		GetAjaxData.getSectionRouteInfo(lineIdEvents.id,directionDownValue,function(data) {
-			
 			PublicFunctions.linePanlThree(lineIdEvents.id,data,directionDownValue);
-			
 		});
-		 
 	});
 	// 生成行单
 	$('.module_tools #createUsingSingle').on('click', function() {
-		
 		var lineIdEvents = LineObj.getLineObj();
-		
 		var params = {lineId:lineIdEvents.id};
-		
 		GetAjaxData.createUsingSingle(params,function(data) {
-			
 			if(data.status=='SUCCESS') {
-				
 				// 弹出添加成功提示消息
 				layer.msg('生成成功...');
-				
 			}else {
-				
 				// 弹出添加失败提示消息
 				layer.msg('生成失败...');
-				
 			}
-			
 		});
-		
 	});
-	
 });
 \ No newline at end of file
@@ -478,7 +478,6 @@ var PublicFunctions = function () {
 				$('#upLine').addClass('btn disabled');
 				var editSectionV = sel[0].original;
-				
 				EditSectionObj.setEitdSection(editSectionV);
 				// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
@@ -634,80 +633,53 @@ var PublicFunctions = function () {
 			/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
 			linePanlThree : function(lineId,data,direction) {
-				
 				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
 				GetAjaxData.getStationRoutePoint(lineId,direction,function(resultdata) {
-					
 					WorldsBMap.clearMarkAndOverlays();
-					
 					var polyline_center;
-					
 					// 如果站点路由数据不为空
 					if(resultdata.length>0) {
-			  			
 						var ceter_index = Math.round(resultdata.length / 2);
-				  		
 				  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
-				  		
 				  		var ceterPointsArray = ceterPointsStr.split(' ');
-		  				
 		  				polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);
-						
 						// 遍历站点路由数据
 			  			for(var s = 0 ; s<resultdata.length;s++) {
-			  				
 			  				// 中心点坐标字符串
 			  				var bJwpointsStr = resultdata[s].bJwpoints;
-			  				
 			  				var stationName = resultdata[s].stationName;
-			  				
 			  				// 起个中心点坐标字符串
 			  				var bJwpointsArray = bJwpointsStr.split(' ');
-			  				
 			  				// 设置中心点
 			  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
-			  				
 			  				/** 在地图上画点 @param：<point_center：中心坐标点> */
 			  				WorldsBMap.drawingUpStationPoint(point_center,stationName,s+1);
-			  				
 			  			}
 			  		}
-					
 					// 路段数据长度
 					var dataLen = data.length;
 					//debugger;
 					// 如果大于零
 					if(dataLen>0) {
-						
 						// 编辑路段数据
 						for(var d= 0; d<dataLen;d++){
-							
 							// 地图折线坐标点集合
 							var polylineArray = [];
-							
 							// 获取路段折线坐标字符串
 							var sectionBsectionVectorStr = data[d].sectionBsectionVector;
-							
-							if(sectionBsectionVectorStr==null) {
-								
+							if(sectionBsectionVectorStr==null) 
 								continue;
-								
-							}
-							
 							// 切割段折线坐标字符串
 							var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
-							
 							// 分割折线坐标字符串
 							var lineArray = tempStr.split(',');
-							
 							for(var i = 0;i<lineArray.length;i++) {
-								
 								polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
-								
 							}
 							/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
-							WorldsBMap.drawingUpline(polylineArray,polyline_center);
+							/*WorldsBMap.drawingUpline(polylineArray,polyline_center,data[d]);*/
+							WorldsBMap.drawingUpline01(polylineArray,polyline_center,data[d]);
 						}
 					}
@@ -748,48 +720,27 @@ var PublicFunctions = function () {
 					// 下行	
 					}else if(diraction ==1) {
-						
 						/** 出事画下行树 @param：<treeDateJson：树数据结构> */
 						StationTreeData.downInit(treeDateJson);
-						
 						if(len>0) {
-							
 							$('#downToolsMobal').hide();
-							
 							$('#DowntreeMobal').show();
-							
 						}else {
-							
 							$('#downToolsMobal').show();
-							
 							$('#DowntreeMobal').hide();
-							
 						}
-						
 					}
-					
 				});
-				
 			},
-			
 			isHaveStationName : function(data) {
-				
 				if(data.length>0) {
-
 					layer.confirm('系统已存在【'+ data[0].stationName +'】该站点位置名称，请选择【系统引用】或者更改站点名称进行新增!', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
-						
 						layer.close(index);
-						
 					});
-					
 					return false;
-					
 				}else {
-					
 					return true;
-					
 				}
-				
 			},
 			editAChangeCssRemoveDisabled : function() {
@@ -25,7 +25,7 @@
 var WorldsBMap = function () {
 	/** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆 */
-	var mapBValue = '';polygon='',polyUpline='',circle='';
+	var mapBValue = '';polygon='',polyUpline='',circle='',iseditStatus = false;
 	var Bmap = {
@@ -80,6 +80,14 @@ var WorldsBMap = function () {
 				return circle;
 			},
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},
+			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+			
 			initDrawingManager: function(map,styleOptions) {
 			},
@@ -339,40 +347,26 @@ var WorldsBMap = function () {
 			},
 			editPolyUpline : function() {
-				
 				// 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
 				polyUpline.disableMassClear();
-				
 				WorldsBMap.clearMarkAndOverlays();
-				
 				// 允许覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
 				polyUpline.enableMassClear();
-				
 				//  开启线路编辑
 				polyUpline.enableEditing();
-				
 				// 添加双击折线保存事件
 				polyUpline.addEventListener('dblclick',function(e) {
-					
 					// 关闭
 					layer.closeAll();
-					
 					polyUpline.disableEditing();
-					
 					// 获取折线坐标集合
 					var editPloyLineArray = polyUpline.getPath();
-					
 					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					
 					polyUpline= '';
-					
 					// 加载修改路段弹出层mobal页面
 					$.get('editsection.html', function(m){
-						
 						$(pjaxContainer).append(m);
-						
 						$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PublicFunctions]);
-						
 					});
 				});
 			},
@@ -651,17 +645,14 @@ var WorldsBMap = function () {
 			},
 			// 在地图上画出上行线路走向
-			drawingUpline : function (polylineArray,polyline_center) {
-				
+			drawingUpline : function (polylineArray,polyline_center,data) {
 				/*WorldsBMap.clearMarkAndOverlays();*/
 				polyUpline = '';
-				
 				// 创建线路走向
 				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-		  		
+				// polyUpline.data = data;
 				// 把折线添加到地图上
 				mapBValue.addOverlay(polyUpline);
-		  		
 		  		/*var ceter_index = Math.round(resultdata.length / 2);
 		  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
@@ -669,17 +660,52 @@ var WorldsBMap = function () {
 		  		var ceterPointsArray = ceterPointsStr.split(' ');
   				var polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);*/
-		  		
 		  		var PanOptions_ ={noAnimation :true};
-	  	  		
 		  		mapBValue.reset();
-		  		
 		  		mapBValue.panTo(polyline_center,PanOptions_);
-	  	  		
 		  		mapBValue.panBy(500,-510,PanOptions_);
-	  	  		
 		  		mapBValue.setZoom(14);
-				
+			},
+			
+			
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				polyUpline01.addEventListener('click',function(e) {
+					if(WorldsBMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					WorldsBMap.setIsEditStatus(true);
+				});
+				// 添加双击折线保存事件
+				polyUpline01.addEventListener('dblclick',function(e) {
+					WorldsBMap.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					// polyUpline= '';
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
 			},
 			/** 在地图上画点 @param：<point_center：中心坐标点> */
@@ -7,38 +7,18 @@
 $(function(){
 	// 关闭左侧栏
-	if (!$('body').hasClass('page-sidebar-closed')) {
-		
-		$('.menu-toggler.sidebar-toggler').click();
-		
-	}
-	
+	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
 	// 获取参数线路ID
 	var id = $.url().param('no');
-	
 	// 如果线路ID不为空
 	if(id) {
-		
 		var styleOptions = {
-				
-				//边线颜色。
-				strokeColor : "blue",
-				
-				//填充颜色。当参数为空时，圆形将没有填充效果。
-				fillColor : "blue",
-				
-				//边线的宽度，以像素为单位。
-				strokeWeight : 3,
-				
-				//边线透明度，取值范围0 - 1。
-				strokeOpacity : 0.8,
-				
-				//填充的透明度，取值范围0 - 1。
-				fillOpacity : 0.6,
-				
-				//边线的样式，solid或dashed。
-				strokeStyle : 'solid' 
-					
+				strokeColor : "blue",//边线颜色。
+				fillColor : "blue",//填充颜色。当参数为空时，圆形将没有填充效果。
+				strokeWeight : 3,//边线的宽度，以像素为单位。
+				strokeOpacity : 0.8,//边线透明度，取值范围0 - 1。
+				fillOpacity : 0.6,//填充的透明度，取值范围0 - 1。
+				strokeStyle : 'solid' //边线的样式，solid或dashed。
 		};
 		// 等候500毫秒执行
 <link href="/pages/base/stationroute/css/bmap_base.css" rel="stylesheet" type="text/css" />
-
 <div class="portlet-body">
-
 	<!-- 地图 -->
 	<div id="bmap_basic" class="bmaps"></div>
-	
-	
 	<div class="portlet box protlet-box" style="top:20px">
-	
 		<!-- 左边标题栏 -->
 		<div class="portlet-title" style="background-color:#3B3F51">
 			<div class="caption">
@@ -17,13 +12,9 @@
 				<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
 			</div>
 		</div>
-		
-		
 		<!-- 左边栏 -->
 		<div class="portlet-body" style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 200px;">
-			
 			<div class="row">
-			
 				<!-- 上下行栏 -->
 				<div class="col-md-3 col-sm-3 col-xs-3">
 					<ul class="nav nav-tabs tabs-left" id="leftUpOrDown">
@@ -35,13 +26,10 @@
 	                    </li>
 	                </ul>
 	            </div>
-	            
 	            <div class="col-md-9 col-sm-9 col-xs-9">
 	            	<div class="tab-content">
-	            	
 	            		<!-- 左边栏上行 -->
 	            		<div class="tab-pane  active in" id="stationUp" data-direction="0">
-	            		
                             <div class="portlet-body" id="uptreeMobal" style="display: none">
 	                            <div class="table-toolbar">
 	                                <div class="row">
@@ -71,8 +59,15 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
-			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
+			                                                    <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
+			                                                    <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
 			                                                </li>
+			                                                <!-- <li>
+			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
+			                                                </li> -->
 			                                                 <!-- <li>
 			                                                    <a href="javascript:;" id="createUsingSingle"><i class="fa fa-edit"></i>  生成行单</a>
 			                                                </li> -->
@@ -88,7 +83,6 @@
 									<div id="station_Up_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
 								</div>
                              </div>
-                             
                              <!-- 无上行站点添加方式 -->
                              <div id="upToolsMobal" class="portlet-body" style="display:none">
                              	<div class="row">
@@ -156,8 +150,15 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
-			                                                    <a href="javascript:;" id="editDownlineTrend"><i class="fa fa-close"></i>  编辑走向</a>
+			                                                    <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
+			                                                    <a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i>  引用上行路段</a>
 			                                                </li>
+			                                                <!-- <li>
+			                                                    <a href="javascript:;" id="editDownlineTrend"><i class="fa fa-close"></i>  编辑走向</a>
+			                                                </li> -->
 			                                            </ul>
                                         			</div>
                                     			</div>  
@@ -170,7 +171,6 @@
 									<div id="station_Down_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
 								</div>
 	            		</div>
-	            		
 	            		<!-- 无上行站点添加方式 -->
                         <div id="downToolsMobal" class="portlet-body" style="display:none">
                         	<div class="row">
@@ -213,33 +213,23 @@
 </div>
 <!-- 线路类 -->
 <script src="/pages/base/stationroute/js/line.js"></script>
-
 <!-- 新增站点对象类 -->
 <script src="/pages/base/stationroute/js/addstationobj.js"></script>
-
 <!-- 修改站点对象类 -->
 <script src="/pages/base/stationroute/js/editstationobj.js"></script>
-
 <!-- 修改路段对象类 -->
 <script src="/pages/base/stationroute/js/editsection.js"></script>
-
 <!-- 绘图类 -->
 <script src="/pages/base/stationroute/js/drawingManager.js"></script>
-
 <!-- 地图类 -->
 <script src="/pages/base/stationroute/js/stationroute-list-map.js"></script>
-
 <!-- 函数与方法 -->
 <script src="/pages/base/stationroute/js/stationroute-list-function.js"></script>
-
 <!-- ajax请求类 -->
 <script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script>
-
 <!-- 树对类 -->
 <script src="/pages/base/stationroute/js/stationroute-list-treedata.js"></script>
-
 <!-- reload事件 -->
 <script src="/pages/base/stationroute/js/stationroute-list-reload.js"></script>
-
 <!-- 事件监听 -->
 <script src="/pages/base/stationroute/js/stationroute-list-events.js"></script>
 \ No newline at end of file
@@ -7,123 +7,351 @@
  * TODO：优化开发中
  *
  */
-angular.module('ScheduleApp').directive('saTimetable', ['$compile', '$window',
-    function($compile, $window) {
-        return {
-            restrict: 'E',
-            templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
-            scope: { // 独立作用域
-                // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
-                ds: "=ngModel",
-                celldbclickFn: "&celldbclick"
-
-                // TODO：
-
-            },
-            controllerAs: "$saTimeTableCtrl",
-            bindToController: true,
-            controller: function() {
-                var self = this;
-                this.$$headToolTip = ""; // 表头tooltip信息
-
-                // TODO：
-            },
-
-            /**，
-             * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
-             * @param tElem
-             * @param tAttrs
-             * @returns {{pre: Function, post: Function}}
-             */
-            compile: function(tElem, tAttrs) {
-                // 获取属性
-                var $attr_name = tAttrs["name"]; // 控件的名字
-                if (!$attr_name) {
-                    throw new Error("saTimeTable指令 name属性required");
+
+angular.module('ScheduleApp').factory(
+    'SaTimeTableUtils',
+    [
+        function() {
+            // 内部班次信息类
+            // detailInfo是后台返回的数据，格式如下：
+            // {"ttdid":null,"fcsj":"3/17.10","bc_type":null,"xldir":null,"isfb":false,"qdz":null,"zdz":null,"tcc":null}
+            var BcInfo = function(detailInfo) {
+                this.ttdid = detailInfo && detailInfo.ttdid; // 时刻表id
+                this.fcsj = detailInfo && detailInfo.fcsj; // 发车时间
+                this.bc_type = detailInfo && detailInfo.bc_type; // 班次类型
+                this.xldir = detailInfo && detailInfo.xldir; // 线路上下行
+                this.isfb = detailInfo && detailInfo.isfb; // 是否分班
+                this.qdz = detailInfo && detailInfo.qdz; // 起点站id
+                this.zdz = detailInfo && detailInfo.zdz; // 终点站id
+                this.tcc = detailInfo && detailInfo.tcc; // 停车场id
+
+                // 路牌信息
+                this.lpId = undefined; // id
+                this.lpName = undefined; // 名字
+
+                // 发车序号，班次数
+                this.fcno = undefined;
+                this.bcs = undefined;
+
+                this.sel = false; // 是否被选中
+
+                // 其余函数判定的内部保存值
+                this.isCanSel = false;
+                this.isValidInfo = false;
+
+            };
+            BcInfo.prototype.canUpdate = function() { // 是否能更新
+                if (this.sel && this.ttdid) {
+                    return true;
+                } else {
+                    return false;
+                }
+            };
+            BcInfo.prototype.canDelete = function() { // 是否能删除
+                if (this.sel && this.ttdid) {
+                    return true;
+                } else {
+                    return false;
                 }
-                var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
-
-                // 内部controlAs名字
-                var ctrlAs = '$saTimeTableCtrl';
-
-                // 当前选中的cell
-                var startRowIndex = undefined;
-                var startColIndex = undefined;
-                var shiftKey = false; // shift键是否被按住
-                var ctrlKey = false; // ctrl是否被按住
-                // shift选中的cell
-                var shiftCells = [];
-
-                // TODO：
-
-                return {
-                    pre: function(scope, element, attr) {
-                        // TODO：
-                        //alert(element.find("#tooltipTest").html());
-                        //$compile(element.find("#tooltipTest"))(scope);
-
-                    },
-                    post: function(scope, element, attr) {
-                        // TODO：
-
-                        // ------------------- dom事件处理function -----------------//
-                        scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
-                            console.log("click " + "row=" + rowindex + ",col=" + colindex);
-                            var internal_ds = scope[ctrlAs].ds.detailInfos;
-
-                            if (cell.ttdid) { // 是班次的单元格才能操作
-                                cell.sel = !cell.sel;
+            };
+            BcInfo.prototype.canSel = function() { // 是否能选中
+                if (this.ttdid) {
+                    this.isCanSel = true;
+                    return true;
+                } else if (this.fcsj) {
+                    // 没有ttdid，有fcsj标识，
+                    // 由于是后台返回数据的格式，这种就是路牌和汇总信息，不能选中
+                    this.isCanSel = false;
+                    return false;
+                } else {
+                    // 都是空的，表示是一个空班次，可以选中
+                    this.isCanSel = true;
+                    return true;
+                }
+            };
+            BcInfo.prototype.validInfo = function() { // 验证班次信息内容是否正确
+                if (this.canSel() && this.ttdid) {
+                    if (this.bc_type == 'in') {
+                        if (this.qdz == null || this.tcc == null) {
+                            this.isValidInfo = true;
+                            return true;
+                        } else {
+                            this.isValidInfo = false;
+                            return false;
+                        }
+                    } else if (this.bc_type == 'out') {
+                        if (this.tcc == null || this.zdz == null) {
+                            this.isValidInfo = true;
+                            return true;
+                        } else {
+                            this.isValidInfo = false;
+                            return false;
+                        }
+                    } else {
+                        if (this.qdz == null || this.zdz == null) {
+                            this.isValidInfo = true;
+                            return true;
+                        } else {
+                            this.isValidInfo = false;
+                            return false;
+                        }
+                    }
+                } else {
+                    this.isValidInfo = true;
+                    return true;
+                }
+            };
+
+            BcInfo.prototype.where = function(xldir, startTime_h_m, endTime_h_m, isInOut) { // 判定班次是否在指定条件内
+                var fcsj_m_h = [];
+                fcsj_m_h[0] = parseInt(this.fcsj.split(":")[0]);
+                fcsj_m_h[1] = parseInt(this.fcsj.split(":")[1]);
+
+                var fcsj = new Date(2000,1,1);
+                fcsj.setHours(fcsj_m_h[0]);
+                fcsj.setMinutes(fcsj_m_h[1]);
+
+                var s_temp_date = new Date(2000, 1, 1);
+                var e_temp_date = new Date(2000, 1, 1);
+
+                if (xldir == 2) { // 上下行
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.bc_type == "in" || this.bc_type == "out")) {
+                        return false;
+                    }
+
+                    if (startTime_h_m) {
+                        if (endTime_h_m) {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                        } else {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            return fcsj >= s_temp_date;
+                        }
+                    } else {
+                        if (endTime_h_m) {
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj <= e_temp_date;
+                        } else {
+                            return false;
+                        }
+                    }
+                } else {
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.bc_type == "in" || this.bc_type == "out")) {
+                        return false;
+                    }
+
+                    if (xldir == this.xldir) {
+                        if (startTime_h_m) {
+                            if (endTime_h_m) {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                            } else {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                return fcsj >= s_temp_date;
+                            }
+                        } else {
+                            if (endTime_h_m) {
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj <= e_temp_date;
+                            } else {
+                                return true;
                             }
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+            };
+
+            return {
+                createBcInfo: function(detailInfo, lpDetailInfo) {
+                    var bcInfo = new BcInfo(detailInfo);
+                    if (!bcInfo.ttdid && bcInfo.fcsj && bcInfo.fcsj.indexOf('_') > 0) {
+                        var temp_info = bcInfo.fcsj.split('_');
+                        // 添加信息的属性
+                        bcInfo.lpName = temp_info[1];
+                        bcInfo.lpId = temp_info[0];
+                        // 修改fcsj为路牌名字
+                        bcInfo.fcsj = bcInfo.lpName;
+                    }
+
+                    // 重新设定路牌信息
+                    if (!bcInfo.lpId) {
+                        bcInfo.lpId = lpDetailInfo.lpId;
+                        bcInfo.lpName = lpDetailInfo.lpName;
+                    }
-                        };
-                        scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
-                            if (cell.ttdid) { // 是班次的单元格才能操作
-                                if ($attr_celldbclick) {
-                                    // 注意调用方法
-                                    scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                    return bcInfo;
+                },
+                initTTInfoDetail: function(formobj, cellinfo, colinfo, xlid, xlname, ttid, ttname) {
+                    formobj.xl = {};
+                    formobj.xl.id = xlid;
+                    formobj.xl.name = xlname;
+                    formobj.ttinfo = {};
+                    formobj.ttinfo.id = ttid;
+                    formobj.ttinfo.name = ttname;
+                    formobj.lp = {};
+                    formobj.lp.id = cellinfo.lpId;
+                    formobj.lp.lpName = cellinfo.lpName;
+                    formobj.fcno = cellinfo.fcno;
+                    formobj.bcs = cellinfo.bcs;
+                    formobj.isFB = cellinfo.isfb;
+
+                    formobj.bcType = colinfo.bc_type;
+                    formobj.xlDir = colinfo.xldir;
+                    if (colinfo.qdz) {
+                        formobj.qdz = {};
+                        formobj.qdz.id = colinfo.qdz;
+                    }
+                    if (colinfo.zdz) {
+                        formobj.zdz = {};
+                        formobj.zdz.id = colinfo.zdz;
+                    }
+                    if (colinfo.tcc) {
+                        formobj.tcc = {};
+                        formobj.tcc.id = colinfo.tcc;
+                    }
+
+                }
+            };
+        }
+    ]
+);
+
+angular.module('ScheduleApp').directive(
+    'saTimetable',
+    [
+        '$compile',
+        '$window',
+        function($compile, $window) {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
+                scope: { // 独立作用域
+                    // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
+                    ds: "=ngModel",
+                    celldbclickFn: "&celldbclick"
+
+                    // TODO：
+
+                },
+                controllerAs: "$saTimeTableCtrl",
+                bindToController: true,
+                controller: function() {
+                    var self = this;
+                    this.$$headToolTip = ""; // 表头tooltip信息
+
+                    // TODO：
+                },
+
+                /**，
+                 * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
+                 * @param tElem
+                 * @param tAttrs
+                 * @returns {{pre: Function, post: Function}}
+                 */
+                compile: function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw new Error("saTimeTable指令 name属性required");
+                    }
+                    var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
+
+                    // 内部controlAs名字
+                    var ctrlAs = '$saTimeTableCtrl';
+
+                    // 当前选中的cell
+                    var startRowIndex = undefined;
+                    var startColIndex = undefined;
+                    var shiftKey = false; // shift键是否被按住
+                    var ctrlKey = false; // ctrl是否被按住
+                    // shift选中的cell
+                    var shiftCells = [];
+
+                    // TODO：
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+                        post: function(scope, element, attr) {
+                            // TODO：
+
+                            // ------------------- dom事件处理function -----------------//
+                            scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
+                                console.log("click " + "row=" + rowindex + ",col=" + colindex);
+                                var internal_ds = scope[ctrlAs].ds.detailInfos;
+
+                                if (cell.canSel()) { // 是班次的单元格才能操作
+                                    cell.sel = !cell.sel;
                                 }
-                            }
-                        };
-
-                        // ------------------- 监控function ------------------//
-                        // 监控明细数据，生成表头的tooltip
-                        scope.$watch(
-                            function() {
-                                return scope[ctrlAs].ds;
-                            },
-                            function(newValue, oldValue) {
-                                if (newValue &&
-                                    newValue.detailHeads &&
-                                    newValue.detailHeads.length > 0) {
-                                    var tooltip = [];
-                                    tooltip.push("出场");
-                                    angular.forEach(newValue.detailHeads, function(value) {
-                                        if (value != "出场" &&
-                                            value != "路牌" &&
-                                            value != "进场" &&
-                                            value != "空驶班次/空驶里程" &&
-                                            value != "运营班次/运营里程" ) {
-                                            var exist = false;
-                                            angular.forEach(tooltip, function(tip) {
-                                                if (tip == value) {
-                                                    exist = true;
+
+                            };
+                            scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                                if (cell.canSel()) { // 是班次的单元格才能操作
+                                    if ($attr_celldbclick) {
+                                        // 注意调用方法
+                                        scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                    }
+                                }
+                            };
+
+                            // ------------------- 监控function ------------------//
+                            // 监控明细数据，生成表头的tooltip
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue &&
+                                        newValue.detailHeads &&
+                                        newValue.detailHeads.length > 0) {
+                                        var tooltip = [];
+                                        tooltip.push("出场");
+                                        angular.forEach(newValue.detailHeads, function(value) {
+                                            if (value != "出场" &&
+                                                value != "路牌" &&
+                                                value != "进场" &&
+                                                value != "空驶班次/空驶里程" &&
+                                                value != "运营班次/运营里程" ) {
+                                                var exist = false;
+                                                angular.forEach(tooltip, function(tip) {
+                                                    if (tip == value) {
+                                                        exist = true;
+                                                    }
+                                                });
+                                                if (!exist) {
+                                                    tooltip.push(value);
                                                 }
-                                            });
-                                            if (!exist) {
-                                                tooltip.push(value);
                                             }
-                                        }
-                                    });
-                                    tooltip.push("进场");
-                                    scope[ctrlAs].$$headToolTip = tooltip.join(",");
-                                }
-                            },
-                            true
-                        )
-                    }
-                };
-            }
+                                        });
+                                        tooltip.push("进场");
+                                        scope[ctrlAs].$$headToolTip = tooltip.join(",");
+                                    }
+                                },
+                                true
+                            )
+                        }
+                    };
+                }
-        };
-    }
-]);
+            };
+        }
+    ]
+);
@@ -3705,126 +3705,354 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saBcgroup&#39;, [
  * TODO：优化开发中
  *
  */
-angular.module('ScheduleApp').directive('saTimetable', ['$compile', '$window',
-    function($compile, $window) {
-        return {
-            restrict: 'E',
-            templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
-            scope: { // 独立作用域
-                // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
-                ds: "=ngModel",
-                celldbclickFn: "&celldbclick"
-                // TODO：
+angular.module('ScheduleApp').factory(
+    'SaTimeTableUtils',
+    [
+        function() {
+            // 内部班次信息类
+            // detailInfo是后台返回的数据，格式如下：
+            // {"ttdid":null,"fcsj":"3/17.10","bc_type":null,"xldir":null,"isfb":false,"qdz":null,"zdz":null,"tcc":null}
+            var BcInfo = function(detailInfo) {
+                this.ttdid = detailInfo && detailInfo.ttdid; // 时刻表id
+                this.fcsj = detailInfo && detailInfo.fcsj; // 发车时间
+                this.bc_type = detailInfo && detailInfo.bc_type; // 班次类型
+                this.xldir = detailInfo && detailInfo.xldir; // 线路上下行
+                this.isfb = detailInfo && detailInfo.isfb; // 是否分班
+                this.qdz = detailInfo && detailInfo.qdz; // 起点站id
+                this.zdz = detailInfo && detailInfo.zdz; // 终点站id
+                this.tcc = detailInfo && detailInfo.tcc; // 停车场id
+
+                // 路牌信息
+                this.lpId = undefined; // id
+                this.lpName = undefined; // 名字
+
+                // 发车序号，班次数
+                this.fcno = undefined;
+                this.bcs = undefined;
+
+                this.sel = false; // 是否被选中
+
+                // 其余函数判定的内部保存值
+                this.isCanSel = false;
+                this.isValidInfo = false;
-            },
-            controllerAs: "$saTimeTableCtrl",
-            bindToController: true,
-            controller: function() {
-                var self = this;
-                this.$$headToolTip = ""; // 表头tooltip信息
+            };
+            BcInfo.prototype.canUpdate = function() { // 是否能更新
+                if (this.sel && this.ttdid) {
+                    return true;
+                } else {
+                    return false;
+                }
+            };
+            BcInfo.prototype.canDelete = function() { // 是否能删除
+                if (this.sel && this.ttdid) {
+                    return true;
+                } else {
+                    return false;
+                }
+            };
+            BcInfo.prototype.canSel = function() { // 是否能选中
+                if (this.ttdid) {
+                    this.isCanSel = true;
+                    return true;
+                } else if (this.fcsj) {
+                    // 没有ttdid，有fcsj标识，
+                    // 由于是后台返回数据的格式，这种就是路牌和汇总信息，不能选中
+                    this.isCanSel = false;
+                    return false;
+                } else {
+                    // 都是空的，表示是一个空班次，可以选中
+                    this.isCanSel = true;
+                    return true;
+                }
+            };
+            BcInfo.prototype.validInfo = function() { // 验证班次信息内容是否正确
+                if (this.canSel() && this.ttdid) {
+                    if (this.bc_type == 'in') {
+                        if (this.qdz == null || this.tcc == null) {
+                            this.isValidInfo = true;
+                            return true;
+                        } else {
+                            this.isValidInfo = false;
+                            return false;
+                        }
+                    } else if (this.bc_type == 'out') {
+                        if (this.tcc == null || this.zdz == null) {
+                            this.isValidInfo = true;
+                            return true;
+                        } else {
+                            this.isValidInfo = false;
+                            return false;
+                        }
+                    } else {
+                        if (this.qdz == null || this.zdz == null) {
+                            this.isValidInfo = true;
+                            return true;
+                        } else {
+                            this.isValidInfo = false;
+                            return false;
+                        }
+                    }
+                } else {
+                    this.isValidInfo = true;
+                    return true;
+                }
+            };
-                // TODO：
-            },
+            BcInfo.prototype.where = function(xldir, startTime_h_m, endTime_h_m, isInOut) { // 判定班次是否在指定条件内
+                var fcsj_m_h = [];
+                fcsj_m_h[0] = parseInt(this.fcsj.split(":")[0]);
+                fcsj_m_h[1] = parseInt(this.fcsj.split(":")[1]);
-            /**，
-             * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
-             * @param tElem
-             * @param tAttrs
-             * @returns {{pre: Function, post: Function}}
-             */
-            compile: function(tElem, tAttrs) {
-                // 获取属性
-                var $attr_name = tAttrs["name"]; // 控件的名字
-                if (!$attr_name) {
-                    throw new Error("saTimeTable指令 name属性required");
+                var fcsj = new Date(2000,1,1);
+                fcsj.setHours(fcsj_m_h[0]);
+                fcsj.setMinutes(fcsj_m_h[1]);
+
+                var s_temp_date = new Date(2000, 1, 1);
+                var e_temp_date = new Date(2000, 1, 1);
+
+                if (xldir == 2) { // 上下行
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.bc_type == "in" || this.bc_type == "out")) {
+                        return false;
+                    }
+
+                    if (startTime_h_m) {
+                        if (endTime_h_m) {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                        } else {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            return fcsj >= s_temp_date;
+                        }
+                    } else {
+                        if (endTime_h_m) {
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj <= e_temp_date;
+                        } else {
+                            return false;
+                        }
+                    }
+                } else {
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.bc_type == "in" || this.bc_type == "out")) {
+                        return false;
+                    }
+
+                    if (xldir == this.xldir) {
+                        if (startTime_h_m) {
+                            if (endTime_h_m) {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                            } else {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                return fcsj >= s_temp_date;
+                            }
+                        } else {
+                            if (endTime_h_m) {
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj <= e_temp_date;
+                            } else {
+                                return true;
+                            }
+                        }
+                    } else {
+                        return false;
+                    }
                 }
-                var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
+            };
-                // 内部controlAs名字
-                var ctrlAs = '$saTimeTableCtrl';
+            return {
+                createBcInfo: function(detailInfo, lpDetailInfo) {
+                    var bcInfo = new BcInfo(detailInfo);
+                    if (!bcInfo.ttdid && bcInfo.fcsj && bcInfo.fcsj.indexOf('_') > 0) {
+                        var temp_info = bcInfo.fcsj.split('_');
+                        // 添加信息的属性
+                        bcInfo.lpName = temp_info[1];
+                        bcInfo.lpId = temp_info[0];
+                        // 修改fcsj为路牌名字
+                        bcInfo.fcsj = bcInfo.lpName;
+                    }
-                // 当前选中的cell
-                var startRowIndex = undefined;
-                var startColIndex = undefined;
-                var shiftKey = false; // shift键是否被按住
-                var ctrlKey = false; // ctrl是否被按住
-                // shift选中的cell
-                var shiftCells = [];
+                    // 重新设定路牌信息
+                    if (!bcInfo.lpId) {
+                        bcInfo.lpId = lpDetailInfo.lpId;
+                        bcInfo.lpName = lpDetailInfo.lpName;
+                    }
-                // TODO：
+                    return bcInfo;
+                },
+                initTTInfoDetail: function(formobj, cellinfo, colinfo, xlid, xlname, ttid, ttname) {
+                    formobj.xl = {};
+                    formobj.xl.id = xlid;
+                    formobj.xl.name = xlname;
+                    formobj.ttinfo = {};
+                    formobj.ttinfo.id = ttid;
+                    formobj.ttinfo.name = ttname;
+                    formobj.lp = {};
+                    formobj.lp.id = cellinfo.lpId;
+                    formobj.lp.lpName = cellinfo.lpName;
+                    formobj.fcno = cellinfo.fcno;
+                    formobj.bcs = cellinfo.bcs;
+                    formobj.isFB = cellinfo.isfb;
+
+                    formobj.bcType = colinfo.bc_type;
+                    formobj.xlDir = colinfo.xldir;
+                    if (colinfo.qdz) {
+                        formobj.qdz = {};
+                        formobj.qdz.id = colinfo.qdz;
+                    }
+                    if (colinfo.zdz) {
+                        formobj.zdz = {};
+                        formobj.zdz.id = colinfo.zdz;
+                    }
+                    if (colinfo.tcc) {
+                        formobj.tcc = {};
+                        formobj.tcc.id = colinfo.tcc;
+                    }
-                return {
-                    pre: function(scope, element, attr) {
-                        // TODO：
-                        //alert(element.find("#tooltipTest").html());
-                        //$compile(element.find("#tooltipTest"))(scope);
+                }
+            };
+        }
+    ]
+);
-                    },
-                    post: function(scope, element, attr) {
-                        // TODO：
+angular.module('ScheduleApp').directive(
+    'saTimetable',
+    [
+        '$compile',
+        '$window',
+        function($compile, $window) {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
+                scope: { // 独立作用域
+                    // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
+                    ds: "=ngModel",
+                    celldbclickFn: "&celldbclick"
-                        // ------------------- dom事件处理function -----------------//
-                        scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
-                            console.log("click " + "row=" + rowindex + ",col=" + colindex);
-                            var internal_ds = scope[ctrlAs].ds.detailInfos;
+                    // TODO：
-                            if (cell.ttdid) { // 是班次的单元格才能操作
-                                cell.sel = !cell.sel;
-                            }
+                },
+                controllerAs: "$saTimeTableCtrl",
+                bindToController: true,
+                controller: function() {
+                    var self = this;
+                    this.$$headToolTip = ""; // 表头tooltip信息
-                        };
-                        scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
-                            if (cell.ttdid) { // 是班次的单元格才能操作
-                                if ($attr_celldbclick) {
-                                    // 注意调用方法
-                                    scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                    // TODO：
+                },
+
+                /**，
+                 * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
+                 * @param tElem
+                 * @param tAttrs
+                 * @returns {{pre: Function, post: Function}}
+                 */
+                compile: function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw new Error("saTimeTable指令 name属性required");
+                    }
+                    var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
+
+                    // 内部controlAs名字
+                    var ctrlAs = '$saTimeTableCtrl';
+
+                    // 当前选中的cell
+                    var startRowIndex = undefined;
+                    var startColIndex = undefined;
+                    var shiftKey = false; // shift键是否被按住
+                    var ctrlKey = false; // ctrl是否被按住
+                    // shift选中的cell
+                    var shiftCells = [];
+
+                    // TODO：
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+                        post: function(scope, element, attr) {
+                            // TODO：
+
+                            // ------------------- dom事件处理function -----------------//
+                            scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
+                                console.log("click " + "row=" + rowindex + ",col=" + colindex);
+                                var internal_ds = scope[ctrlAs].ds.detailInfos;
+
+                                if (cell.canSel()) { // 是班次的单元格才能操作
+                                    cell.sel = !cell.sel;
                                 }
-                            }
-                        };
-                        // ------------------- 监控function ------------------//
-                        // 监控明细数据，生成表头的tooltip
-                        scope.$watch(
-                            function() {
-                                return scope[ctrlAs].ds;
-                            },
-                            function(newValue, oldValue) {
-                                if (newValue &&
-                                    newValue.detailHeads &&
-                                    newValue.detailHeads.length > 0) {
-                                    var tooltip = [];
-                                    tooltip.push("出场");
-                                    angular.forEach(newValue.detailHeads, function(value) {
-                                        if (value != "出场" &&
-                                            value != "路牌" &&
-                                            value != "进场" &&
-                                            value != "空驶班次/空驶里程" &&
-                                            value != "运营班次/运营里程" ) {
-                                            var exist = false;
-                                            angular.forEach(tooltip, function(tip) {
-                                                if (tip == value) {
-                                                    exist = true;
+                            };
+                            scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                                if (cell.canSel()) { // 是班次的单元格才能操作
+                                    if ($attr_celldbclick) {
+                                        // 注意调用方法
+                                        scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                    }
+                                }
+                            };
+
+                            // ------------------- 监控function ------------------//
+                            // 监控明细数据，生成表头的tooltip
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue &&
+                                        newValue.detailHeads &&
+                                        newValue.detailHeads.length > 0) {
+                                        var tooltip = [];
+                                        tooltip.push("出场");
+                                        angular.forEach(newValue.detailHeads, function(value) {
+                                            if (value != "出场" &&
+                                                value != "路牌" &&
+                                                value != "进场" &&
+                                                value != "空驶班次/空驶里程" &&
+                                                value != "运营班次/运营里程" ) {
+                                                var exist = false;
+                                                angular.forEach(tooltip, function(tip) {
+                                                    if (tip == value) {
+                                                        exist = true;
+                                                    }
+                                                });
+                                                if (!exist) {
+                                                    tooltip.push(value);
                                                 }
-                                            });
-                                            if (!exist) {
-                                                tooltip.push(value);
                                             }
-                                        }
-                                    });
-                                    tooltip.push("进场");
-                                    scope[ctrlAs].$$headToolTip = tooltip.join(",");
-                                }
-                            },
-                            true
-                        )
-                    }
-                };
-            }
+                                        });
+                                        tooltip.push("进场");
+                                        scope[ctrlAs].$$headToolTip = tooltip.join(",");
+                                    }
+                                },
+                                true
+                            )
+                        }
+                    };
+                }
-        };
-    }
-]);
+            };
+        }
+    ]
+);
 /**
  * saScpdate指令（非通用指令，只在排版计划form中使用）。
@@ -1149,7 +1149,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
-                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',
+                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
                 },
@@ -59,6 +59,12 @@
                                     批量修改
                                 </a>
                             </li>
+                            <li>
+                                <a href="javascript:" class="tool-action" ng-click="ctrl.deleteInfos()">
+                                    <i class="fa fa-file-excel-o"></i>
+                                    批量删除
+                                </a>
+                            </li>
                             <li class="divider"></li>
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.clearsel()">
@@ -82,7 +82,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
-                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',
+                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
                 },
@@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         'TimeTableDetailManageService_g',
         '$state',
         '$q',
-        function(service, $state, $q) {
+        'SaTimeTableUtils',
+        function(service, $state, $q, SaTimeTableUtils) {
             // 查询对象类
             var queryClass = service.rest;
@@ -14,6 +15,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
             var editInfo = {
                 detailHeads: [], // 时刻表头信息
                 detailInfos: [], // 时刻表明细信息
+                columnBcInfo: [], // 每列班次的信息
                 yydesc: "" // 营运汇总描述
             };
@@ -34,6 +36,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     editInfo = {
                         detailHeads: [], // 时刻表头信息
                         detailInfos: [], // 时刻表明细信息
+                        columnBcInfo: [], // 每列班次的信息（保存每列的站点信息）
                         yydesc: "" // 营运汇总描述
                     };
@@ -42,116 +45,37 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             editInfo.detailHeads = result.header;
                             editInfo.detailInfos = result.contents;
                             editInfo.yydesc = result.yy_desc;
+                            editInfo.columnBcInfo = [editInfo.detailInfos[0].length];
-                            // detailInfos里添加是否选中的flag
+                            // 将editInfo.detailInfos中的值重新修正一遍
                             for (var i = 0; i < editInfo.detailInfos.length; i++) {
                                 for (var j = 0; j < editInfo.detailInfos[i].length; j++) {
-                                    editInfo.detailInfos[i][j].sel = false;
-                                    // 给cell定义一个valid属性，及方法，判定这个班次的数据是否正常
-                                    editInfo.detailInfos[i][j].invalidFlag = true;
-                                    editInfo.detailInfos[i][j].validInfo = function() { // 验证方法
-                                        if (!this.ttdid) {
-                                            this.invalidFlag = false;
-                                            return;
-                                        }
-
-                                        if (this.bc_type == 'in') {
-                                            if (this.qdz == null || this.tcc == null) {
-                                                this.invalidFlag = true;
-                                            } else {
-                                                this.invalidFlag = false;
-                                            }
-                                        } else if (this.bc_type == 'out') {
-                                            if (this.tcc == null || this.zdz == null) {
-                                                this.invalidFlag = true;
-                                            } else {
-                                                this.invalidFlag = false;
-                                            }
-                                        } else {
-                                            if (this.qdz == null || this.zdz == null) {
-                                                this.invalidFlag = true;
-                                            } else {
-                                                this.invalidFlag = false;
-                                            }
-                                        }
-                                    };
-                                    editInfo.detailInfos[i][j].where = function(xldir, startTime_h_m, endTime_h_m, isInOut) { // where方法
-                                        var fcsj_m_h = [];
-                                        fcsj_m_h[0] = parseInt(this.fcsj.split(":")[0]);
-                                        fcsj_m_h[1] = parseInt(this.fcsj.split(":")[1]);
-
-                                        var fcsj = new Date(2000,1,1);
-                                        fcsj.setHours(fcsj_m_h[0]);
-                                        fcsj.setMinutes(fcsj_m_h[1]);
-
-                                        var s_temp_date = new Date(2000, 1, 1);
-                                        var e_temp_date = new Date(2000, 1, 1);
-
-                                        if (xldir == 2) { // 上下行
-                                            // 判定是否要进出场班次
-                                            if (isInOut == false && (this.bc_type == "in" || this.bc_type == "out")) {
-                                                return false;
-                                            }
-
-                                            if (startTime_h_m) {
-                                                if (endTime_h_m) {
-                                                    s_temp_date.setHours(startTime_h_m[0]);
-                                                    s_temp_date.setMinutes(startTime_h_m[1]);
-                                                    e_temp_date.setHours(endTime_h_m[0]);
-                                                    e_temp_date.setMinutes(endTime_h_m[1]);
-                                                    return fcsj >= s_temp_date && fcsj <= e_temp_date;
-                                                } else {
-                                                    s_temp_date.setHours(startTime_h_m[0]);
-                                                    s_temp_date.setMinutes(startTime_h_m[1]);
-                                                    return fcsj >= s_temp_date;
-                                                }
-                                            } else {
-                                                if (endTime_h_m) {
-                                                    e_temp_date.setHours(endTime_h_m[0]);
-                                                    e_temp_date.setMinutes(endTime_h_m[1]);
-                                                    return fcsj <= e_temp_date;
-                                                } else {
-                                                    return false;
-                                                }
-                                            }
-                                        } else {
-                                            // 判定是否要进出场班次
-                                            if (isInOut == false && (this.bc_type == "in" || this.bc_type == "out")) {
-                                                return false;
-                                            }
-
-                                            if (xldir == this.xldir) {
-                                                if (startTime_h_m) {
-                                                    if (endTime_h_m) {
-                                                        s_temp_date.setHours(startTime_h_m[0]);
-                                                        s_temp_date.setMinutes(startTime_h_m[1]);
-                                                        e_temp_date.setHours(endTime_h_m[0]);
-                                                        e_temp_date.setMinutes(endTime_h_m[1]);
-                                                        return fcsj >= s_temp_date && fcsj <= e_temp_date;
-                                                    } else {
-                                                        s_temp_date.setHours(startTime_h_m[0]);
-                                                        s_temp_date.setMinutes(startTime_h_m[1]);
-                                                        return fcsj >= s_temp_date;
-                                                    }
-                                                } else {
-                                                    if (endTime_h_m) {
-                                                        e_temp_date.setHours(endTime_h_m[0]);
-                                                        e_temp_date.setMinutes(endTime_h_m[1]);
-                                                        return fcsj <= e_temp_date;
-                                                    } else {
-                                                        return true;
-                                                    }
-                                                }
-                                            } else {
-                                                return false;
-                                            }
-                                        }
-
-                                    };
-                                    editInfo.detailInfos[i][j].validInfo();
+                                    var detailInfo = SaTimeTableUtils.createBcInfo(
+                                        editInfo.detailInfos[i][j],
+                                        editInfo.detailInfos[i][0]
+                                    );
+                                    detailInfo.fcno = j;
+                                    detailInfo.bcs = i * (editInfo.detailInfos[i].length - 3) + j;
+                                    detailInfo.validInfo();
+                                    editInfo.detailInfos[i][j] = detailInfo;
+
+                                    if (!editInfo.columnBcInfo[j]) {
+                                        editInfo.columnBcInfo[j] = {};
+                                    }
+                                    if (!editInfo.columnBcInfo[j].bc_type && detailInfo.ttdid) {
+                                        // 设定站点信息
+                                        editInfo.columnBcInfo[j].bc_type = detailInfo.bc_type;
+                                        editInfo.columnBcInfo[j].xldir = detailInfo.xldir;
+                                        editInfo.columnBcInfo[j].isfb = detailInfo.isfb;
+                                        editInfo.columnBcInfo[j].qdz = detailInfo.qdz;
+                                        editInfo.columnBcInfo[j].zdz = detailInfo.zdz;
+                                        editInfo.columnBcInfo[j].tcc = detailInfo.tcc;
+                                    }
                                 }
                             }
+
+                            console.log(editInfo.columnBcInfo);
                         } else {
                             alert(result.msg);
                         }
@@ -169,6 +93,57 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     return flag;
                 },
+                deleteInfos: function() { // 批量删除数据
+                    var deferred = $q.defer();
+
+                    // 找出所有选中的ttinfodetailids
+                    var ttinfodetailIds = [];
+                    for (var i = 0; i < editInfo.detailInfos.length; i++) {
+                        for (var j = 0; j < editInfo.detailInfos[i].length; j++) {
+                            if (editInfo.detailInfos[i][j].canDelete())
+                                ttinfodetailIds.push(editInfo.detailInfos[i][j]);
+                        }
+                    }
+                    // ajax调用
+                    var success_counts = 0; // 成功数
+                    var error_counts = 0; // 失败数
+                    for (var n = 0; n < ttinfodetailIds.length; n++) {
+                        (function(index) {
+                            queryClass.delete({id: ttinfodetailIds[index].ttdid}, function(value) {
+                                if (value.status == 'ERROR') {
+                                    error_counts ++;
+                                    if (success_counts + error_counts == ttinfodetailIds.length) {
+                                        deferred.reject();
+                                    }
+                                } else {
+                                    // 赋值（上下行，发车时间，班次类型，起点站，终点站，停车场）
+                                    ttinfodetailIds[index].fcsj = undefined;
+                                    ttinfodetailIds[index].xldir = undefined;
+                                    ttinfodetailIds[index].bc_type = undefined;
+                                    ttinfodetailIds[index].qdz = undefined;
+                                    ttinfodetailIds[index].zdz = undefined;
+                                    ttinfodetailIds[index].tcc = undefined;
+
+                                    ttinfodetailIds[index].validInfo();
+
+                                    success_counts ++;
+                                    if (success_counts + error_counts == ttinfodetailIds.length) {
+                                        deferred.resolve();
+                                    }
+                                }
+                            }, function(value) {
+                                error_counts ++;
+                                if (success_counts + error_counts == ttinfodetailIds.length) {
+                                    deferred.reject();
+                                }
+                            });
+
+                        })(n);
+                    }
+
+                    return deferred.promise;
+                },
+
                 editInfos: function(updateObject) { // 批量保存数据 // TODO：
                     var deferred = $q.defer();
@@ -176,7 +151,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     var ttinfodetailIds = [];
                     for (var i = 0; i < editInfo.detailInfos.length; i++) {
                         for (var j = 0; j < editInfo.detailInfos[i].length; j++) {
-                            if (editInfo.detailInfos[i][j].sel == true)
+                            if (editInfo.detailInfos[i][j].canUpdate())
                                 ttinfodetailIds.push(editInfo.detailInfos[i][j]);
                         }
                     }
@@ -329,7 +304,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        rowindex: r,
+                        colindex: c
                     }
                 );
             };
@@ -360,6 +337,30 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
+            // 批量删除
+            self.deleteInfos = function() {
+                if (!service.editIsSel()) {
+                    alert("请选择班次信息");
+                    return;
+                }
+                service.deleteInfos().then(function() {
+                    $state.go("ttInfoDetailManage_edit3", {
+                        xlid: self.xlid,
+                        ttid: self.ttid,
+                        xlname: self.xlname,
+                        ttname: self.ttname
+                    });
+                }, function() {
+                    alert("批量删除失败！");
+                    $state.go("ttInfoDetailManage_edit3", {
+                        xlid: self.xlid,
+                        ttid: self.ttid,
+                        xlname: self.xlname,
+                        ttname: self.ttname
+                    });
+                });
+            };
+
             // 查询对象类
             var TTInfoDetail = service.getQueryClass();
@@ -445,7 +446,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         'TimeTableDetailManageService_old',
         '$stateParams',
         '$state',
-        function(service, $stateParams, $state) {
+        'SaTimeTableUtils',
+        function(service, $stateParams, $state, SaTimeTableUtils) {
             var self = this;
             var TTInfoDetail = service.getQueryClass();
@@ -465,6 +467,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
             self.xlname = $stateParams.xlname; // 获取传过来的线路名字
             self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.rowindex = $stateParams.rowindex; // 修改的第几行
+            self.colindex = $stateParams.colindex; // 修改的第几列
             self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
@@ -509,6 +513,24 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         "->班次详细信息";
                 });
+            } else { // 此单元格为空，使用columnBcInfo填充
+                SaTimeTableUtils.initTTInfoDetail(
+                    self.TimeTableDetailForSave,
+                    service.getEditInfo().detailInfos[self.rowindex][self.colindex],
+                    service.getEditInfo().columnBcInfo[self.colindex],
+                    self.xlid,
+                    self.xlname,
+                    self.ttid,
+                    self.ttname
+                );
+
+                self.stop_temp.setModelValue(self.TimeTableDetailForSave);
+                self.title2 =
+                    self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" +
+                    "->路牌" + self.TimeTableDetailForSave.lp.lpName +
+                    "->发车顺序号" + self.TimeTableDetailForSave.fcno +
+                    "->班次详细信息";
+
             }
             // 提交方法
@@ -523,22 +545,18 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 self.TimeTableDetailForSave.$save(function(value) {
                     // 修正内部edit的值
                     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].ttdid == id) {
-                                // 赋值（上下行，发车时间，班次类型）
-                                detailInfos[i][j].fcsj = value.fcsj || undefined;
-                                detailInfos[i][j].xldir = value.xlDir || undefined;
-                                detailInfos[i][j].bc_type = value.bcType || undefined;
-                                detailInfos[i][j].tcc = value.tcc || undefined;
-                                detailInfos[i][j].zdz = value.zdz || undefined;
-                                detailInfos[i][j].qdz = value.qdz || undefined;
-                                detailInfos[i][j].isfb = value.isFB;
-
-                                detailInfos[i][j].validInfo();
-                            }
-                        }
-                    }
+                    var detailInfo = detailInfos[self.rowindex][self.colindex];
+                    // 赋值（上下行，发车时间，班次类型）
+                    detailInfo.fcsj = value.fcsj || undefined;
+                    detailInfo.xldir = value.xlDir || undefined;
+                    detailInfo.bc_type = value.bcType || undefined;
+                    detailInfo.tcc = value.tcc || undefined;
+                    detailInfo.zdz = value.zdz || undefined;
+                    detailInfo.qdz = value.qdz || undefined;
+                    detailInfo.isfb = value.isFB;
+
+                    detailInfo.validInfo();
+
                     //$state.go("ttInfoDetailManage_edit", {
                     //    xlid: self.xlid,
                     //    ttid: self.ttid,
@@ -567,6 +585,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$stateParams',
         '$state',
         function(service, $stateParams, $state) {
+            // TODO：
+
             var self = this;
             var TTInfoDetail = service.getQueryClass();
-
 //modal hide remove dom
 $(document).on('hide.uk.modal', '.uk-modal', function () {
     $(this).remove();
@@ -26,22 +25,25 @@ var show_modal = function (id, dom) {
 var open_modal = function (pageUrl, data, opt) {
     $.get(pageUrl, function (dom) {
-        if (!$(dom).hasClass('uk-modal')) {
-            alert('无效的dom片段！');
-            return;
-        }
-        var id = '#' + $(dom).attr('id');
-
-        $(document.body).append(dom);
-        UIkit.modal(id, opt).show();
-        //move
-        modal_move($('.uk-modal-header',id));
-
-        if (data)
-            $(id).trigger('init', data);
+        open_modal_dom(dom, data, opt);
     });
 };
+var open_modal_dom = function (dom, data, opt) {
+    if (!$(dom).hasClass('uk-modal')) {
+        alert('无效的dom片段！');
+        return;
+    }
+    var id = '#' + $(dom).attr('id');
+
+    $(document.body).append(dom);
+    UIkit.modal(id, opt).show();
+    //move
+    modal_move($('.uk-modal-header',id));
+
+    if (data)
+        $(id).trigger('init', data);
+};
 var modal_move = function (m_header) {
     var _moveFlag;
@@ -90,4 +92,4 @@ var modal_move = function (m_header) {
         _moveObj = null;
     });
-};
+};
 \ No newline at end of file
@@ -649,4 +649,155 @@ input[type=checkbox].disabled{
     padding-top: 15px;
     border-right: 1px solid #d8d7d7;
     box-shadow: 3px 1px 8px 0 rgba(0, 0, 0, 0.12), 1px 0px 8px 0 rgba(0, 0, 0, 0.12);
+}
+
+.playBackForm{
+    margin-bottom: 0 !important;
+}
+
+.playBackForm .uk-form-label{
+    width: 70px;
+}
+
+.playBackForm .uk-form-controls{
+    margin-left: 75px;
+}
+
+.playBackForm>.uk-grid{
+    margin-top: 14px;
+}
+.playBackForm .autocomplete-nbbm{
+    width: 100%;
+}
+.playBackForm .autocomplete-nbbm input{
+    width: calc(100% - 28px);
+}
+.playBackForm>.uk-grid>*{
+    padding-left: 18px;
+}
+
+.abnormal_table_wrap{
+    height: calc(50% - 210px);
+    margin-left: -35px;
+    border-top: 1px solid #ededed;
+    margin-top: 26px;
+    position: relative;
+    /*border-bottom: 1px solid #ededed;*/
+}
+
+.other_info_table_wrap{
+    height: calc(50% - 20px);
+}
+
+.abnormal_table_wrap:before{
+    content: '异常信息';
+    position: absolute;
+    top: -12px;
+    left: 20px;
+    background: white;
+    padding: 2px 5px;
+    color: #9e9e9e;
+}
+
+.playBackForm .playBackButton{
+    width: 90%;
+    margin-left: 5%;
+    border: 0 !important;
+    background-image: none !important;
+    background-color: #00aff2;
+}
+
+
+.ct_table.gps-road-info dl dt:nth-of-type(1), .ct_table.gps-road-info  dl dd:nth-of-type(1) {
+    width: 26%;
+    text-indent: 15px;
+}
+.ct_table.gps-road-info dl dt:nth-of-type(2), .ct_table.gps-road-info  dl dd:nth-of-type(2) {
+    width: 16%;
+}
+.ct_table.gps-road-info dl dt:nth-of-type(3), .ct_table.gps-road-info  dl dd:nth-of-type(3) {
+    width: 57%;
+    border-right: 0;
+}
+
+
+.inout_table_wrap .ct_table dl dt:nth-of-type(1), .inout_table_wrap .ct_table dl dd:nth-of-type(1){
+    width: 36%;
+    text-indent: 12px;
+}
+.inout_table_wrap .ct_table dl dt:nth-of-type(2), .inout_table_wrap .ct_table dl dd:nth-of-type(2){
+    width: 21%;
+}
+.inout_table_wrap .ct_table dl dt:nth-of-type(3), .inout_table_wrap .ct_table dl dd:nth-of-type(3){
+    width: 20%;
+}
+.inout_table_wrap .ct_table dl dt:nth-of-type(4), .inout_table_wrap .ct_table dl dd:nth-of-type(4){
+    width: 11%;
+}
+.inout_table_wrap .ct_table dl dt:nth-of-type(5), .inout_table_wrap .ct_table dl dd:nth-of-type(5){
+    width: 11%;
+    border-right: 0;
+}
+
+.abnormal_table_panel .ct_table dl dt:nth-of-type(1), .abnormal_table_panel .ct_table dl dd:nth-of-type(1){
+    width: 28%;
+    text-indent: 12px;
+}
+.abnormal_table_panel .ct_table dl dt:nth-of-type(2), .abnormal_table_panel .ct_table dl dd:nth-of-type(2){
+    width: 26%;
+}
+.abnormal_table_panel .ct_table dl dt:nth-of-type(3), .abnormal_table_panel .ct_table dl dd:nth-of-type(3){
+    width: 26%;
+}
+.abnormal_table_panel .ct_table dl dt:nth-of-type(4), .abnormal_table_panel .ct_table dl dd:nth-of-type(4){
+    width: 19%;
+    border-right: 0;
+}
+
+
+.playBackForm .ct_table .ct_table_body dl:last-child dd{
+    border-bottom: 1px solid #dedede;
+}
+
+.ct_table.gps-road-info .ct_table_head,
+.inout_table_wrap .ct_table .ct_table_head,
+.abnormal_table_panel .ct_table .ct_table_head{
+    background: none;
+    background-image: linear-gradient(to right,rgba(255, 255, 255, 0) 1% ,#eee 7% ,#eee 99%);
+}
+
+#map-playback2-modal .uk-accordion-title{
+    margin-bottom: 5px;
+    border-radius: 0;
+    font-size: 15px;
+    font-weight: 600;
+    border-right: 0;
+}
+
+.cc_info_accordion ul{
+    background: #efefef;
+}
+
+.cc_info_accordion ul li{
+    cursor: default;
+    padding: 5px 9px;
+    background: #fff;
+    margin-top: 1px;
+    -webkit-border-start: 6px solid transparent;
+    -webkit-padding-start: 18px;
+    user-select: none;
+}
+
+.cc_info_accordion ul li:hover,
+.cc_info_accordion ul li.active{
+    background: #d5fff6;
+    -webkit-border-start-color: #1bbc9b;
+}
+
+.cc_info_accordion .uk-accordion-content{
+    padding: 0;
+}
+.cc_info_accordion{
+    height: calc(100% - 40px);
+    overflow: auto;
 }
 \ No newline at end of file
@@ -2,17 +2,593 @@
     <div class="uk-modal-dialog uk-modal-dialog-blank">
         <button class="uk-modal-close uk-close" type="button"></button>
         <div class="uk-grid uk-flex-middle" data-uk-grid-margin>
-            <div class="uk-width-medium-1-10 uk-height-viewport z-depth-viewport" >
+            <div class="uk-width-medium-1-10 uk-height-viewport z-depth-viewport">
+                <h5 style="color: #868484;text-indent: 5px;">
+                    线路配车
+                </h5>
+                <div class="uk-accordion cc_info_accordion" data-uk-accordion data-uk-observe>
+                </div>
+
             </div>
-            <div class="uk-width-medium-2-10 uk-height-viewport z-depth-viewport">
+            <div class="uk-width-medium-2-10 uk-height-viewport z-depth-viewport ">
+                <form class="uk-form uk-form-horizontal playBackForm">
+                    <div class="uk-grid">
+                        <div class="uk-width-1-1">
+                            <div class="uk-form-row">
+                                <label class="uk-form-label">车辆编码</label>
+                                <div class="uk-form-controls">
+                                    <div class="uk-autocomplete uk-form autocomplete-nbbm">
+                                        <input name="nbbm" required/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="uk-grid">
+                        <div class="uk-width-2-3">
+                            <div class="uk-form-row">
+                                <label class="uk-form-label">开始时间</label>
+                                <div class="uk-form-controls">
+                                    <input name="sDate" type="date" required/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="uk-width-1-3" style="padding-left: 15px;">
+                            <div class="uk-form-row">
+                                <div class="uk-form-controls" style="margin-left: 0;">
+                                    <input name="sTime" type="time" required/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="uk-grid">
+                        <div class="uk-width-2-3">
+                            <div class="uk-form-row">
+                                <label class="uk-form-label">结束时间</label>
+                                <div class="uk-form-controls">
+                                    <input name="eDate" type="date" required/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="uk-width-1-3" style="padding-left: 15px;">
+                            <div class="uk-form-row">
+                                <div class="uk-form-controls" style="margin-left: 0;">
+                                    <input name="eTime" type="time" required/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="uk-grid">
+                        <button class="uk-button uk-button-large uk-button-primary playBackButton" type="submit"><i
+                                class="uk-icon-search"> </i> 搜索轨迹
+                        </button>
+                    </div>
+                </form>
+                <!-- 异常警报 -->
+                <div class="abnormal_table_wrap">
+                    <div class="abnormal_table_panel"
+                         style="height: calc(100% - 15px);margin-top: 15px;overflow: auto;">
+                        <div class="ct_table abnormal_table" style="height: calc(100% - 30px);">
+                            <div class="ct_table_head">
+                                <dl>
+                                    <dt>异常状态</dt>
+                                    <dt>开始时间</dt>
+                                    <dt>结束时间</dt>
+                                    <dt>图像</dt>
+                                </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>
+                </div>
+                <!-- 路段 和 到离站信息 -->
+                <div class="uk-margin uk-grid other_info_table_wrap" data-uk-grid-margin>
+                    <div class="uk-width-medium-1-1" style="padding-left: 0;">
+
+                        <ul class="uk-tab" data-uk-tab="{connect:'#real_gps_info_tab_content'}"
+                            style="padding-left: 12px;">
+                            <li class="uk-active"><a>行车轨迹</a></li>
+                            <li><a>到离站信息</a></li>
+                        </ul>
+
+                        <ul id="real_gps_info_tab_content" class="uk-switcher uk-margin"
+                            style="height: calc(100% - 44px);margin-top: 7px;">
+                            <li class="uk-active" style="height: 100%;">
+                                <div class="road_table_wrap" style="height: 100%;overflow: auto;">
+                                    <div class="ct_table gps-road-info"
+                                         style="height: calc(100% - 30px);">
+                                        <div class="ct_table_head">
+                                            <dl>
+                                                <dt>时间</dt>
+                                                <dt>速度</dt>
+                                                <dt>所在路段</dt>
+                                            </dl>
+                                        </div>
+                                        <div class="ct_table_body">
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                            <!-- 到离站数据 -->
+                            <li style="height: 100%;">
+                                <div class="inout_table_wrap" style="height: 100%;overflow: auto;">
+                                    <div class="ct_table" style="height: calc(100% - 30px);">
+                                        <div class="ct_table_head">
+                                            <dl>
+                                                <dt>站点</dt>
+                                                <dt>到站时间</dt>
+                                                <dt>离站时间</dt>
+                                                <dt>上客</dt>
+                                                <dt>下客</dt>
+                                            </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>
+                            </li>
+                        </ul>
+
+                    </div>
+                </div>
             </div>
-            <div class="uk-width-medium-7-10 uk-height-viewport">
+            <div class="uk-width-medium-7-10 uk-height-viewport map-wrap">
             </div>
         </div>
     </div>
+
+    <script id="cc_info_accordion_cont_temp" type="text/html">
+        {{each ccInfo as cc i}}
+        <h3 class="uk-accordion-title">{{cc.name}}</h3>
+        <div class="uk-accordion-content">
+            <ul class="uk-list">
+                {{each cc.cars as c j}}
+                <li>{{c}}</li>
+                {{/each}}
+            </ul>
+        </div>
+        {{/each}}
+    </script>
+
+    <script id="gps_road_info_cont_temp" type="text/html">
+        {{each array as gps i}}
+        <dl data-code="{{gps.road.road_CODE}}">
+            <dd>{{gps.timeStr}}</dd>
+            <dd>{{gps.speed}}</dd>
+            <dd>{{gps.road.road_NAME}}</dd>
+        </dl>
+        {{/each}}
+    </script>
     <script>
         (function () {
-            var modal = '#map-playback2-modal';
+            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();
+
+                //固定表头
+                gb_ct_table.fixedHead($('.road_table_wrap', modal));
+                gb_ct_table.fixedHead($('.inout_table_wrap', modal));
+                gb_ct_table.fixedHead($('.abnormal_table_panel', modal));
+                //线路配车
+                ccInfo.init();
+
+                //表单初始值
+                searchForm.init(data);
+            });
+
+            /**
+             * 线路配车相关
+             */
+            var ccInfo = (function () {
+
+                function init() {
+                    $.get('/basic/ccInfo', function (rs) {
+                        var ccInfo = [], lines = gb_data_basic.codeToLine;
+                        for (var code in lines) {
+                            ccInfo.push({
+                                name: lines[code].name,
+                                cars: carSort(rs[code])
+                            });
+                        }
+
+                        var htmlStr = template('cc_info_accordion_cont_temp', {ccInfo: ccInfo});
+                        $('.cc_info_accordion', modal).html(htmlStr)
+                                .find('.uk-list li').on('click', itemClick);
+                    });
+                }
+
+                function carSort(list) {
+                    if (!list)
+                        return [];
+                    return list.sort();
+                }
+
+                function itemClick() {
+                    $(this).parent().find('li.active').removeClass('active');
+                    $(this).addClass('active');
+                    searchForm.setNbbm($(this).text());
+                }
+
+                return {
+                    init: init
+                };
+            })();
+
+            /**
+             * 搜索表单相关
+             */
+            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 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;
+                                }
+
+                                //行车轨迹
+                                trailTableObj.showInitData(gpsArray);
+                            }
+                        });
+                    }
+                    return false;
+                };
+                return {
+                    init: init,
+                    setNbbm: setNbbm
+                };
+            })();
+
+            /**
+             * 行车轨迹表格
+             */
+            var trailTableObj = (function () {
+
+                var showInitData = function (list) {
+                    var array = [];
+                    for (var i = 0, gps; gps = list[i++];) {
+                        //格式化时间
+                        gps.timeStr = moment(gps.timestamp).format('HH:mm.ss');
+                        try {
+                            if (i > 0 && array[array.length - 1].road.road_CODE == gps.road.road_CODE)
+                                array.pop();
+                        }
+                        catch (e) {}
+
+                        if (gps.road)
+                            array.push(gps);
+                    }
+
+                    var htmlStr = template('gps_road_info_cont_temp', {array: array});
+                    $('.gps-road-info .ct_table_body', modal).html(htmlStr);
+                };
+
+                return {
+                    showInitData: showInitData
+                };
+            })();
         })();
     </script>
-</div>
+</div>
 \ No newline at end of file