Merge branch 'minhang' of

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

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 10b0d3c3 66541a12
Showing 15 changed files with 581 additions and 384 deletions
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/resources/static/pages/base/line/add.html
src/main/resources/static/pages/base/line/details.html
src/main/resources/static/pages/base/line/edit.html
src/main/resources/static/pages/base/timesmodel/bctz.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/add-form-reload.js
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/errorinfo.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
@@ -104,6 +104,9 @@ public class Line implements Serializable {
 	/** 开辟日期 date*/
 	@DateTimeFormat(pattern ="yyyy-MM-dd")
 	private Date openDate;
+	
+	/** 大间隔等级 */
+	private Integer spacGrade;
 	/** 线路沿革 varchar length(50) */
 	private String history;
@@ -155,6 +158,14 @@ public class Line implements Serializable {
 	/** 是否在使用 <1:是;0:否> bit length(50) */
 	private Integer inUse;
+	public Integer getSpacGrade() {
+		return spacGrade;
+	}
+
+	public void setSpacGrade(Integer spacGrade) {
+		this.spacGrade = spacGrade;
+	}
+
 	public Integer getWarrantCar() {
 		return warrantCar;
 	}
@@ -159,11 +159,11 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 */
 	@Query(value =  "SELECT " +
 					"c.directions," +
-					"ST_AsText(s.bsection_vector) as bsection_vector," +
+					"ST_AsText(s.gsection_vector) as gsection_vector," +
 					"s.speed_limit," +
 					"s.section_name " +
 					" FROM bsth_c_sectionroute c " +
-					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2", nativeQuery=true)
+					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2 and c.destroy = 0", nativeQuery=true)
 	List<Object[]> sectionRouteVector(Integer lineId,Integer directions);
 	@Transactional
@@ -153,7 +153,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				   "s.station_route_code," +
 				   "s.directions," +
 				   "s.distances,"+
-				   "s.station FROM bsth_c_stationroute s where  s.line = ?1) a " +
+				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
 				   "LEFT JOIN bsth_c_station b " +
 				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
 	List<Object[]> usingSingle(Integer lineId);
@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.util.*;
@@ -511,57 +512,38 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 */
 	@Override
 	public Map<String, Object> usingSingle(Map<String, Object> map) {
-		
 		// 返回值map
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
 		try {
-			
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findOne(lineId);
-			
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
 			List<Object[]> objects = repository.usingSingle(lineId);
-			
 			if (objects.size()>0) {
-				
 				/** 获取配置文件里的ftp登录参数 */
 				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
-				
 				// 压缩文件名
 				String odlGzFileName = line.getLineCode() + ".txt.gz";
-				
 				// txt文件名
 				String textFileName  = line.getLineCode() + ".txt";
-				
 				// 创建一个ftp上传实例
 				FTPClientUtils clientUtils = new FTPClientUtils();
-				
 				// IP
 				String url = FTPParamMap.get("url").toString();
-				
 				// 端口
 				int port = Integer.valueOf(FTPParamMap.get("port").toString());
-				
 				// 用户名
 				String username = FTPParamMap.get("username").toString();
-				
 				// 密码
 				String password = FTPParamMap.get("password").toString();
-				
 				// 相对路径
 				String remotePath = FTPParamMap.get("remotePath").toString();
-				
 				/** 如果已存在相同行单文件名则先删除 */
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
-				
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
-				
 				String textStr = "";
-				
 				boolean tempTag = ishxType(objects);
 				if(tempTag)
@@ -575,6 +557,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
+				// FileOutputStream fos = new FileOutputStream("test.txt");
+				/*int len = 0 ; 
+				byte[] cbuf = new byte[1024];
+				while((len = input.read(cbuf)) != -1) {
+					fos.write(cbuf, 0, len);
+				}*/
 				/** 生成txt文件，上传ftp */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
@@ -645,25 +633,23 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @return String
 	 */ 
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
-		
 		// 返回值String
 		String stationRStr = "";
-		
 		// windows下的文本文件换行符
 		//String enterStr = "\r\n";
-		
 		// linux/unix下的文本文件换行符
 		String enterStr = "\r";
-		
+		int defaultZdxh = 0;
 		if(objects.size()>0) {
-			
 			for(int i = 0; i<objects.size();i++) {
-				
+				defaultZdxh ++ ;
 				// 经度
-				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+				
+				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 				lat = "\t" +  lat;
@@ -673,23 +659,32 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				String stationMake = "";
 				if(stationMakeStr.equals("E")) {
-					
 					stationMake = "\t2";
-					
 				}else {
-					
 					stationMake ="\t1";
-					
 				}
 				// 站点序号 
-				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				String stationNo =  String.valueOf(defaultZdxh);
 				stationNo = "\t" + stationNo;
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				int len = stationCode.length();
+				if(len<8) {
+					int dx = 8 - len;
+					String addStr = "";
+					for(int p =0;p<dx;p++) {
+						addStr  = addStr + "0";
+					}
+					stationCode = addStr + stationCode;
+				}else if(len>8){
+					stationCode = stationCode.substring(8);
+				}
+				
 				stationCode =  "\t" +stationCode;
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
@@ -709,41 +704,33 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 限速
 				String sleepStr = "";
-				
 				// 方向
 				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
-				
 				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
-				
 				if(sobje.size()==1) {
-					
-					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-					
-					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
-					
+					int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+					sleepStr =  "\t" +  String.valueOf(dsleepStr);
 				}else if(sobje.size()>1){
-					
-					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 					for(int j =0;j<sobje.size();j++) {
-						
-						String sectionName = sobje.get(j)[3].toString();
-						
-						String sectionNameA[] = sectionName.split("至");
-						
-						if(stationName.equals(sectionNameA[0])){
-							
-							/*sleepStr = sobje.get(j)[2].toString();*/
-							
-							double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-							
-							sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
-							
+						double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+						String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+						pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+						List<Point> ps = new ArrayList<>();
+						String[] pArray = pointsStr.split(",");
+						for(int a = 0; a <pArray.length; a++) {
+							String[] tmepA = pArray[a].split(" ");
+							Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+							ps.add(temp);
+						}
+						if(GeoUtils.isInSection(ps, point)) {
+							sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+							break;
 						}
-						
 					}
 				}
-				
+				if(sleepStr.equals("")) 
+					sleepStr  =  "\t" + "60";
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -762,9 +749,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(int i = 0; i<objects.size();i++) {
 				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
 					// 经度
-					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+					String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
+					
 					// 纬度
-					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+					
+					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 					lat = "\t" +  lat;
 					// 站点类型
 					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
@@ -779,6 +769,17 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					String stationNo = "\t" + xh;
 					// 站点编码
 					String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+					int len = stationCode.length();
+					if(len<8) {
+						int dx = 8 - len;
+						String addStr = "";
+						for(int p =0;p<dx;p++) {
+							addStr  = addStr + "0";
+						}
+						stationCode = addStr + stationCode;
+					}else if(len>8){
+						stationCode = stationCode.substring(8);
+					}
 					stationCode =  "\t" +stationCode;
 					double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
 					String tempDistc = String.valueOf((int) dis);
@@ -794,20 +795,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+						int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  String.valueOf(dsleepStr);
 					}else if(sobje.size()>1){
-						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 						for(int j =0;j<sobje.size();j++) {
-							String sectionName = sobje.get(j)[3].toString();
-							String sectionNameA[] = sectionName.split("至");
-							if(stationName.equals(sectionNameA[0])){
-								/*sleepStr = sobje.get(j)[2].toString();*/
-								double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-								sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+							double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+							String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+							pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+							List<Point> ps = new ArrayList<>();
+							String[] pArray = pointsStr.split(",");
+							for(int a = 0; a <pArray.length; a++) {
+								String[] tmepA = pArray[a].split(" ");
+								Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+								ps.add(temp);
+							}
+							if(GeoUtils.isInSection(ps, point)) {
+								sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+								break;
 							}
 						}
 					}
+					if(sleepStr.equals("")) 
+						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 				}
@@ -289,14 +289,20 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
-	                 <!-- 开辟日期 START　-->
+	                <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
@@ -398,6 +404,15 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                
+	                <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -282,14 +282,20 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
-	                 <!-- 开辟日期 START　-->
+	                 <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
@@ -391,6 +397,15 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                
+	                <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -290,14 +290,20 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
-	                 <!-- 开辟日期 START　-->
+	                <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
@@ -399,6 +405,15 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                
+	                 <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -18,9 +18,10 @@
 							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_bctz">
 								<thead>
 									<tr role="row" class="heading">
-										<th width="33%">路牌</th>
-										<th width="33%">当前班次数</th>
-										<th width="33%">调整班次数</th>
+										<th width="25%">路牌编码</th>
+										<th width="25%">路牌名称</th>
+										<th width="25%">当前班次数</th>
+										<th width="25%">调整班次数</th>
 									</tr>
 								</thead>
 								<tbody></tbody>
@@ -40,13 +41,16 @@
 {{each list as obj i }}
 	<tr role="row" class="filter">
 		<td>
-			<input type="text" readonly  class="form-control form-filter input-sm" name="lpname_{{i+1}}" value="{{obj.lpNo}}">
+			<input type="text" readonly  class="form-control form-filter input-sm" name="lpno_{{i+1}}" value="{{obj.lpNo}}">
+		</td>
+		<td>
+			<input type="text" readonly  class="form-control form-filter input-sm" name="lpname_{{i+1}}" value="{{obj.lpName}}">
 		</td>
 		<td>
 			<input type="text" readonly class="form-control form-filter input-sm" name="dqbc_{{i+1}}" value="{{obj.bcs}}">
 		</td>
 		<td>
-			<input type="number" class="form-control form-filter input-sm" name="{{i+1}}" value="{{obj.bcs}}">
+			<input type="number" class="form-control form-filter input-sm" name="{{i+1}}" value="{{obj.bcs}}" min="0">
 		</td>
 	</tr>
 {{/each}}
@@ -57,230 +61,239 @@
 	{{/if}}
 </script>
 <script type="text/javascript">
-$('#tzbc_mobal').on('tzbcMobal.show', function(e,obj,cardata,bf){
-	setTimeout(function(){
-		// 加载延迟200毫秒显示mobal
-		$('#tzbc_mobal').modal({show : true,backdrop: 'static', keyboard: false});
-	},200);
-	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
-	$('#tzbc_mobal').on('show.bs.modal', function () {
-		// 把数据填充到模版中
-		var tbodyHtml = template('bctz_temp',{list:cardata});
-		// 把渲染好的模版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) {
-			// 1、 获取表单内容,并序列化
-			var params = form.serializeJSON();
-			// 2、 调整路牌对应的班次总数
-			updFormParams(params);
-			// 3、调整班次.并重新给定班次序号和发车序号.再确定首末班车时间.最后渲染数据
-			obj.data(bf.tzsmbcsj(bf.setbcsAndfcno(tzbcDate()),
-					obj.configuration.dataMap.smbcsjArr,
-					obj.configuration.dataMap.ccsjArr,
-					obj.configuration.dataMap.cclcArr,
-					obj.configuration.dataMap.qdzArr,
-					obj.configuration.dataMap.lbsj));
-			// 3、记录早操.并保存历史班次数据
-			obj.addHistory();
-			// 5、隐藏错误提示
-			tzbcAlert.hide();
-			// 6、隐藏 reladplus_mobal 弹出层 
-			$('#tzbc_mobal').modal('hide');
-		}
-	});
-	
-	/**
-	 * @description : (TODO) 调整路牌对应的班次总数.
-	 *
-	 *				    ❀  根据路牌对应班次的数值，把路牌对应的当前班次总数修改成调整后的班次总数,并转为数值类型以及把空值转为0.
-	 * 
-	 * @params : [p--表单序列化对象].
-	 */
-	function updFormParams(p) {
-		for(var i= 0;i<cardata.length;i++) {
-			if(p[i+1] != undefined) {
-				if(p[i+1]=='')
-					cardata[i].tzbc = 0;
-				else 
-					cardata[i].tzbc = parseInt(p[i+1]);
+$('#tzbc_mobal').on('tzbcMobal.show', function(e,obj,cardata,bf,error){
+	if(obj != null && obj !='' && bf != null && bf!='' && cardata.length>0){
+		// 延迟200毫秒显示mobal
+		setTimeout(function(){$('#tzbc_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
+		// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+		$('#tzbc_mobal').on('show.bs.modal', function () {
+			// 把数据填充到模版中
+			var tbodyHtml = template('bctz_temp',{list:cardata});
+			// 把渲染好的模版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) {
+				// 1、 获取表单内容,并序列化
+				var params = form.serializeJSON();
+				var dataMap = obj.configuration.dataMap;
+				// 2、 调整路牌对应的班次总数
+				updFormParams(params);
+				// 3、调整班次.并重新给定班次序号和发车序号.再确定首末班车时间.最后渲染数据.
+				var jar = bf.tzsmbcsj01(bf.setbcsAndfcno(tzbcDate()),
+								  obj.configuration.dataMap.smbcsjArr,
+								  obj.configuration.dataMap.ccsjArr,
+								  obj.configuration.dataMap.cclcArr,
+								  obj.configuration.dataMap.qdzArr,
+								  obj.configuration.dataMap.lbsj,dataMap);
+				obj.data(bf.addjcclcbc01(obj.configuration.taskTypes,jar,dataMap,
+							obj.configuration.stopAraay,obj.configuration.dataMap.map));
+				// 3、记录早操.并保存历史班次数据
+				obj.addHistory();
+				// 5、隐藏错误提示
+				tzbcAlert.hide();
+				// 6、隐藏 reladplus_mobal 弹出层 
+				$('#tzbc_mobal').modal('hide');
+			}
+		});
+		
+		/**
+		 * @description : (TODO) 调整路牌对应的班次总数.
+		 *
+		 *				    ❀  根据路牌对应班次的数值，把路牌对应的当前班次总数修改成调整后的班次总数,并转为数值类型以及把空值转为0.
+		 * 
+		 * @params : [p--表单序列化对象].
+		 */
+		function updFormParams(p) {
+			for(var i= 0;i<cardata.length;i++) {
+				if(p[i+1] != undefined) {
+					if(p[i+1]=='')
+						cardata[i].tzbc = 0;
+					else 
+						cardata[i].tzbc = parseInt(p[i+1]);
+				}
 			}
 		}
-	}
-	
-	/**
-	 * @description : (TODO)调整班次.
-	 *
-	 * @return : 返回一个数组.这里返回的是一个调整完班次数后的数组.
-	 */
-	function tzbcDate() {
-		 // 1、获取当前所有的班次数.
-		 var dr = obj.getDataArray(),
-		 	 result = new Array();// 定义返回数组对象.
-		 // 2、遍历路牌对应的班次总数.
-		 for(var i = 0 ; i<cardata.length;i++) {
-			 var zcbcsz = new Array(),// 定义当前路牌下的正常班次数组.
-			 	 zwlbbcsz = new Array(),// 定义当前路牌下的早晚例保、吃饭班次数组.
-			 	 jccbcs = 0,// 进出场班次数.这个值是为了计算总班次数时除去时间为空的班次
-			 	 jccbcsz = new Array();// 定义当前路牌下的进出场班次数组.
-			 // 3、遍历当前所有的班次数.
-			 for(var j = 0 ;j<dr.length;j++) {
-				 // 4、判断当前遍历的班次是否属于当前路牌对应的班次数组对象.
-				 if(cardata[i].lpNo == dr[j].parent && dr[j].bcsj>0 ){
-					 // 5、把当前班次添加到上序定义的不同班次数组中.
-					 if(dr[j].bcType =='bd' || dr[j].bcType=='lc' || dr[j].bcType =='cf')
-						 zwlbbcsz.push(dr[j]);// 添加到早晚例保、吃饭班次数组中.
-					 else if(dr[j].bcType=='in' || dr[j].bcType =='out')
-						 jccbcs++;
-					 else
-						 zcbcsz.push(dr[j]);// 添加到正常班次数组.
-				 }
-				 if(cardata[i].lpNo == dr[j].parent && (dr[j].bcType=='in' || dr[j].bcType =='out')) {
-					 jccbcsz.push(dr[j]);// 添加到进出场班次数组中.
+		
+		/**
+		 * @description : (TODO)调整班次.
+		 *
+		 * @return : 返回一个数组.这里返回的是一个调整完班次数后的数组.
+		 */
+		function tzbcDate() {
+			 // 1、获取当前所有的班次数.
+			 var dr = obj.getDataArray(),
+			 	 result = new Array();// 定义返回数组对象.
+			 // 2、遍历路牌对应的班次总数.
+			 for(var i = 0 ; i<cardata.length;i++) {
+				 var zcbcsz = new Array(),// 定义当前路牌下的正常班次数组.
+				 	 zwlbbcsz = new Array(),// 定义当前路牌下的早晚例保、吃饭班次数组.
+				 	 jccbcs = 0,// 进出场班次数.这个值是为了计算总班次数时除去时间为空的班次
+				 	 jccbcsz = new Array();// 定义当前路牌下的进出场班次数组.
+				 // 3、遍历当前所有的班次数.
+				 for(var j = 0 ;j<dr.length;j++) {
+					 // 4、判断当前遍历的班次是否属于当前路牌对应的班次数组对象.
+					 if(cardata[i].lpNo == dr[j].parent && dr[j].bcsj>0 ){
+						 // 5、把当前班次添加到上序定义的不同班次数组中.
+						 if(dr[j].bcType =='bd' || dr[j].bcType=='lc' || dr[j].bcType =='cf')
+							 zwlbbcsz.push(dr[j]);// 添加到早晚例保、吃饭班次数组中.
+						 else if(dr[j].bcType=='in' || dr[j].bcType =='out')
+							 jccbcs++;
+						 else
+							 zcbcsz.push(dr[j]);// 添加到正常班次数组.
+					 }
+					 if(cardata[i].lpNo == dr[j].parent && (dr[j].bcType=='in' || dr[j].bcType =='out')) {
+						 jccbcsz.push(dr[j]);// 添加到进出场班次数组中.
+					 }
 				 }
-			 }
-			 // 6、调整班次
-			 result = result.concat(tcbcgz(bf.pxarr(zcbcsz),cardata[i].tzbc,zwlbbcsz,bf.pxarr(jccbcsz),jccbcs,cardata[i]));
+				 // 6、调整班次
+				 result = result.concat(tcbcgz(bf.pxarr(zcbcsz),cardata[i].tzbc,zwlbbcsz,bf.pxarr(jccbcsz),jccbcs,cardata[i]));
+			}
+			return result;
 		}
-		return result;
-	}
-	
-	/**
-	 * @description : (TODO)
-	 *
-	 * @params : [ar-- 当前路牌下的正常班次数组;num--当前路牌对应的班次总数;qa--当前路牌下的早晚例保、吃饭班次数组,ja--当前路牌下的进出场班次数组]
-	 *
-	 * @return : 返回一个数组.这里返回一个根据班次总数调整过车班次数组
-	 */
-	function tcbcgz(ar,num,qa,ja,jccbcs,cara) {
-		 var rsbcA = new Array();
-		 if(ar.length>0) {
-			 var ra_ = new Array();
-			 var _dx = num-jccbcs;// 班次总数值 - 进出时间大于零的班次 = 正常班次数
-			 var lastbcsjStr = ar[ar.length-1].ARRIVALTIME;// 标记调整班次之前最后一个班次的达到时间
-			 var fcno_ = Math.abs(ar.length+jccbcs-num),// 调整班次差
-				 tempS = '';// 标记调整班次是添加还是剔除[jq--剔除;add--添加]
-			 var fxdm = bf.dirDmToIndex(ar[ar.length-1].xlDir);// 标记调整班次之前最后一个班次的方向
-			 // 如果调整班次差是成对的,那么方向一致.否则改变方向
-			 if(fcno_%2!=0)
-				 fxdm =  bf.getfx(1,fxdm);// 改变方向
-			 // 如果当前路牌的班次总数大于等于调整后的班次总数则截取班次,反之添加班次
-			 if(ar.length>=_dx) {
-				 ra_ = ar.splice(0,_dx);// 截取班次数(这里从下标0开始截取到 对应的班次总数值)
-				 tempS = 'jq';
-			 }else if(ar.length<_dx) {
-				 var tzsj_ = obj.configuration.dataMap.ztjxA[fxdm],sh = ar[ar.length-1];
-				 var startTime = new Date();
-				 var strArray = sh.ARRIVALTIME.split(':');
-				 startTime.setHours(parseInt(strArray[0]));
-				 startTime.setMinutes(parseInt(strArray[1]) + tzsj_);
-				 bf.addbc(obj,sh,startTime,tzsj_,sh.fcno + 1,ar,_dx - ar.length);
-				 ra_ = ar;
-				tempS = 'add';
-			 } 
-			 rsbcA =  tzsj(ra_,qa,ja,lastbcsjStr,fcno_,tempS,fxdm);
-		 }else if(ar.length==0) {
-			 rsbcA =  bf.addlpbc(obj,bf,cara.lpNo,num);
+		
+		/**
+		 * @description : (TODO)
+		 *
+		 * @params : [ar-- 当前路牌下的正常班次数组;num--当前路牌对应的班次总数;qa--当前路牌下的早晚例保、吃饭班次数组,ja--当前路牌下的进出场班次数组]
+		 *
+		 * @return : 返回一个数组.这里返回一个根据班次总数调整过车班次数组
+		 */
+		function tcbcgz(ar,num,qa,ja,jccbcs,cara) {
+			 var rsbcA = new Array();
+			 if(ar.length>0) {
+				 var ra_ = new Array();
+				 var _dx = num-jccbcs;// 班次总数值 - 进出时间大于零的班次 = 正常班次数
+				 var lastbcsjStr = ar[ar.length-1].ARRIVALTIME;// 标记调整班次之前最后一个班次的达到时间
+				 var fcno_ = Math.abs(ar.length+jccbcs-num),// 调整班次差
+					 tempS = '';// 标记调整班次是添加还是剔除[jq--剔除;add--添加]
+				 var fxdm = bf.dirDmToIndex(ar[ar.length-1].xlDir);// 标记调整班次之前最后一个班次的方向
+				 // 如果调整班次差是成对的,那么方向一致.否则改变方向
+				 if(fcno_%2!=0)
+					 fxdm =  bf.getfx(1,fxdm);// 改变方向
+				 // 如果当前路牌的班次总数大于等	于调整后的班次总数则截取班次,反之添加班次
+				 if(ar.length>=_dx) {
+					 ra_ = ar.splice(0,_dx);// 截取班次数(这里从下标0开始截取到 对应的班次总数值)
+					 tempS = 'jq';
+				 }else if(ar.length<_dx) {
+					 var sh = ar[ar.length-1];
+					 var cctag = bf.dirDmToIndex(ar[ar.length-1].xlDir);// 标记调整班次之前最后一个班次的方向
+					 cctag =  bf.getfx(1,cctag);// 改变方向
+					 var startTime = new Date();
+					 var strArray = sh.ARRIVALTIME.split(':');
+					 startTime.setHours(parseInt(strArray[0]));
+					 startTime.setMinutes(parseInt(strArray[1]));
+					 var tzjx =  bf.isgfsjd01(startTime,obj.configuration.dataMap) ?  obj.configuration.dataMap.gftzsj[cctag] : obj.configuration.dataMap.dgtzsj[cctag];
+					 startTime.setMinutes(parseInt(strArray[1]) + tzjx);
+					 bf.addbc(obj , sh , startTime , tzjx, (sh.fcno + 1),ar, (_dx - ar.length));
+					 ra_ = ar;
+					tempS = 'add';
+				 } 
+				 // rsbcA =  tzsj(ra_,qa,ja,lastbcsjStr,fcno_,tempS,fxdm);
+				 rsbcA = ra_;
+			 }else if(ar.length==0) {
+				 rsbcA =  bf.addlpbc(obj,bf,cara.lpNo,num);
+			 }
+			 return rsbcA;
 		 }
-		 return rsbcA;
-	 }
-	
-	/**
-	 * @description : (TODO) 调整时间
-	 *
-	 * @params : [a1-- 当前路牌下的正常班次数组;a2--当前路牌下的早晚例保、吃饭班次数组;a3--当前路牌下的进出场班次数组]
-	 * 
-	 * @return : 返回一个数组.这里返回的是一个调整时间后的班次数组
-	 */
-	function tzsj(a1,a2,a3,sjstr,fcno_,tempS,fxdm) {
-		return a1.concat(jsjclc(a1[a1.length-1].ARRIVALTIME,a2,a3,sjstr,fcno_,tempS,fxdm));
-	}
-	
-	/**
-	 * @description : (TODO)调整进出场、离场班次
-	 *
-	 * @params : [st--当前路牌最后一个班次的到达时间;ar--当前路牌下的早晚例保、吃饭班次数组,pa--当前路牌下的进出场班次数组]
-	 *
-	 * @return
-	 */
-	 function jsjclc(st,ar,pa,sjstr,fcno_,tempS,fxdm) {
-		 console.log('{' + tempS +  '......}')
-		 // 1、修改进出场班次.
-		 for(var p = 0;p<pa.length;p++) {
-			// A）、如果当前班次的发车时间等于 在没有调整班次总数之前的最后一个班次的到达时间,则这个班次是在没有调整班次之前的那个进场班次
-			if(pa[p].fcsj == sjstr && pa[p].bcType =='in') {
-				pa[p].fcsj = st;
-				pa[p].bcsj = obj.configuration.dataMap.ccsjArr[fxdm];
-				pa[p].xlDir = obj.configuration.dataMap.dira[fxdm];
-				var _s = bf.getDateTime(st);
-				var _tt = new Date(_s);
-				_tt.setMinutes(_tt.getMinutes()+pa[p].bcsj);
-				var ddsjStr = bf.getTimeStr(_tt);
-				pa[p].ARRIVALTIME = ddsjStr;
-				if(tempS =='add')
-					pa[p].fcno = pa[p].fcno+fcno_;
-				else if(tempS =='jq')
-					pa[p].fcno = pa[p].fcno-fcno_;
-			}
-			// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
-			if((bf.getDateTime(pa[p].ARRIVALTIME)-bf.getDateTime(st))/60000 > pa[p].bcsj) {
-				console.log('{' + pa[p].lpNo + '----' + pa[p].ARRIVALTIME + '----' +  st +  '}');
-				console.log('修改进出场班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
-				pa.splice(p,1);
-			} 
+		
+		/**
+		 * @description : (TODO) 调整时间
+		 *
+		 * @params : [a1-- 当前路牌下的正常班次数组;a2--当前路牌下的早晚例保、吃饭班次数组;a3--当前路牌下的进出场班次数组]
+		 * 
+		 * @return : 返回一个数组.这里返回的是一个调整时间后的班次数组
+		 */
+		function tzsj(a1,a2,a3,sjstr,fcno_,tempS,fxdm) {
+			return a1.concat(jsjclc(a1[a1.length-1].ARRIVALTIME,a2,a3,sjstr,fcno_,tempS,fxdm));
 		}
-		// 2、修改晚例保班次.
-		for(var i = 0 ; i<ar.length;i++) {
-			// A）、修改离场班次属性值
-			if(ar[i].bcType=='lc') {
-				ar[i].fcsj =  ddsjStr;
-				ar[i].xlDir = obj.configuration.dataMap.dira[fxdm];
-				var _lcs = bf.getDateTime(ddsjStr);
-				var _lctt = new Date(_lcs);
-				_lctt.setMinutes(_lctt.getMinutes()+ar[i].bcsj);
-				ar[i].ARRIVALTIME = bf.getTimeStr(_lctt);
-				if(tempS =='add')
-					ar[i].fcno = ar[i].fcno+fcno_;
-				else if(tempS =='jq')
-					ar[i].fcno = ar[i].fcno-fcno_;
+		
+		/**
+		 * @description : (TODO)调整进出场、离场班次
+		 *
+		 * @params : [st--当前路牌最后一个班次的到达时间;ar--当前路牌下的早晚例保、吃饭班次数组,pa--当前路牌下的进出场班次数组]
+		 *
+		 * @return
+		 */
+		 function jsjclc(st,ar,pa,sjstr,fcno_,tempS,fxdm) {
+			 // 1、修改进出场班次.
+			 for(var p = 0;p<pa.length;p++) {
+				// A）、如果当前班次的发车时间等于 在没有调整班次总数之前的最后一个班次的到达时间,则这个班次是在没有调整班次之前的那个进场班次
+				if(pa[p].fcsj == sjstr && pa[p].bcType =='in') {
+					pa[p].fcsj = st;
+					pa[p].bcsj = obj.configuration.dataMap.ccsjArr[fxdm];
+					pa[p].xlDir = obj.configuration.dataMap.dira[fxdm];
+					var _s = bf.getDateTime(st);
+					var _tt = new Date(_s);
+					_tt.setMinutes(_tt.getMinutes()+pa[p].bcsj);
+					var ddsjStr = bf.getTimeStr(_tt);
+					pa[p].ARRIVALTIME = ddsjStr;
+					if(tempS =='add')
+						pa[p].fcno = pa[p].fcno+fcno_;
+					else if(tempS =='jq')
+						pa[p].fcno = pa[p].fcno-fcno_;
+				}
+				// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
+				if((bf.getDateTime(pa[p].ARRIVALTIME)-bf.getDateTime(st))/60000 > pa[p].bcsj) {
+					console.log('{' + pa[p].lpNo + '----' + pa[p].ARRIVALTIME + '----' +  st +  '}');
+					console.log('修改进出场班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
+					pa.splice(p,1);
+				} 
 			}
-			// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
-			if(bf.getDateTime(ar[i].ARRIVALTIME)>bf.getDateTime(st) && ar[i].bcType!='lc') {
-				console.log('{' + ar[i].lpNo + '----' + ar[i].ARRIVALTIME + '----' +  st +  '}')
-				console.log('修改晚例保班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
-				ar.splice(i,1);
+			// 2、修改晚例保班次.
+			for(var i = 0 ; i<ar.length;i++) {
+				// A）、修改离场班次属性值
+				if(ar[i].bcType=='lc') {
+					ar[i].fcsj =  ddsjStr;
+					ar[i].xlDir = obj.configuration.dataMap.dira[fxdm];
+					var _lcs = bf.getDateTime(ddsjStr);
+					var _lctt = new Date(_lcs);
+					_lctt.setMinutes(_lctt.getMinutes()+ar[i].bcsj);
+					ar[i].ARRIVALTIME = bf.getTimeStr(_lctt);
+					if(tempS =='add')
+						ar[i].fcno = ar[i].fcno+fcno_;
+					else if(tempS =='jq')
+						ar[i].fcno = ar[i].fcno-fcno_;
+				}
+				// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
+				if(bf.getDateTime(ar[i].ARRIVALTIME)>bf.getDateTime(st) && ar[i].bcType!='lc') {
+					console.log('{' + ar[i].lpNo + '----' + ar[i].ARRIVALTIME + '----' +  st +  '}')
+					console.log('修改晚例保班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
+					ar.splice(i,1);
+				}
 			}
-		}
-		// 3、合并进出场、例保班次,并返回.
-		return pa.concat(ar);
-	 }
+			// 3、合并进出场、例保班次,并返回.
+			return pa.concat(ar);
+		 }
+	} else{
+		error.show('参数异常!','【 obj：' + obj + ' , cardata：' + cardata + ' , bf：' + bf + '】');
+	}
 });
 </script>
 \ No newline at end of file
@@ -87,7 +87,7 @@
                             </li>
                             <li>
                                 <a href="javascript:" class="tool-action aboutread">
-                                    <i class="fa fa-arrows-v"></i>&nbsp;调整班次
+                                    <i class="fa fa-arrows-v"></i>&nbsp;班次调整
                                 </a>
                             </li>
                         </ul>
@@ -116,4 +116,5 @@
 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
 <script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>
+<script src="/pages/base/timesmodel/js/errorinfo.js"></script>
 <script src="/pages/base/timesmodel/js/gantt.js"></script>
 \ No newline at end of file
@@ -46,7 +46,8 @@
 			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.parent = d[i].lp.lpNo;// 路牌名称
+			obj.lpName = 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
@@ -60,7 +61,7 @@
 			resultD.push(obj);
 			if(lpA.indexOf(obj.lpNo)<0) {
 				lpA.push(obj.lpNo);
-				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.parent,'lpType':obj.lpType});
+				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.lpName,'lpType':obj.lpType});
 			}
 		}
 		// 返回渲染图形的数据格式.
@@ -407,7 +407,9 @@ var SKBFormWizard = function() {
 			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.parent = d[i].lp.lpName;// 路牌名称
+			// obj.parent = parseInt(d[i].lp.lpNo);// 路牌名称
+			obj.lpName = 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
@@ -421,7 +423,7 @@ var SKBFormWizard = function() {
 			resultD.push(obj);
 			if(lpA.indexOf(obj.lpNo)<0) {
 				lpA.push(obj.lpNo);
-				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.parent,'lpType':obj.lpType});
+				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.lpName,'lpType':obj.lpType});
 			}
 		}
 		// 返回渲染图形的数据格式.
@@ -388,7 +388,7 @@ var BaseFun = function() {
 				var jar = baseF.tzsmbcsj01(
 						baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
 								dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
-				// return {'json':jar,'bxrcgs':bxrcgs};
+			    // return {'json':jar,'bxrcgs':bxrcgs};
 				for(var r = 0 ; r < bxrcgs.length; r++) {
 					var lpNo = bxrcgs[r].lpNo;
 					var gsv = 0 , bczs = 0;
@@ -401,14 +401,18 @@ var BaseFun = function() {
 					bxrcgs[r].sjgsV = gsv;
 					bxrcgs[r].bczs = bczs;
 				}
+				//debugger;
 				var jar3 = baseF.dqbcsAndgs(bxrcgs,jar,dataMap,cara.length);
-				// return {'json':jar3,'bxrcgs':bxrcgs};
+				//return {'json':jar3,'bxrcgs':bxrcgs};
 				/*var jar4 =  baseF.tzsmbcsj01(
 							baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar3,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
 									dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
 				var rsjar = baseF.tzsztest(cara,jar3,dataMap);
-				// return {'json':rsjar,'bxrcgs':bxrcgs};
-				var resultJA = new Array();
+				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':bxrcgs};
+			},
+			
+			addjcclcbc01 : function(cara,rsjar,dataMap,saa,map) {
+				var resultJA = new Array(),bcs = 0;
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
 					var lpNo_ = cara[m].lpNo;
@@ -424,9 +428,68 @@ var BaseFun = function() {
 					}
 					// 按照发车序号顺序排序.
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
-					resultJA = resultJA.concat(baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map));
+					baseF.addcfbc01(lpbc_,dataMap,map);
+					// 按照发车序号顺序排序.
+					// lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+					var tt = baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map);
+					bcs = baseF.updfcno01(tt,bcs);
+					// debugger;
+					resultJA = resultJA.concat(tt);
+				}
+				return resultJA;
+			},
+			
+			updfcno01 : function(bcArr,bcs) {
+				for(var i =0; i < bcArr.length;i++) {
+					bcArr[i].fcint = baseF.getDateTime(bcArr[i].fcsj).getTime();
 				}
-				return {'json':resultJA,'bxrcgs':bxrcgs};
+				bcArr.sort(function(a,b){return a.fcint-b.fcint});
+				for(var t = 0 ; t <bcArr.length;t++) {
+					bcs++;
+					bcArr[t].bcs = bcs;
+					bcArr[t].fcno = t+1;
+					delete bcArr[t].fcint;
+				}
+				return bcs;
+			},
+			
+			addcfbc01 : function(lpbcar,dataMap,map) {
+				var gs = 0 ,sicftag = true;
+				for(var g = 0 ; g <lpbcar.length-1;g++ ) {
+					if( parseInt((baseF.getDateTime(lpbcar[g+1].fcsj)  - baseF.getDateTime(lpbcar[g].ARRIVALTIME))/60000) > 80 
+							&& lpbcar[g].STOPTIME==0  ) {
+						lpbcar[g].isfb = 1;
+					}
+					/*gs = gs + lpbcar[g].bcsj + lpbcar[g].STOPTIME;
+					if(lpbcar[g].STOPTIME==0 && g>0 && g<(lpbcar.length-1)) {
+						debugger;
+						lpbcar[g].isfb = 1;
+						sicftag = false;
+					}*/
+				}
+				/*if(sicftag) {
+					for(var j = 0 ; j <lpbcar.length;j ++ ) {
+						var kssj =  baseF.getDateTime(lpbcar[j].fcsj);
+						var tzsj =  lpbcar[j].STOPTIME;
+						var cctag = baseF.dirDmToIndex(lpbcar[j].xlDir);
+						var cfdd = baseF.getcfdd(map.cfdd,cctag);
+						if(kssj> new Date (baseF.getCFDate(10,30)) && 
+								kssj<new Date (baseF.getCFDate(11,30))  && cfdd == cctag) {
+							console.log(tzsj,lpbcar[j].fcsj);
+							rs.push(baseF.getbcObj(
+									kssj,dataMap.zwcArr[0],cara[c],dataMap.bcTypeArr.cf,
+									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0)); 
+							
+						}else if(kssj > new Date (baseF.getCFDate(18,30)) && 
+									kssj < new Date (baseF.getCFDate(19,30))  && cfdd == cctag ) {
+							console.log(tzsj,lpbcar[j].fcsj);
+							rs.push(baseF.getbcObj(
+									kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
+									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0)); 
+							
+						}
+					}
+				}*/
 			},
 			dqbcsAndgs : function(bxrcgs,jar,dataMap,cla) {
@@ -538,9 +601,11 @@ var BaseFun = function() {
 									for(var q = 0 ; q < qbbfbc.length; q++) {
 										if(q<(qbbfbc.length-1))
 											qbbfbc[q].STOPTIME = qbbfbc[q].STOPTIME + vag;
-										if(q==0)
-											continue;
-										else {
+										if(q==0) {
+											var fcsj_ =  baseF.getDateTime(qbbfbc[q].fcsj);
+											fcsj_.setMinutes(fcsj_.getMinutes() + qbbfbc[q].bcsj);
+											qbbfbc[q].ARRIVALTIME = baseF.getTimeStr(fcsj_);
+										}else {
 											var ddsj_ =  baseF.getDateTime(qbbfbc[q-1].ARRIVALTIME);
 											ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q-1].STOPTIME);
 											qbbfbc[q].fcsj = baseF.getTimeStr(ddsj_);
@@ -616,6 +681,9 @@ var BaseFun = function() {
 				var dygbcfcsj =  baseF.getDateTime(obj.fcsj);
 				dygbcfcsj.setMinutes(dygbcfcsj.getMinutes() - dx);
 				obj.fcsj = baseF.getTimeStr(dygbcfcsj);
+				
+				dygbcfcsj.setMinutes(dygbcfcsj.getMinutes() + obj.bcsj);
+				obj.ARRIVALTIME = baseF.getTimeStr(dygbcfcsj);
 			},
 			zhygbcUpd: function(obj,xgOjb,dx) {
@@ -800,7 +868,25 @@ var BaseFun = function() {
 								dqbcfcsj,dataMap.ccsjArr[fxdm],car,dataMap.bcTypeArr.out,
 								dataMap.dira[fxdm],2,dataMap.cclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 出场班次
 						fcno ++;
-					}else if(b==bc.length-1){
+					}/*else if(b > 0 && b < bc.length-1){
+						var jcbckssj =  baseF.getDateTime(bc[b].ARRIVALTIME)
+						var ccbckssj = baseF.getDateTime(bc[b+1].fcsj)
+						var dx = parseInt((ccbckssj - jcbckssj)/60000);
+						if(bc[b].STOPTIME==0) {
+							 // bc[b].STOPTIME = 0;
+							//console.log(bc[b].fcno);
+							var fcno_ =  bc[b].fcno + 2;
+							stas = true;
+							// console.log(bc[b],bc[b+1],b);
+							result.push(baseF.getbcObj(
+									jcbckssj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
+									dataMap.dira[fxdm],fcno_++,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
+							var ccfx = baseF.dirDmToIndex(bc[b+1].xlDir);
+							result.push(baseF.getbcObj(
+									ccbckssj,dataMap.ccsjArr[ccfx],car,dataMap.bcTypeArr.out,
+									dataMap.dira[ccfx],fcno_++,dataMap.cclcArr[ccfx],gatps,0,dataMap.qdzArr[ccfx],null,null,0,0));// 出场班次
+						}
+					}*/else if(b==bc.length-1){
 						var fcno_ =  dxfno + 2;
 						var qdbcddsj = baseF.getDateTime(bc[b].ARRIVALTIME);
 						result.push(baseF.getbcObj(
@@ -1590,32 +1676,7 @@ var BaseFun = function() {
 			            {'type':'无工休',  'hoursV':5.43,  'minueV':'5:43'}];
 			},
 			setbcsAndfcno : function(listA) {
-				/*var array = new Array();
-				var len = listA.length;
-				for(var i =0;i<len;i++) {
-					if(array.indexOf(listA[i].lpNo)<0)
-						array.push(listA[i].lpNo);
-				}
-				array.sort(baseF.compare);
-				console.log(array);
-				var sortGattArray = new Array();
-				for(var k =0;k<array.length;k++) {
-					var index = array[k];
-					var temp = new Array();
-					for(var x=0;x<listA.length;x++) {
-						if(index==listA[x].lpNo)
-							temp.push(listA[x]);
-					}
-					var lpbc = baseF.sortDirArray(temp);
-					for(var p = 0 ;p<lpbc.length;p++) {
-						lpbc[p].fcno = (p+1);
-					}
-					sortGattArray = sortGattArray.concat(lpbc);
-				}
-				for(var b = 0 ; b <sortGattArray.length;b++) {
-					sortGattArray[b].bcs = (b+1);
-				}
-				return sortGattArray;*/
+				 
 				var array = new Array();
 				var len = listA.length;
 				for(var i =0;i<len;i++) {
@@ -1886,8 +1947,10 @@ var BaseFun = function() {
 											kssj,
 											obj.configuration.dataMap.pcxssjArr,
 											obj.configuration.dataMap.gfxxsjArr,cctag);// 获取行驶时间
-					tzsj =  obj.configuration.dataMap.ztjxA[cctag];
-					var temptzsj = t == num-1 ? 0 : tzsj;
+					// tzsj =  obj.configuration.dataMap.ztjxA[cctag];
+					var tzjx =  baseF.isgfsjd01(kssj,obj.configuration.dataMap) ?  obj.configuration.dataMap.gftzsj[cctag] : obj.configuration.dataMap.dgtzsj[cctag];
+					var temptzsj =  ((t == num-1) ? 0 : tzsj);
+					/*var xs_tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;*/
 					jsonArray.push(baseF.getbcObj( kssj,
 												_xxsj,
 												carArray,
@@ -1900,7 +1963,7 @@ var BaseFun = function() {
 												obj.configuration.dataMap.zdzArr[cctag],
 												null,temptzsj,0));
 					// kssj = new Date(kssj.setMinutes(kssj.getMinutes() + temptzsj));
-					kssj.setMinutes(kssj.getMinutes() + temptzsj)
+					kssj.setMinutes(kssj.getMinutes() + tzjx)
 				}
 				lastObj.STOPTIME = 10;
 			},
@@ -229,7 +229,7 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
 /** 
- * @description : (TODO) 调整班次点击事件
+ * @description : (TODO) 班次调整点击事件
  * 
  * @status OK.
  ************************************************************************************************************************************************/
@@ -417,31 +417,6 @@ $(&#39;.editlp&#39;).on(&#39;click&#39;,function() {
  });
 /************************************************************************************************************************************************/
-/**
- * @description : (TODO)获取路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间) 
- * 
- * @params : [a1--班次数组；a2--路牌数组]
- * 
- * @return : 返回一个数组.这里返回的是一个封装的每个路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间、班次时间为0的班次) 
- ************************************************************************************************************************************************/
-var getbczs = function (a1,a2) {
-	var array = new Array();
-	// 1、遍历路牌数组
-	for(var i = 0;i<a2.length;i++) {
-		var bcs = 0;
-		// 2、遍历班次数组
-		for(var j =0;j<a1.length;j++) {
-			// 3、判断当前班次j是否属于当前路牌i下,除去早晚例保班次、吃饭时间、班次时间为0的班次
-			if(a1[j].parent == a2[i].lpA.lpNo && a1[j].bcType!='bd' && a1[j].bcType!='lc' && a1[j].bcType!='cf' && a1[j].bcsj>0)
-					bcs++;
-		}
-		// 4、把每个路牌下的对应班次数一一封装在一起,并添加到返回数组里边
-		array.push({lpNo:a2[i].lpA.lpNo,bcs:bcs});
-	}
-	return array;
-}
-/************************************************************************************************************************************************/
- 
 /**
  * d3动画过度
@@ -647,7 +622,6 @@ var RelationshipGraph = function () {
         			  .ordinal()
         			  .domain(this.configuration.lpNameA)
         			  .rangeRoundBands([ 0, this.configuration.height], .1);
-        	
             this.configuration.y = y;
             // 创建X轴
     		var xAxis = d3.svg
@@ -733,7 +707,7 @@ var RelationshipGraph = function () {
         		yAxisYArray.splice(0,yAxisYArray.length);
         	for(var t = 0;t<this.configuration.taskTypes.length;t++) {
         		yAxisYArray.push({
-        			y:y(this.configuration.taskTypes[t].lpNo)+this.configuration.offsetY,
+        			y:y(this.configuration.taskTypes[t].lpName)+this.configuration.offsetY,
         			carname:this.configuration.taskTypes[t].lpName,
         			lpA : this.configuration.taskTypes[t]});
         	}
@@ -938,6 +912,44 @@ var RelationshipGraph = function () {
     		return dataArray;
     	}
     }, {
+    	/**
+    	 * @description : (TODO) 获取路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间) 
+    	 * 
+    	 * @params : [a1--班次数组；a2--路牌数组]
+    	 * 
+    	 * @return : 返回一个数组.这里返回的是一个封装的每个路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间、班次时间为0的班次) 
+    	 **/
+    	key : 'getbczs',
+    	value : function getbczs(a1,a2,dataMap) {
+    		// 定义返回数组.
+    		var array = new Array();
+    		// 判断参数数组长度大于〇，dataMap不能为空.
+    		if(a1.length>0 && a2.length>0 && dataMap!=null && dataMap!='') {
+    			// 遍历路牌数组
+    			for(var i = 0 ;i < a2.length ; i++) {
+    				// 定义当前路牌下班次数，初始化为0.
+    				var bcs = 0;
+    				// 遍历班次数组
+    				for(var j = 0 ; j < a1.length ; j++) {
+    					// 判断当前班次j是否属于当前路牌i下,除去早晚例保班次、吃饭时间、班次时间为0的班次
+    					if(a1[j].parent == a2[i].lpA.lpNo && 
+    							a1[j].bcType != dataMap.bcTypeArr.bd && 
+    							a1[j].bcType != dataMap.bcTypeArr.lc && 
+    							a1[j].bcType != dataMap.bcTypeArr.cf && 
+    							a1[j].bcsj > 0) {
+    						bcs++;
+    					}
+    				}
+    				// 把每个路牌下的对应班次数一一封装在一起,并添加到返回数组里边
+    				array.push({lpNo : a2[i].lpA.lpNo , lpName:a2[i].lpA.lpName , bcs:bcs});
+    			}
+    		}else {
+    			error.show('参数异常!','【 a1：' + a1 + ' , a2：' + a2 + ' , dataMap：' + dataMap + '】');
+    			// console.log("您传入的参数异常!【 a1：" + a1 + ", a2：" + a2 + ", dataMap：" + dataMap);
+    		}
+    		return array;
+    	}
+    }, {
     	key : 'addHistory' ,
     	value : function addHistory() {
     		historyArray.push({'data':JSON.stringify(this.getDataArray()),'granph':JSON.stringify(this.configuration)});
@@ -1410,7 +1422,7 @@ var RelationshipGraph = function () {
     	}
     }, {
     	/**
-    	 * @description : (TODO) 调整班次函数.
+    	 * @description : (TODO) 班次调整函数.
     	 * 
     	 * @status OK.
     	 * */
@@ -1419,7 +1431,9 @@ var RelationshipGraph = function () {
     		// 弹出层mobal页面
     		$.get('/pages/base/timesmodel/bctz.html', function(m){
     			$(pjaxContainer).append(m);
-    			$('#tzbc_mobal').trigger('tzbcMobal.show',[$_GlobalGraph,getbczs($_GlobalGraph.getDataArray(),yAxisYArray),BaseFun]);
+    			// 获取各路牌下的班次数
+    			var lpbcs = $_GlobalGraph.getbczs($_GlobalGraph.getDataArray() , yAxisYArray , $_GlobalGraph.configuration.dataMap);
+    			$('#tzbc_mobal').trigger('tzbcMobal.show',[$_GlobalGraph , lpbcs , BaseFun , ErrorInfo]);
     		});
     	}
@@ -2476,9 +2490,11 @@ var RelationshipGraph = function () {
     		for(var s = 0 ; s < len ; s++) {
     			var rectNodesAttr = RelationshipGraph.getContextNodeAndData(d3.select(shiftRectA[s]).attr('id'));
     			if(rectNodesAttr.dqbcData.STOPTIME<0) {
-    				var nextTzsjDx = $_GlobalGraph.configuration.dataMap.minztjx - rectNodesAttr.dqbcData.STOPTIME;
+    				// var nextTzsjDx = $_GlobalGraph.configuration.dataMap.minztjx - rectNodesAttr.dqbcData.STOPTIME;
+    				var nextTzsjDx = 0 - rectNodesAttr.dqbcData.STOPTIME;
     				// 修改遍历的当前元素数据的停站时间为最小停站时间.
-    				rectNodesAttr.dqbcData.STOPTIME =  $_GlobalGraph.configuration.dataMap.minztjx;
+    				// rectNodesAttr.dqbcData.STOPTIME =  $_GlobalGraph.configuration.dataMap.minztjx;
+    				rectNodesAttr.dqbcData.STOPTIME =  0;
     				// 修改遍历的当前元素数据的文本展示停站时间
     				for(var t = 0 ; t < rectNodesAttr.dqbctextNodes.length ; t++) {
     					if(d3.select(rectNodesAttr.dqbctextNodes[t]).attr('text-type')=='gap') 
@@ -2501,6 +2517,7 @@ var RelationshipGraph = function () {
     				 * 修改下个班次的元素坐标属性值
     				 * 
     				 * */
+    				
     				rectNodesAttr.nextbcNode.attr('x',$_x);
     				var rectCover = d3.select(d3.selectAll('rect[parent-node='+ rectNodesAttr.nextbcNodeId + '-cover' +']')[0][0]);
     				rectCover.attr('x',$_x);
@@ -2996,7 +3013,7 @@ var RelationshipGraph = function () {
 			nowDate.setMinutes(parseInt(tm.min)+d.bcsj);// 10.3.1、设置分钟.
 			// 9.1.4、修改当前班次的到达时间.
 			d.ARRIVALTIME  =  BaseFun.getTimeStr(nowDate);
-			d.STOPTIME = parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
+			d.STOPTIME = d.isfb ==1 ? 0 : parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
     		/**
     		 * 9.2、修改元素沿X轴方向的X坐标属性值. 
     		 * 
@@ -3017,6 +3034,8 @@ var RelationshipGraph = function () {
     		}
     		/****************************************** update 当前的班次数据以及相关元素对象属性值. END ************************************/
+    		//console.log(nodeContext);
+    		//debugger;
     		// 10、计算与上个班次的停站时间.
 			var dxMinues =  parseInt((BaseFun.getDateTime(d.fcsj) - BaseFun.getDateTime(nodeContext.lastData.ARRIVALTIME)) / 60000);
@@ -3163,7 +3182,8 @@ var RelationshipGraph = function () {
     			 **/
         		var _obj = RelationshipGraph.getContextNodeAndData(d3.select(this).attr('parent-node').replace('-cover',''));
         		// 1.3、定义最小停站间隙.
-    			var minSoptTime = $_GlobalGraph.configuration.dataMap.minztjx;
+    			// var minSoptTime = $_GlobalGraph.configuration.dataMap.minztjx;
+        		var minSoptTime = 0;
     			// 1.4、创建当前时间对象.
     			var $_date = new Date();
     			// 1.5、判断 如果当前班次的停站时间小于零,则修改成最小停站时间.
+ErrorInfo = function() {
+	var error = {
+			show : function(title , content) {
+				layer.open({
+					  title: title,
+					  content: content
+				});  
+			}
+	}
+	return error;
+}();
 \ No newline at end of file
@@ -70,8 +70,28 @@
 		}else {
 			var jsonA = JSON.parse(objD);
 			// 使用已有的时刻表明细数据渲染视图.
-			data = {'json':jsonA.rsD,'bxrcgs':null};
+			// data = {'json':jsonA.rsD,'bxrcgs':null};
 			CSMap = {'gattA':null,'stopSpace': Math.round(map.zzsj/map.clzs),'maxCar':jsonA.rsLP};
+			var cara = jsonA.rsLP;
+			var rsjar = jsonA.rsD;
+			var resultJA = new Array();
+			for(var m = 0 ; m < cara.length; m++) {
+				// 获取路牌编号.
+				var lpNo_ = cara[m].lpNo;
+				// 定义路牌下的所有班次.
+				var lpbc_ = new Array();
+				// 遍历班次数.
+				for(var x =0 ; x <rsjar.length; x++) {
+					// 判断当期遍历的班次是否属于当前的路牌.
+					if(rsjar[x].lpNo == lpNo_) {
+						lpbc_.push(rsjar[x]);
+					}
+				}
+				// 按照发车序号顺序排序.
+				lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+				resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,stopAraay[0].lbsj,map));
+			}
+			data = {'json':rsjar,'bxrcgs':null};
 		}
 		// 创建甘特图对象.
 		var graph = d3.select('#ganttSvg').relationshipGraph(
@@ -401,6 +421,7 @@
         var hours=Math.floor(leave1/(3600*1000));
         DXHOURS = days*24+hours;
         WIDTH = DXHOURS*MINUTE*MULTIPLE;
+        // debugger;
         var lpsplitA = getylp(p.yAxisCarArray);
 		var args = {
     	        'valueKeyName': VALUEKEYNAME,