Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts: # src/main/resources/static/real_control_v2/js/modal_extend.js # src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
# Conflicts: # src/main/resources/static/real_control_v2/js/modal_extend.js # src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
潘钊
2 parents 67553852 358a13c2
Showing 26 changed files with 1888 additions and 902 deletions
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/StationRouteService.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/StationRouteServiceImpl.java
src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
src/main/resources/static/pages/base/stationroute/list.html
src/main/resources/static/pages/base/stationroute/tzzj.html
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/tagsinput.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTable.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
@@ -111,7 +111,6 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	 */
 	@RequestMapping(value = "/findStationRouteInfo",method = RequestMethod.GET)
 	public List<Map<String, Object>> findStationRouteInfo(@RequestParam Map<String, Object> map) {
-		
 		return service.findStationRouteInfo(map);
 	}
@@ -140,4 +139,13 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
     	return service.updSwitchDir(lineIds);
     }
+    /**
+     * 
+     * @Title: upddis 
+     * @Description: TODO(更新站距) 
+     */
+    @RequestMapping(value = "/upddis",method = RequestMethod.POST)
+	public Map<String, Object> upddis(@RequestParam Map<String, Object> map) {
+		return service.upddis(map);
+	}
 }
@@ -272,4 +272,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
     @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
 	public void stationRouteDir(Integer line);
+    
+    @Modifying
+    @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
+	public void upddis(Integer id,Double dis);
 }
@@ -137,7 +137,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -82,4 +82,6 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 Map<String, Object> findByMultiLine(String lineIds);
 	 Map<String, Object> updSwitchDir(String lineIds);
+	 
+	 Map<String, Object> upddis(Map<String, Object> map);
 }
-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.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;
-    }
-}
+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;
+    }
+}
@@ -1100,4 +1100,24 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return rs;
 	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> upddis(Map<String, Object> map) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			Iterator it = map.entrySet().iterator();
+			while(it.hasNext()){
+			      java.util.Map.Entry entry = (java.util.Map.Entry)it.next();
+			      Integer id = Integer.parseInt(entry.getKey().toString().split("_")[1]);      //返回对应的键
+			      Double dis = Double.parseDouble(entry.getValue().toString()) / 1000;  //返回对应的值
+			      repository.upddis(id, dis);
+			}
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
@@ -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>
@@ -168,6 +168,13 @@ var GetAjaxData = function(){
 			},
 			// 查询路段信息
+			getStationRouteInfo : function(lineId,direction,callback) {
+				$get('/stationroute/all',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
+					callback && callback(resultdata);
+				});
+			},
+			
+			// 查询路段信息
 			getSectionRouteInfo : function(lineId,direction,callback) {
 				$get('/sectionroute/findSection',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
 					callback && callback(resultdata);
@@ -122,6 +122,27 @@ $(function(){
 		});*/
 	});
+	$('#wrenchUpDis').on('click',function() {
+		var Line = LineObj.getLineObj();
+		GetAjaxData.getStation(Line.id,directionUpValue,function(rd) {
+			// 加载其它规划选择弹出层mobal页面
+			$.get('tzzj.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,Line.id,PublicFunctions,rd[0].children[0].children]);
+			});
+		});
+	})
+	
+	$('#wrenchDownDis').on('click',function() {
+		var Line = LineObj.getLineObj();
+		GetAjaxData.getStation(Line.id,directionDownValue,function(rd) {
+			// 加载其它规划选择弹出层mobal页面
+			$.get('tzzj.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,Line.id,PublicFunctions,rd[0].children[0].children]);
+			});
+		});
+	})
 	$('#quoteDown').on('click',function() {
 		// 弹出提示层.
@@ -63,6 +63,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="wrenchUpDis"><i class="fa fa-wrench"></i>  设置上行站距</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
 			                                                </li>
 			                                                <!-- <li>
@@ -154,6 +158,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="wrenchDownDis"><i class="fa fa-wrench"></i>  设置下行站距</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i>  引用上行路段</a>
 			                                                </li>
 			                                                <!-- <li>
+<!-- 调整站距 -->
+<div class="modal fade" id="tzzj_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">调整站距 </h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post" id="tzbcForm" role="form">
+					<!-- alert-danger 组件START -->
+					<div class="alert alert-danger display-hide" id="tzbcAlert">
+						<button class="close" data-close="alert"></button>
+							您的输入有误，请检查下面的输入项
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_bctz">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="1%"></th>
+										<th width="33%">站点序号</th>
+										<th width="33%">站点路由</th>
+										<th width="33%">站距(米/单位)</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+						</div>
+					</div>
+			    </form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="tzbcnext">保存</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="tzzj_temp">
+{{each list as obj i }}
+	<tr role="row" class="filter">
+		<td></td>
+		<td>
+			<!--<input type="text" readonly  class="form-control form-filter input-sm"  value="{{i+1}}">-->
+			{{i+1}}
+		</td>
+		<td>
+			<!-- <input type="text" readonly  class="form-control form-filter input-sm" name="station_{{i+1}}" value="{{obj.name}}">-->
+			{{obj.name}}
+		</td>
+		<td>
+			<input type="text" class="form-control form-filter input-sm" name="dis_{{obj.stationRouteId}}" value="{{obj.stationRouteDistances * 1000}}">
+		</td>
+	</tr>
+{{/each}}
+{{if list.length == 0}}
+		<tr>
+			<td colspan=4><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#tzzj_mobal').on('tzzjMobal.show', function(e,map,gd,dir,lineid,pf,rd){
+	setTimeout(function(){
+		// 加载延迟200毫秒显示mobal
+		$('#tzzj_mobal').modal({show : true,backdrop: 'static', keyboard: false});
+	},200);
+	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+	$('#tzzj_mobal').on('show.bs.modal', function () {
+		console.log(rd);
+		// 把数据填充到模版中
+		var tbodyHtml = template('tzzj_temp',{list:rd});
+		// 把渲染好的模版html文本追加到表格中
+		$('#datatable_bctz tbody').html(tbodyHtml);
+	});
+	// 获取表单元素
+	var form = $('#tzbcForm');
+	// 错误提示元素
+	var tzbcAlert = $('#tzbcAlert', form);
+	// 下一步点击事件
+	$('#tzbcnext').on('click', function() {
+		form.submit();// 表单提交
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span', 
+		errorClass : 'help-block help-block-error', 
+		focusInvalid : false, 
+		rules : {
+		},
+		invalidHandler : function(event, validator) {  
+			tzbcAlert.show();
+			App.scrollTo(reladplusname, -200);
+		},
+		highlight : function(element) { 
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		unhighlight : function(element) { 
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		success : function(label) {
+			label.closest('.form-group').removeClass('has-error'); 
+		},
+		submitHandler : function(f) {
+			// 获取表单内容,并序列化
+			var params = form.serializeJSON();
+			$post('/stationroute/upddis',params,function(data) {
+				// 隐藏错误提示
+				tzbcAlert.hide();
+				// 隐藏 reladplus_mobal 弹出层 
+				$('#tzzj_mobal').modal('hide');
+				if(data.status=='SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+					map.clearMarkAndOverlays();
+					// 刷新左边树
+					pf.resjtreeDate(lineid,dir);
+					pf.resjtreeDate(lineid,dir);
+					/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+					gd.getSectionRouteInfo(lineid,dir,function(data) {
+						/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+						pf.linePanlThree(lineid,data,dir);
+					});
+				}else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+			});
+		}
+	});
+});
+</script>
 \ No newline at end of file
@@ -9,7 +9,6 @@
     width: 69%;
 }
 </style>
-
 <!-- 片段标题 START -->
 <div class="page-head">
 	<div class="page-title">
@@ -17,8 +16,6 @@
 	</div>
 </div>
 <!-- 片段标题 END -->
-
-
 <!-- 线路信息导航栏组件 START -->
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
@@ -26,8 +23,6 @@
 	<li><span class="active">时刻表明细制作建模</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
-
-
 <div class="portlet light bordered" id="form-wizard-info">
 	<div class="portlet-title">
 		<div class="caption">
@@ -44,7 +39,6 @@
 		</div>
 	</div>
 	<div class="portlet-body form">
-	
 		<!-- START FORM 表单容器 -->
 		<form class="form-horizontal" id="submit_argus_form"  action="/" method="POST" novalidate="novalidate">
 			<div class="form-wizard">
@@ -94,7 +88,6 @@
 							<button class="close" data-dismiss="alert"></button> 
 							 验证成功! 
 						</div>
-						
 						<!-- 线路名称 -->
                        	<div class="tab-pane active" id="tab1">
                        		<h3 class="block"> 选择时刻表 </h3>
 /**
- * 表单的导航向导、验证、提交
- * 
+ * @description : (TODO) 表单的导航向导、验证、提交
  */
 var SKBFormWizard = function() {
+	
+	var bxrcGs = [ {'type':'六工一休','hoursV':6.66,  'minueV':'6:40'},
+		           {'type':'五工一休','hoursV':6.85,  'minueV':'6:51'},
+		           {'type':'四工一休','hoursV':7.14,  'minueV':'7:08'},
+		           {'type':'三工一休','hoursV':7.61,  'minueV':'7:37'},
+		           {'type':'二工一休','hoursV':8.57,  'minueV':'8:34'},
+		           {'type':'一工一休','hoursV':11.42, 'minueV':'11:25'},
+		           {'type':'五工二休','hoursV':7.99,  'minueV':'8:00'},
+		           {'type':'无工休',  'hoursV':5.43,  'minueV':'5:43'}];
+	
+	/**
+	 * @description : (TODO) 获取停站时间.
+	 * 
+	 * @param [o--当前班次对象;d--班次数组对象;sj--当前班次时间]
+	 * 
+	 * @return 返回相邻班次的停站时间.
+	 * */
+	function gettzsj(o,d,sj) {
+		// 定义停站时间.
+		var tzsj = 0;
+		// 变量班次数组对象.
+		for(var i = 0 ;i<d.length;i++) {
+			// 判断是否为同一个路牌.
+			if(o.lp.lpNo == d[i].lp.lpNo && o.lp.id == d[i].lp.id) {
+				// 判断是否为当前班次的下一个班次.
+				if(d[i].fcno - o.fcno ==1){
+					// 计算停站时间.
+					tzsj = (strToTime(d[i].fcsj) -strToTime(sj)) / 60000; 
+					continue;
+				}
+			}
+		}
+		// 返回停站时间.
+		return tzsj;
+	}
+	
+	/**
+	 * @description : (TODO) 是否切换线路值转换.
+	 * 
+	 * @param [d--是否切换线路原始值].
+	 * 
+	 * @return 返回一个是否切换线路值的转换.
+	 * */
+	function isSwitchXlTodm(d) {
+		var rstr = 0;
+		if(d)
+			rstr = 1;
+		return rstr;
+	}
+	
+	/**
+	 * @description : (TODO) 是否分班值转换.
+	 * 
+	 * @param [d--是否分班原始值].
+	 * 
+	 * @return 返回一个是否分班值的转换.
+	 * */
+	function isfbTodm(b) {
+		var rstr = 0;
+		if(b)
+			rstr = 1;
+		return rstr;
+	}
+	
+	/**
+	 * @description : (TODO) 获取某个班次的到达时间字符串.
+	 * 
+	 * @param [tStr--发车时间格式字符串;bcsj--班次历时].
+	 * 
+	 * @return 返回一个某个班次的到达时间字符串.
+	 * */
+	function getddsj(tStr,bcsj) {
+		// 定义当前时间对象.
+		var date = new Date();
+		// 分割字符串.
+		var _str = tStr.split(':');
+		// 设值小时.
+		date.setHours(parseInt(_str[0]));
+		// 设值分钟.
+		date.setMiutes(parseInt(_str[1]) + bcsj);
+		// 返回到达时间字符串.
+		return getTimeStr(date);
+	}
+	
+	/**
+	 * @description : (TODO) 时间点格式字符串转时间对象.
+	 * 
+	 * @param [t--时间点格式字符串]
+	 * 
+	 * @return 返回一个时间点格式字符串转时间对象.
+	 * */
+	var strToTime = function(t) {
+		// 定义当前时间对象.
+		var d = new Date;
+		// 判断是否为空.
+		if(t) {
+			// 分割字符串.
+			var _str = t.split(':');
+			// 设值小时.
+			d.setHours(parseInt(_str[0]));
+			// 设值分钟.
+			d.setMinutes(parseInt(_str[1]));
+		}
+		// 返回一个时间点格式字符串转时间对象.
+		return d;
+	}
+	
+	/**
+	 * @description : (TODO) 时间对象转时间点格式字符串.
+	 * 
+	 * @param [t--时间对象]
+	 * 
+	 * @return 返回一个时间对象转时间点格式字符串.
+	 * */
+	function getTimeStr(t) {
+		// 定义返回值.
+		var _str = '';
+		// 判断是否为空.
+		if(t) {
+			// 重新赋值.
+			_str = ((t.getHours()<10? '0' + t.getHours() : t.getHours()) == '00' ? '24' :(t.getHours()<10? '0' + t.getHours() : t.getHours()))
+			  		+':' 
+			  		+(t.getMinutes()<10? '0' + t.getMinutes() : t.getMinutes());
+		}
+		// 返回时间对象转时间点格式字符串.
+		return _str;
+	}
+	
+	/**
+	 * @description : (TODO) 方向值转换.
+	 * 
+	 * @param [d--方向原始值].
+	 * 
+	 * @return 返回一个方向值转换.
+	 * */
+	function dmToDh(t) {
+		// 定义返回值.
+		var reslStr = '';
+		// 上行.
+		if(t=='0')
+			reslStr = 'relationshipGraph-up';
+		// 下行.
+		else if(t=='1')
+			reslStr = 'relationshipGraph-down';
+		// 返回一个方向值转换.
+		return reslStr; 
+	}
+	
+	/**
+	 * @description : (TODO) 获取线路标准详情.
+	 * 
+	 * @param [lineId--线路ID;cb--回调函数].
+	 * 
+	 * @return 返回线路标准详情.
+	 * 
+	 * @status OK.
+	 * */
 	var getLineInfo = function(lineId,cb) {
-		// 根据线路标准ID查询详情
+		// 1、get异步请求.根据线路ID查询详情.
 		$get('/lineInformation',{'line.id_eq':lineId},function(result) {
+			// 2、返回线路标准详情.
 			return cb && cb(result);
 		});
 	}
+	
+	/**
+	 * @description : (TODO) 获取所有的停车场详情.
+	 * 
+	 * @param [cb--回调函数].
+	 * 
+	 * @return 返回所有的停车场详情.
+	 * 
+	 * @status OK.
+	 * */
 	var gettccInfo = function (cb) {
+		// 1、get异步请求.获取所有的停车场详情.
 		$get('/carpark/all',null, function(cd){
+			// 2、返回所有的停车场详情.
 			return cb && cb(cd);
 		});
 	}
+	/**
+	 * @description : (TODO) 时间格式字符串转时间对象.
+	 * 
+	 * @param [time--时间格式字符串].
+	 * 
+	 * @return 返回一个时间对象.
+	 * 
+	 * @status OK.
+	 * */
 	var getDateTime = function(time) {
+		// 1、定义一个时间对象.
 		var dateTime = new Date();
+		// 2、判断参数是否为空或者为undefined.
 		if(time !=null && time !='' && typeof(time) !='undefined') {
+			// 3、给时间对象重新赋值.
 			dateTime = new Date(Date.parse(time.replace(/-/g, "/")));
 		}
+		// 4、返回时间对象.
 		return dateTime;
 	}
-	
+	/**
+	 * @description : (TODO) 客流方式填充表单时.根据表单参数封装时间段内的车辆数.
+	 * 
+	 * @param : [map--表单参数]
+	 * 
+	 * @returns 返回一个根据表单参数封装时间段内的车辆数数组.
+	 * 
+	 * @status OK.
+	 * */
 	function getsjdArr(map) {
+		// 1、获取营运的开始与结束时间点.
 		var seMap = getStartAndEndDate(map);
-		return [{'num':0,'time':seMap.s + '-' + map.earlyStartTime},
-		        {'num':0,'time':map.earlyStartTime + '-' + map.earlyEndTime},
-		        {'num':0,'time':map.earlyEndTime + '-' + map.lateStartTime},
-		        {'num':0,'time':map.lateStartTime + '-' + map.lateEndTime},
-		        {'num':0,'time':map.lateEndTime + '-' + seMap.e}];
+		// 2、返回一个根据表单参数封装时间段内的车辆数数组.
+		return [{'num':0,'time':seMap.s + '-' + map.earlyStartTime},// 早高峰之前时间段内的车辆.
+		        {'num':0,'time':map.earlyStartTime + '-' + map.earlyEndTime}, // 早高峰时间段内的车辆.
+		        {'num':0,'time':map.earlyEndTime + '-' + map.lateStartTime},// 高峰之间时间段内的车辆
+		        {'num':0,'time':map.lateStartTime + '-' + map.lateEndTime},// 晚高峰时间段内的车辆.
+		        {'num':0,'time':map.lateEndTime + '-' + seMap.e}];// 晚高峰之后时间段内的车辆.
 	}
-	
-	function getStartAndEndDate(map) {
-		return {'s':getMinDate(map.line.startStationFirstTime,map.line.endStationFirstTime),
-				'e':getMaxDate(map.line.startStationEndTime,map.line.endStationEndTime)}
-	}
-	
+	 
+	/**
+	 * @description : (TODO) 获取最小时间(字符串).
+	 * 
+	 * @param [d1--时间1;d2--时间2].
+	 * 
+	 * @return 返回一个最小时间(字符串).
+	 * 
+	 * @status OK.
+	 * */
 	function getMinDate(d1,d2) {
+		// 1、定义返回字符串.
 		var str = '';
+		// 2、判断时间大小.
 		if(strToTime(d1)>strToTime(d2))
 			str = d2;
 		else
 			str = d1;
+		// 3、返回最小时间(字符串).
 		return str;
 	}
-	function strToTime(t) {
-		var d = new Date();
-		if(t) {
-			var _str = t.split(':');
-			d.setHours(parseInt(_str[0]));
-			d.setMinutes(parseInt(_str[1]));
-		}
-		return d;
-	}
-	
+	/**
+	 * @description : (TODO) 获取最大时间(字符串).
+	 * 
+	 * @param [d1--时间1;d2--时间2].
+	 * 
+	 * @return 返回一个最大时间(字符串).
+	 * 
+	 * @status OK.
+	 * */
 	function getMaxDate(d1,d2) {
+		// 1、定义返回时间字符串.
 		var str = '';
+		// 2、判断时间大小.
 		if(strToTime(d1)>strToTime(d2))
 			str = d1;
 		else
 			str = d2;
+		// 3、返回一个最大时间(字符串).
 		return str;
 	}
+	/**
+	 * @description : (TODO) 判断是否这时间段内.
+	 * 
+	 * @param [st--开始时间;ed--结束时间;sj--当前判断的时间]
+	 * 
+	 * @return 返回一个布尔值.
+	 * 
+	 * @status OK.
+	 * */
 	function issjd(st,ed,sj) {
+		// 1、定义返回值.
 		var tag = false;
+		// 2、判断时间大小.
 		if(sj<=ed  && sj>=st)
+			// 3、重新赋值返回值.
 			tag = true;
+		// 4、返回判断结果布尔值.
 		return tag;
 	}
+	/**
+	 * @description : (TODO) 获取客流数据.
+	 * 
+	 * @params [url--请求地址;data--请求参数;cb--回调函数]
+	 * 
+	 * */
+	function getJSONP(url, data, cb) {
+		$.ajax({
+			url : url,
+			type : "GET",
+			dataType : 'jsonp',
+			jsonp : 'jsoncallback',
+			data : data,
+			success : cb
+		});
+	}
+	
+	/**
+	 * @description : (TODO) 根据获取参数方式来获取表单参数详情html模版页.
+	 * 
+	 * @param [n--获取参数方式;map--表单参数;lineId--线路ID;krl--客容量;cb--回调函数]
+	 * 
+	 * @return 返回表单参数详情html模版页.
+	 * 
+	 * @status OK.
+	 * */
 	var getHtmlTemp = function(n,map,lineId,krl,cb) {
-		var zzsj =  parseInt(map.upTravelTime) + 10*2 + parseInt(map.downTravelTime);
+		// 1、定义模版名称.
 		var tempName = '';
-		var date = new Date(),
-			rq = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + (date.getDate()-3);
-		var startDateTime = rq + ' ' + '00:00';
-		var endDateTime  =  rq  + ' ' + '23:59';
-		var params = {'xlid':'10773','startDateTime':startDateTime,'endDateTime':endDateTime,'zzsj':zzsj};
-		if(n==0) {
+		if(n==0) 
 			tempName = 'carnum_temp';
-    	}else if(n==1) {
-    		tempName = 'bctype_temp';
-    	} 
+		else if(n==1)
+			tempName = 'bctype_temp';
+		// 2、获参数详情模版html内容.
 		$.get('/pages/base/timesmodel/tepms/'+ tempName + '.html', function(html){
 			$('#tab3').append(html);
-			map.lb = 15;
-			map.workeLunch = 20;
-			map.workeDinner = 20;
-			map.mixstopTime = 3;
-			map.maxstopTime = 20;
-			map.stopTime = 10;
+			map.lb = 15;// 定义例保时间.
+			map.workeLunch = 20;// 定义午餐时间.
+			map.workeDinner = 20;// 定义晚餐时间.
+			map.mixstopTime = 3;// 定义最小停站间隙
+			map.maxstopTime = 22;// 定义最大停站间隙.
+			map.stopTime = 10;// 定义停站时间.
 			if(n==0) {
-				getJSONP("http://139.196.13.237:8080/bsth-busfareflow-gj/Crlcxb/selectsjbctgl.do",params,function(json){ 
-					console.log(json);
+				// 定义一个周转时间.
+				var zzsj =  parseInt(map.upTravelTime) + 10*2 + parseInt(map.downTravelTime);
+				// 定义时间对象.
+				var date = new Date(),
+					rq = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + (date.getDate()-7);
+				// 定义开始时间字符串.
+				var startDateTime = rq + ' ' + '00:00';
+				// 定义结束时间自妇产.
+				var endDateTime  =  rq  + ' ' + '23:59';
+				// 定义请求参数集合.
+				var params = {'xlid':lineId,'startDateTime':startDateTime,'endDateTime':endDateTime,'zzsj':zzsj};
+				/**
+				 * getJSONP请求获取客流数据.
+				 * 
+				 * 返回的是一个每次以半小时为间隔作为开始时间点, 在加上周转时间作为结束时间点的 时段段内的客流最大通过量.
+				 * */ 
+				getJSONP("http://139.196.13.237:8080/bsth-busfareflow-gj/Crlcxb/selectsjbctgl.do",params,function(json){
+					// 定义时段集合,可容量.
 					var sjdArr = getsjdArr(map),krlInt = parseInt(krl);
+					// 遍历时段集合.
 					for(var s = 0 ; s<sjdArr.length;s++) {
+						// 分割时间段.
 						var strA = sjdArr[s].time.split('-');
+						// 定义开始时间与结束时间,车辆数.
 						var st = getDateTime(rq + ' '  + strA[0]),et = getDateTime(rq + ' '  + strA[1]),num = 0;
+						// 遍历时间段内的客流数据集合.
 						for(var j = 0 ; j < json.length; j ++) {
+							// 定义当前客流班次产生的时间.
 							var dqsj = getDateTime(json[j].sj);
+							// 判断是否这时间段内.
 							if(issjd(st,et,dqsj)) {
+								// 车辆数相加.
 								num = num + Math.ceil(parseInt(json[j].tgl)/krlInt);
 							}
 						}
 						sjdArr[s].num = num;
 					}
-					/*map.zgfbeforepcs = sjdArr[0].num; 
-					map.zgfpcs = sjdArr[1].num;
-					map.gfzjpcs = sjdArr[2].num;
-					map.wgfpcs = sjdArr[3].num;
-					map.wgfafterpcs = sjdArr[4].num;*/
-					map.zgfbeforepcs = 3; 
-					map.zgfpcs = 10;
-					map.gfzjpcs = 8;
-					map.wgfpcs = 10;
-					map.wgfafterpcs = 5;
-					
+					map.zgfbeforepcs = sjdArr[0].num;// 早高峰前配车数
+					map.zgfpcs = sjdArr[2].num;// 早高峰配车数
+					map.gfzjpcs = sjdArr[4].num;// 高峰之间配车数
+					map.wgfpcs = sjdArr[2].num ;// 晚高峰配车数
+					map.wgfafterpcs = sjdArr[1].num + sjdArr[3].num;// 晚高峰后配车数
+					// 返回参数详情模版.
 					return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
 				}); 
 			}else if(n==1) {
+				// 返回参数详情模版.
 				return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
 			}
 		});
 	}
-	var getCarNumber = function (param,cb) {
-		$post('url',param,function(data) {
-			return cb && cb(data);
-		})
+	
+	/**
+	 * @description (TODO) 格式化成渲染图形数据格式.
+	 * 
+	 * @param [d--查询出的时刻表明细数据.]
+	 * 
+	 * @return 返回渲染图形的数据格式.
+	 * */
+	function formatData(d) {
+		// 定义返回值.
+		var resultD = new Array();
+		for(var i =0;i<d.length;i++) {
+			var obj = {};
+			var ddsj = getddsj(d[i].fcsj,d[i].bcsj);// 到达时间.
+			obj.bcType = d[i].bcType;// 班次类型
+			obj.bcs = d[i].bcs;// 班次数
+			obj.bcsj = d[i].bcsj;// 班次时间
+			obj.fcno = d[i].fcno;// 发车序号
+			obj.fcsj = d[i].fcsj;// 发车时间
+			obj.ARRIVALTIME = ddsj// 到达时间
+			obj.jhlc = d[i].jhlc;// 计划里程
+			obj.lp = d[i].lp==null ? null : d[i].lp.id;// 路牌id
+			obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;// 路牌类型
+			obj.parent = d[i].lp.lpName;// 路牌名称
+			obj.lpNo = d[i].lp.lpNo;// 路牌编码
+			obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;// 停车场id
+			obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;// 时刻表id
+			obj.xl = d[i].xl==null ? null : d[i].xl.id;// 线路id
+			obj.xlDir = dmToDh(d[i].xlDir);// 方向【0：relationshipGraph-up 上行；1：relationshipGraph-down 下行】
+			obj.qdz = d[i].qdz==null ? null : d[i].qdz.id;// 起点站id
+			obj.zdz = d[i].zdz==null ? null : d[i].zdz.id;//终点站id
+			obj.isfb = isfbTodm(d[i].isFB);// 是否分班【0:false；1:true】
+			obj.isSwitchXl = isSwitchXlTodm(d[i].isSwitchXl);// 是否切换线路【0:false；1:true】
+			obj.STOPTIME = gettzsj(d[i],d,ddsj);// 停站时间.
+			resultD.push(obj);
+		}
+		// 返回渲染图形的数据格式.
+		return resultD;
 	}
+	
+	/**
+	 * @description : (TODO) 获取开始与结束时间字符串.
+	 * 
+	 * @param [map--表单配置参数]
+	 * 
+	 * @return 返回开始与结束时间字符串集合.
+	 * */
+	function getStartAndEndDate(map) {
+		return {'s':getMinDate(map.line.startStationFirstTime,map.line.endStationFirstTime),
+				'e':getMaxDate(map.line.startStationEndTime,map.line.endStationEndTime)}
+	}
+	 
 	return {
 		// 启动初始化向导导航
 		init : function() {
@@ -160,11 +461,11 @@ var SKBFormWizard = function() {
 					'earlyEndTime' : {required : true},// 早高峰结束时间,必填项 .
 					'lateStartTime' : {required : true},// 晚高峰开始时间,必填项 .
 					'lateEndTime' : {required : true},// 晚高峰结束时间,必填项.
-					'zgfbeforepcs' : {required : true,number : true,digits : true},// 早高峰前车辆数,必填项、必须为整数.
-					'zgfpcs' : {required : true,number : true,digits : true},// 早高峰车辆数,必填项、必须为整数.
-					'wgfafterpcs' : {required : true,number : true,digits : true},// 晚高峰后车俩数,必填项、必须为整数.
-					'wgfpcs' : {required : true,number : true,digits : true},// 晚高峰车俩数,必填项、必须为整数.
-					'gfzjpcs' : {required : true,number : true,digits : true},// 高峰中间车辆数,必填项、必须为整数.
+					'zgfbeforepcs' : {required : true,number : true,digits : true, isNum0:true},// 早高峰前车辆数,必填项、必须为整数.
+					'zgfpcs' : {required : true,number : true,digits : true, isNum0:true, isMax: true},// 早高峰车辆数,必填项、必须为整数.
+					'wgfafterpcs' : {required : true,number : true,digits : true, isNum0:true},// 晚高峰后车俩数,必填项、必须为整数.
+					'wgfpcs' : {required : true,number : true,digits : true, isNum0:true, isMax: true},// 晚高峰车俩数,必填项、必须为整数.
+					'gfzjpcs' : {required : true,number : true,digits : true, isNum0:true},// 高峰中间车辆数,必填项、必须为整数.
 					'upTravelTime' : {required : true,number : true},// 上行行驶时间,必填项、必须为整数.
 					'downTravelTime' : {required : true,number : true},// 下行行驶时间,必填项、必须为整数.
 					'upMileage' : {required : true,number : true},// 上行行驶里程,必填项、必须为整数.
@@ -192,7 +493,7 @@ var SKBFormWizard = function() {
 					'downInMileage' : {number : true},// 下行进场里程,必须为数字.
 					'downOutMileage' : {number : true},// 下行出场里程,必须为数字.
 					'lb' : {number : true},// 早晚例行保养,必须为数字.
-					'clzs':{required : true,number : true,digits : true},// 车辆总数,必填项、必须为整数.
+					'clzs':{required : true,number : true,digits : true, isBcType : true},// 车辆总数,必填项、必须为整数.
 					'bxrc' : {required : true},// 早晚例行保养,必须为数字.
 				},
@@ -243,10 +544,15 @@ var SKBFormWizard = function() {
 				 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
 				 */
 				submitHandler : function(f) {
+					// 定义localStorage对象.
 					var storage = window.localStorage;
+					// 表单序列化.
 					var argus = form.serializeJSON();
+					// 获取站点路由.
 					$get('/stationroute/all',{'line.id_eq':argus.lineName.split('_')[0]},function(result) {
+						// 判断.
 						if(result) {
+							// 定义上行起点站,上行终点站,下行起点站,下行终点站.
 							var upB ='',upE='',downB='',downE='';
 							for(var r = 0 ; r<result.length;r++) {
 								if(result[r].directions==0 && result[r].stationMark =='B')
@@ -260,14 +566,16 @@ var SKBFormWizard = function() {
 							}
 							argus.up_s = upB + '_' + upE;
 							argus.down_s = downB + '_' + downE;
+							// 获取停车车场.
 							$get('/carpark/all',{'parkCode_eq':argus.tcc},function(cp) {
 								var tcc_id = '';
 								if(cp) {
 									tcc_id = cp[0].id;
 								}
-								argus.tcc_id = tcc_id;
-								argus.skbmc = $('#skbNameSelect').select2('data')[0].text;
-								argus.xlmc = $('#lineSelect').select2('data')[0].text;
+								argus.tcc_id = tcc_id; // 停车场ID.
+								argus.skbmc = $('#skbNameSelect').select2('data')[0].text;// 时刻名称.
+								argus.xlmc = $('#lineSelect').select2('data')[0].text;// 线路名称.
+								// 获取时刻表明细.
 								$get('/tidc/all',{'ttinfo.id_eq':parseInt(argus.skbName)},function(data) {
 									if(data.status=='SUCCESS' && data.data.length>0) {
 										argus.istidc = 1;
@@ -277,7 +585,7 @@ var SKBFormWizard = function() {
 										  btn: ['确定并使用','取消并继续'] //按钮
 										}, function(){
 											layer.closeAll();
-											submit(JSON.stringify(gsData(data.data)),argus);
+											submit(JSON.stringify(formatData(data.data)),argus);
 										}, function(){
 											submit(null,argus);
 										});
@@ -291,6 +599,8 @@ var SKBFormWizard = function() {
 							layer.msg('系统不存在该线路的上、下行起终点站！');
 						}
 					});
+					
+					// 表单提交.
 					function submit(p,argus) {
 						storage.setItem("Gantt_AgursData",JSON.stringify(argus));
 						storage.setItem('isDoDate',p);
@@ -298,110 +608,99 @@ var SKBFormWizard = function() {
 					}
 				}
 			});
-			function gsData(d) {
-				var resultD = new Array();
-				for(var i =0;i<d.length;i++) {
-					var obj = {};
-					var ddsj = getddsj(d[i].fcsj,d[i].bcsj);
-					obj.bcType = d[i].bcType;//班次类型
-					obj.bcs = d[i].bcs;// 班次数
-					obj.bcsj = d[i].bcsj;// 班次时间
-					obj.fcno = d[i].fcno;// 发车序号
-					obj.fcsj = d[i].fcsj;//发车时间
-					obj.ARRIVALTIME = ddsj//到达时间
-					obj.jhlc = d[i].jhlc;//计划里程
-					obj.lp = d[i].lp==null ? null : d[i].lp.id;//路牌id
-					obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;//路牌类型
-					obj.parent = d[i].lp.lpName;// 路牌名称
-					obj.lpNo = d[i].lp.lpNo;//路牌编码
-					obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;//停车场id
-					obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;//时刻表id
-					obj.xl = d[i].xl==null ? null : d[i].xl.id;//线路id
-					obj.xlDir = dmToDh(d[i].xlDir);// 方向【0：relationshipGraph-up 上行；1：relationshipGraph-down 下行】
-					obj.qdz = d[i].qdz==null ? null : d[i].qdz.id;// 起点站id
-					obj.zdz = d[i].zdz==null ? null : d[i].zdz.id;//终点站id
-					obj.isfb = isfbTodm(d[i].isFB);//是否分班【0:false；1:true】
-					obj.isSwitchXl = isSwitchXlTodm(d[i].isSwitchXl);// 是否切换线路【0:false；1:true】
-					obj.STOPTIME = gettzsj(d[i],d,ddsj);
-					resultD.push(obj);
-				}
-				console.log(resultD);
-				return resultD;
-			}
-			function gettzsj(o,d,sj) {
-				var tzsj = 0;
-				for(var i = 0 ;i<d.length;i++) {
-					if(o.lp.lpNo == d[i].lp.lpNo && o.lp.id == d[i].lp.id) {
-						if(d[i].fcno - o.fcno ==1){
-							tzsj = (strToTime(d[i].fcsj) -strToTime(sj)) / 60000; 
-							continue;
-						}
-							
-					}
-				}
-				return tzsj;
-			}
-			
-			function isSwitchXlTodm(d) {
-				var rstr = 0;
-				if(d)
-					rstr = 1;
-				return rstr;
-			}
-			
-			function isfbTodm(b) {
-				var rstr = 0;
-				if(b)
-					rstr = 1;
-				return rstr;
-			}
-			
-			function getddsj(tStr,bcsj) {
-				var rt = '';
-				var date = new Date();
-				var _str = tStr.split(':');
-				date.setHours(parseInt(_str[0]));
-				date.setMinutes(parseInt(_str[1]) + bcsj);
-				return getTimeStr(date);
-			}
-			
-			var strToTime = function(t) {
-				var d = new Date;
-				if(t) {
-					var _str = t.split(':');
-					d.setHours(parseInt(_str[0]));
-					d.setMinutes(parseInt(_str[1]));
-				}
-				return d;
-			}
-			function getTimeStr(t) {
-				var _str = '';
-				if(t) {
-					_str = ((t.getHours()<10? '0' + t.getHours() : t.getHours()) == '00' ? '24' :(t.getHours()<10? '0' + t.getHours() : t.getHours()))
-					  		+':' 
-					  		+(t.getMinutes()<10? '0' + t.getMinutes() : t.getMinutes());
-				}
-				return _str;
-			}
+			// 验证配车数不能为零.
+			$.validator.addMethod('isNum0', function(value,element) {
+				// 定义返回值.
+				var tag = true;
+				var zgfbeforepcs = $('#zgfbeforepcsInput').val(),// 早高峰前配车数.
+					zgfpcs = $('#zgfpcsInput').val(),// 早高峰配车数.
+					gfzjpcs = $('#gfzjpcsInput').val(),// 高峰之间配车数.
+					wgfpcs = $('#wgfpcsInput').val(),// 晚高峰配车数.
+					wgfafterpcs = $('#wgfafterpcsInput').val();// 晚高峰后配车数.
+				// 判断是否为零.
+				if(parseInt(zgfbeforepcs) == 0 || parseInt(zgfbeforepcs) ==0 || 
+						parseInt(gfzjpcs) ==0 || parseInt(wgfpcs) ==0 || parseInt(wgfafterpcs) ==0)
+					tag = false;
+				return tag;
+			},function(){return '配车数不能为零!';	});
-			function dmToDh(t) {
-				var reslStr = '';
-				if(t=='0')
-					reslStr = 'relationshipGraph-up';
-				else if(t=='1')
-					reslStr = 'relationshipGraph-down';
-				return reslStr; 
-			}
+			// 验证高峰时段内的配车数是否高于其它时段配车数.
+			$.validator.addMethod('isMax', function(value,element) {
+				var tag = true;
+				var zgfbeforepcs = parseInt($('#zgfbeforepcsInput').val()),// 早高峰前配车数.
+					zgfpcs = parseInt($('#zgfpcsInput').val()),// 早高峰配车数.
+					gfzjpcs = parseInt($('#gfzjpcsInput').val()),// 高峰之间配车数.
+					wgfpcs = parseInt($('#wgfpcsInput').val()),// 晚高峰配车数.
+					wgfafterpcs = parseInt($('#wgfafterpcsInput').val());// 晚高峰后配车数.
+				// 判断高峰时段内的配车数是否高于其它时段配车数.
+				if(zgfpcs<zgfbeforepcs || zgfpcs<gfzjpcs   ||  zgfpcs<wgfafterpcs ||  wgfpcs<zgfbeforepcs || wgfpcs<gfzjpcs   ||  wgfpcs<wgfafterpcs )
+					tag = false;
+				return tag;
+			},function(){return '高峰时段配车数必须高于其它时段配车数!';});
+			// 验证客流数据分析时客容量为必填项.
 			$.validator.addMethod("isBaseRes", function(value,element) {
+				// 定义返回值.
 				var tag = true;
+				// 定义选择获取参数方式值
 				var baseChecked =  $('#submit_argus_form input[name="baseRes"]:checked').val();
+				// 判断
 				if(baseChecked == '0' && $('#krlInput').val()== '')
 					tag = false;
 				return tag; 
 			}, '客流大数据分析,客流总量为必填项！');
+			// 验证配车数不能为零.
+			$.validator.addMethod('isBcType', function(value,element) {
+				// 定义返回值.
+				var tag = true;
+				// 定义车辆总数,班型人次.
+				var clzs = $('#clzsInput').val(),
+					bxrc = $('#state_tagsinput').val();
+				// 判断.
+				if(bxrc=='' || bxrc==null || clzs=='' || clzs==0)
+					return false;
+				// 定义首末班次开始结束时间集合.
+				var map = {'line':{'startStationFirstTime':$('#qdzsbsjInput').val(),
+						   'startStationEndTime':$('#qdzmbsjInput').val(),
+						   'endStationFirstTime':$('#zdzsbsjInput').val(),
+						   'endStationEndTime':$('#zdzmbsjInput').val()}};
+				// 定义开始~结束时间.
+				var setMap = getStartAndEndDate(map);
+				console.log(setMap);
+				// 定义最大工时.
+				var maxGs =  parseInt( ((strToTime(setMap.e)  - strToTime(setMap.s)) / 60000) / 60) * parseInt(clzs);
+				// 切割班型人次,定义班次人次所用总工时.
+				var bxrcAr = bxrc.split(','),countGs = 0;
+				// 遍历
+				for(var s = 0 ; s< bxrcAr.length;s++) {
+					// 切割单个班型人次.
+					var s1a = bxrcAr[s].split('/');
+					// 定义人次.
+					var rs = parseInt(s1a[1]);
+					// 定义小时系数.
+					var hoursV = 0.0;
+					for(var g = 0 ; g < bxrcGs.length; g++) {
+						// 判断班型是否一致.
+						if(bxrcGs[g].type == s1a[0]) {
+							// 重新赋值小时系数.
+							hoursV = bxrcGs[g].hoursV;
+						}
+					}
+					// 重新计算班次人次所用总工时.
+					countGs = countGs + parseFloat(hoursV.toFixed(2)) * rs;
+				}
+				// 判断
+				if(parseFloat(countGs.toFixed(2))>maxGs)
+					tag = false;
+				return tag;
+			},function(){return '配车总数与班型人次搭配不合理!';	});
+			
+			/**
+			 * @description : (TODO) 监听获取参数方式值改变事件.
+			 * 
+			 * */
 			$('input:radio[name="baseRes"]').on('change',function(v) {
 				if($(this).val()=='1')
 					$('#krlGroup').hide();
@@ -484,25 +783,29 @@ var SKBFormWizard = function() {
                         return false;
                     }
                     if(index==1) {
+                    	// 初始化客容量值.
                     	if($('#krlInput').val() == '')
                     		$('#krlInput').val(50);
                     }else if(index == 2) {
-                    	var baseRes = $('#submit_argus_form input[name="baseRes"]:checked').val(),
-                			lineId = $('#lineSelect').val().split('_')[0],
-                			krl = $('#krlInput').val();
+                    	var baseRes = $('#submit_argus_form input[name="baseRes"]:checked').val(),// 获取参数方式值.
+                			lineId = $('#lineSelect').val().split('_')[0],// 线路ID.
+                			krl = $('#krlInput').val();// 客容量
                     	getLineInfo(lineId,function(r) {
                     		getHtmlTemp(baseRes,r.content[0],lineId,krl,function(htlMap) {
                         		$('#tab3').html(htlMap.forminput);
                         		$('#tab4').html(htlMap.datadisplay);
                         		if(baseRes==1)
-                        			ComponentsBootstrapTagsinput.init();
+                        			ComponentsBootstrapTagsinput.init();// 初始化班型人次Input Tag.
                         		// 日期控件
-                        		$('#qdzsbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#endServiceTimeInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#morningPeakStartInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#morningPeakEndInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#eveningPeakStartInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
-                        		$('#eveningPeakEndInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});
+                        		$('#qdzsbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 起始站首班时间
+                        		$('#qdzmbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 起始站末班时间
+                        		$('#zdzsbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 终点站首班时间
+                        		$('#zdzmbsjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 终点站末班时间
+                        		$('#zgfkssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 早高峰开始时间
+                        		$('#zgfjssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 早高峰结束时间
+                        		$('#wgfkssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 晚高峰开始时间
+                        		$('#wgfjssjInput').datetimepicker({format : 'HH:mm',locale: 'zh-cn'});// 晚高峰结束时间
+                        		// 初始化停车场下拉框.
                         		gettccInfo(function(cd) {
                         			var options = '<option value="">请选择...</option><optgroup label="停车场">';
                         			var $_len = cd.length;
@@ -543,15 +846,4 @@ var SKBFormWizard = function() {
 			$('#submit_argus_form').find('.button-previous').hide();
 		}
 	}
-	function getJSONP(url, data, cb) {
-		$.ajax({
-			url : url,
-			type : "GET",
-			dataType : 'jsonp',
-			jsonp : 'jsoncallback',
-			data : data,
-			success : cb
-		});
-	}
-	
-}();
+}();
 \ No newline at end of file
@@ -1217,7 +1217,6 @@ var BaseFun = function() {
 						qt.push(arr[a]);
 					}
 				}
-				// debugger;
 				var tempup = baseF.sortDirArray(upArr);
 				var tempdown = baseF.sortDirArray(downArr);
 				return {'upArr':tempup,'downArr':tempdown,'qt':qt};
@@ -1233,7 +1232,6 @@ var BaseFun = function() {
 			 * @status OK.
 			 * */
 			sortDirArray : function(arr) {
-				///debugger;
 				//console.log(arr.length);
 				var list = new Array(),tempArray = new Array();
 				for(var a =0;a<arr.length;a++) {
@@ -1249,7 +1247,6 @@ var BaseFun = function() {
 							list.push(arr[d]);
 					}
 				}
-				//debugger;
 				//console.log(list.length);
 				return list;
 			},
@@ -1261,7 +1258,6 @@ var BaseFun = function() {
 			 * @return : 返回一个数组.这里返回的是调整过后 发车间距均匀的班次数组
 			 **/
 			jhfcjx : function(bcArr,dir,zzsj,dataMap) {
-				// debugger;
 				console.log(bcArr.length);
 				//console.log('调整' + dir + '发车间隙...');
 				// 1、定义某个方向下的首末班次时间结点.
@@ -1286,7 +1282,6 @@ var BaseFun = function() {
 						return;
 					var fcnosj = new Date(kssj);
 					// 2.4、调整班次
-					//debugger;
 					for(var l = 0 ;l<bcArr.length-1;l++) {
 						var _t = baseF.getDateTime(bcArr[l].fcsj);
 						if(_t>temp )
@@ -325,17 +325,18 @@ var _animation = function(d3Node) {return d3Node.transition().delay(function(d,i
  *  @returns {Object} table.outerHTML
  ************************************************************************************************************************************************/
 var createTooltip = function createTooltip(self) {
-    var hiddenKeys = ['_PRIVATE_','fcno' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR', /*'INTERVAL',*/'num'],
-        showKeys = self.configuration.showKeys;
     return d3.tip().attr('class', 'relationshipGraph-tip').offset([-8, -10]).html(function (obj) {
         var keys = Object.keys(obj),
             table = document.createElement('table'),
             count = keys.length,
             rows = [];
+        var showKeys = self.configuration.showKeys;
+        var hiddenKeys = ['_PRIVATE_' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR','lpNo','lpName','lp','lpType',
+                          'jhlc','tcc','ttinfo','xl','isfb','qdz','zdz','isSwitchXl','bz','bcs','fcno'];
         while (count--) {
-            var element = keys[count],
-                upperCaseKey = element.toUpperCase();
-            if (!RelationshipGraph.contains(hiddenKeys, upperCaseKey) && !upperCaseKey.startsWith('__') && obj[element] !='tjz') {
+            var element = keys[count];
+                // upperCaseKey = element.toUpperCase();
+            if (!RelationshipGraph.contains(hiddenKeys, element) && !element.startsWith('__') && obj[element] !='tjz') {
                 var row = document.createElement('tr'),
                     key = showKeys ? document.createElement('td') : null,
                     value = document.createElement('td');
@@ -352,7 +353,7 @@ var createTooltip = function createTooltip(self) {
                        else if(element=='xlDir')
                        		changeKey = '行驶方向:';
                        else if(element=='parent')
-                      		changeKey = '当前车辆:';
+                      		changeKey = '当前路牌:';
                        else if(element=='bcType')
                      		changeKey = '班次类型:';
                        else if(element=='tjbx')
@@ -363,7 +364,7 @@ var createTooltip = function createTooltip(self) {
                     row.appendChild(key);
                 }
-                if (upperCaseKey == 'VALUE' && !self.configuration.valueKeyName) {
+                if (element == 'VALUE' && !self.configuration.valueKeyName) {
                     continue;
                 }
@@ -101,7 +101,8 @@
 				'jclcArr' : BaseFun.formatPairing(gatps.upInMileage,gatps.downInMileage),// 进场里程。[下标0代表上；下标1代表下]
 				'cclcArr' : BaseFun.formatPairing(gatps.upOutMileage,gatps.downOutMileage),// 出场里程。[下标0代表上；下标1代表下]
 				'pcxssjArr' : BaseFun.formatPairing(gatps.upTravelTime,gatps.downTravelTime),// 平常行驶时间。[下标0代表上；下标1代表下]
-				'gfxxsjArr' : BaseFun.formatPairing(gatps.lateUpTime,gatps.lateDownTime),// 高峰行驶时间。[下标0代表上；下标1代表下]
+				'gfxxsjArr' : BaseFun.formatPairing(gatps.lateUpTime=='' ? gatps.upTravelTime : gatps.lateUpTime,
+													gatps.lateDownTime=='' ? gatps.downTravelTime : gatps.lateDownTime),// 高峰行驶时间。[下标0代表上；下标1代表下]
 				'pcxslcArr' : BaseFun.formatPairing(gatps.upMileage,gatps.downMileage),// 行驶里程。[下标0代表上；下标1代表下]
 				'qdzArr' : BaseFun.qzdz(gatps.up_s.split('_')[0],gatps.down_s.split('_')[0]),// 起始站。[下标0代表上；下标1代表下]
 				'zdzArr':BaseFun.qzdz(gatps.up_s.split('_')[1],gatps.down_s.split('_')[1]),// 终点站。[下标0代表上；下标1代表下]
@@ -25,10 +25,30 @@ var ComponentsBootstrapTagsinput = function() {
             itemValue: 'value',
             itemText: 'text'
         });
+        
+        $('#state_tagsinput').on('beforeItemAdd', function(event) {
+        	var bctypeValue = $('#state_tagsinput_bctype').val();
+        	var rcnum  = $('#state_tagsinput_value').val();
+        	var bxrcAr = $('#state_tagsinput').val().split(',');
+        	for(var s = 0 ; s< bxrcAr.length;s++) {
+        		var s1a = bxrcAr[s].split('/');
+        		 if(s1a[0]==bctypeValue) {
+        			 $('#state_tagsinput').tagsinput('remove', bxrcAr[s]);
+        		 }
+        	 }
+        });
+        
         $('#state_tagsinput_add').on('click', function(){
         	var bctypeValue = $('#state_tagsinput_bctype').val();
         	var rcnum  = $('#state_tagsinput_value').val();
         	if(isNull(bctypeValue,rcnum)) {
+        		var bxrcAr = $('#state_tagsinput').val().split(',');
+            	for(var s = 0 ; s< bxrcAr.length;s++) {
+            		var s1a = bxrcAr[s].split('/');
+            		 if(s1a[0]==bctypeValue) {
+            			 rcnum = parseInt(rcnum) + parseInt(s1a[1]);
+            		 }
+            	 }
         		 elt.tagsinput('add', { 
                      "value": bctypeValue  + '/' + rcnum, 
                      "text":  bctypeValue + '/' + rcnum, 
@@ -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();
@@ -7,9 +7,9 @@ $(document).on(&#39;show.uk.modal&#39;, &#39;.uk-modal.ct_move_modal&#39;, function () {
     if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
         return;
-/*    //临时放过轨迹回放
-    if($(this).attr('id')=='map-playback-modal')
-        return;*/
+    /*    //临时放过轨迹回放
+     if($(this).attr('id')=='map-playback-modal')
+     return;*/
     //计算居中位置
     var win = $('body');
@@ -92,5 +92,4 @@ var modal_move = function (m_header) {
         _moveFlag = false;
         _moveObj = null;
     });
-
 };
 \ No newline at end of file
@@ -284,13 +284,13 @@
     <script id="multi_inout_info_cont_temp" type="text/html">
         {{each list as item i}}
-            <dl>
-                <dd>{{item.stopName}}</dd>
-                <dd>{{item.in_time_str}}</dd>
-                <dd>{{item.out_time_str}}</dd>
-                <dd></dd>
-                <dd></dd>
-            </dl>
+        <dl>
+            <dd>{{item.stopName}}</dd>
+            <dd>{{item.in_time_str}}</dd>
+            <dd>{{item.out_time_str}}</dd>
+            <dd></dd>
+            <dd></dd>
+        </dl>
         {{/each}}
     </script>
     <script>
@@ -503,10 +503,10 @@
                 var add = function (gps) {
                     /*if (gps.inout_stop == -1)
-                        return;
+                     return;
-                    var htmlStr = template('', {obj: gps['inout_stop_info']});
-                    $('.inout_table_wrap .ct_table .ct_table_body', modal).html(htmlStr);*/
+                     var htmlStr = template('', {obj: gps['inout_stop_info']});
+                     $('.inout_table_wrap .ct_table .ct_table_body', modal).html(htmlStr);*/
                 };
                 var clear = function () {
@@ -522,7 +522,7 @@
                     }
                 };
-                
+
                 var matchOut = function (info, gps) {
                     if(!info)
                         return;