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 8280bfd3 8314d699
Showing 13 changed files with 390 additions and 126 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
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/tepms/bctype_temp.html
@@ -175,13 +175,14 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			resList.add(m);
 		}
 		try {
+			map.put("sheetName", map.get("rq"));
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
 				path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
 			} catch (Exception e) {
 				e.printStackTrace();
-			}	
+			}
 		return resList;
@@ -276,6 +276,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			resList.add(m);
 		}
 		try {
+			map.put("sheetName", map.get("rq"));
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
@@ -289,7 +289,7 @@ public class BasicData implements CommandLineRunner {
                         num = 1;
                         lineCode = tempArray[0]+"";
                     }
-                    key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
+                    key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[3];
                     tempStationName2YgcNumber.put(key,num++);
                 }
             }
@@ -43,7 +43,7 @@ public class CarOutInfoHandler {
         bcTypeMap.put("ldks", "两点间空驶");
     }
-    private static ScheduleComparator.FCSJ schFCSJComparator = new ScheduleComparator.FCSJ();
+    private static ScheduleComparator.DFSJ schDFSJComparator = new ScheduleComparator.DFSJ();
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -165,9 +165,9 @@ public class CarOutInfoHandler {
      */
     private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
-        Collections.sort(list, schFCSJComparator);
+        Collections.sort(list, schDFSJComparator);
-        int count = 0, threshold = 1000 * 60 * 30;
+        int count = 0, threshold = 1000 * 60 * 60;
         long t = System.currentTimeMillis();
         for (ScheduleRealInfo sch : list) {
             if (count == 3)
@@ -28,4 +28,12 @@ public class ScheduleComparator {
 			return (int) (s1.getFcsjT() - s2.getFcsjT());
 		}
 	}
+
+	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
+
+		@Override
+		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+			return (int) (s1.getDfsjT() - s2.getDfsjT());
+		}
+	}
 }
@@ -3,7 +3,6 @@ package com.bsth.repository;
 import java.util.List;
 import java.util.Map;
-import com.bsth.entity.schedule.CarConfigInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -15,7 +14,6 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.Line;
-import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
 /**
@@ -262,7 +260,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	List<StationRoute> findByLineCode(String lineCode);
 	@Query("SELECT " +
-			"lineCode,directions,stationName,stationRouteCode " +
+			"lineCode,directions,stationName,stationCode " +
 			"FROM " +
 			"StationRoute s " +
 			"WHERE " +
@@ -335,7 +335,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					arg0.setDestroy(destroy);
 					// 版本号
 					arg0.setVersions(versions);
-					/*arg0.setbJwpoints(bJwpoints);*/
+					arg0.setbJwpoints(bJwpoints);
 					// 插入站点信息
 					repository.save(arg0);
@@ -140,51 +140,45 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		try {
 			Iterator<Line> lineIterator = lineRepository.findAll().iterator();
 			Line line = null;
-			List<StationRoute> stationsList = null;// 站点路由集
+			List<StationRoute> upStationsList = null;// 上行站点路由集
+			List<StationRoute> downStationsList = null;// 下行站点路由集
 			List<LineInformation> lineInformationsList = null;
 			LineInformation lineInformation = null;
-			sBuffer.append("<XLs>");
+			sBuffer.append("<Data>");
+			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
+			sBuffer.append("<DataList>");
 			while(lineIterator.hasNext()){
 				line = lineIterator.next();
+				if(!line.getName().equals("浦江4路")){
+					continue;
+				}
 				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
 						|| line.getInUse() == 0){
 					continue;
 				}
-				sBuffer.append("<XL>");
-				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
-				sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
-				sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
-				sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
-				// 线路标准信息实体
-				lineInformationsList = lineInformationRepository.findByLine(line);
-				int size = lineInformationsList.size();
-				if(lineInformationsList != null && size > 0){
-					double upMileage = 0.0; // 上行里程
-					double downMileage = 0.0; // 下行里程
-					// 如果线路标准有多个，累加上行里程和下行里程
-					for (int i = 0; i < size; i++) {
-						lineInformation = lineInformationsList.get(i);
-						upMileage +=lineInformation.getUpMileage();
-						downMileage +=lineInformation.getDownMileage();
-					}
-					sBuffer.append("<QZLC>").append(upMileage).append("</QZLC>");
-					sBuffer.append("<ZQLC>").append(downMileage).append("</ZQLC>");
-				}
-				sBuffer.append("<XLGH>").append(line.getLinePlayType() == null ?"0":line.getLinePlayType())
-						.append("</XLGH>");
+				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
+				sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");
+				sBuffer.append("<LINE_NAME>").append(line.getName()).append("</LINE_NAME>");
 				// 循环添加站点信息
-				sBuffer.append("<StationList>");
+				sBuffer.append("<LineStationList>");
 				// 先查上行
-				stationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
 				int startId = 1;
-				startId = packagStationXml(stationsList, sBuffer, startId);
+				startId = packagStationXml(upStationsList, sBuffer, startId);
 				// 再查下行
-				stationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-				packagStationXml(stationsList, sBuffer, startId);
-				sBuffer.append("</StationList>");
-				sBuffer.append("</XL>");
+				downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+				packagStationXml(downStationsList, sBuffer, startId);
+				sBuffer.append("</LineStationList>");
+
+				// 循环添加站点点位信息
+				sBuffer.append("<LinePointList>");
+				startId = 1;
+				startId = packagStationPointXml(upStationsList, sBuffer, startId);
+				packagStationPointXml(downStationsList, sBuffer, startId);
+				sBuffer.append("</LinePointList>");
 			}
-			sBuffer.append("</XLs>");
+			sBuffer.append("</DataList>");
+			sBuffer.append("</Data>");
 			System.out.println(sBuffer.toString());
 			if(sBuffer.indexOf("<XL>") != -1){
 				portType = new Internal().getInternalHttpSoap11Endpoint();
@@ -329,7 +323,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
 					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<LDList>");
-
 					for(ScheduleRealInfo scheduleRealInfo:list){
 						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
 								.equals(scheduleRealInfo.getLpName())
@@ -355,7 +348,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
 							sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
 							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzName()) + "</FCZDXH>");
+									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzCode()) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
@@ -363,7 +356,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sf.append("<FCZDLX>"+""+"</FCZDLX>");
 							sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
 							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzName()) +"</DDZDXH>");
+									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzCode()) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -382,6 +375,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
 					if(results.isSuccess()){
 						result = "success";
+					}else{
+						result = "failure";
 					}
 					logger.info("setLD:"+sf.toString());
 					logger.info("setLD:"+result);
@@ -393,11 +388,33 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
 				if(results.isSuccess()){
 					result = "success";
+				}else{
+					result = "failure";
 				}
 				logger.info("setLD:"+sf.toString());
 				logger.info("setLD:"+result);
 			}
+		} catch (Exception e) {
+			logger.error("setLD:",e);
+			e.printStackTrace();
+		}finally{
+		}
+		return result;
+	}
+
+	/**
+	 * 上传路单 xml来自文件
+	 * @return 上传成功标识
+	 */
+	public String setLDFile(){
+		String result = "failure";
+		try {
+			String tmp = readXmlFromFile("E:/ld.txt");
+			Results rss = ssop.setLD(userNameOther, passwordOther, tmp);
+			if(rss.isSuccess()){
+				result = "success";
+			}
 		} catch (Exception e) {
 			logger.error("setLD:",e);
 			e.printStackTrace();
@@ -660,11 +677,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
 						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzName())).append("</ZDXH>");
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzCode())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
 						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</DDXH>");
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzCode())).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -767,11 +784,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
 						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationName())).append("</ZDXH>");
+								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationCod())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
 						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationName())).append("</DDXH>");
+								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationCod())).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBuffer.append("</BC>");
 					}
@@ -1131,15 +1148,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				zdlx = "2";
 			}
 			sBuffer.append("<Station>");
-			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationName())).append("</ZDXH>");
-			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
-			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
-			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
-			sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
-			sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
-			sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr()).append("</ZZ>");//站点的具体地址
-			sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
-			sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
+			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_ID>");
+			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
+			sBuffer.append("<STATION_NO>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_NO>");
+			sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");
+			sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");
+			sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");
+			sBuffer.append("<STATION_LAT>").append(srRoute.getStation().getgLaty()).append("</STATION_LAT>");
+			sBuffer.append("<STATION_TYPE>").append(zdlx).append("</STATION_TYPE>");
+			sBuffer.append("<STATION_DISTANCE>").append(srRoute.getDistances()).append("</STATION_DISTANCE>");
 			sBuffer.append("</Station>");
 			startId++;
 		}
@@ -1147,15 +1164,47 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * @param stationsList 站点路由集
+	 * @param sBuffer sBuffer
+	 * @param startId 站点序号起始ID
+	 *
+	 * @return 站点序号累加后的ID
+	 */
+	private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
+		int size = stationsList.size();
+		StationRoute srRoute;
+		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
+		for (int i = 0; i < size; i++) {
+			srRoute = stationsList.get(i);
+			zdlx = srRoute.getStationMark();
+			if(zdlx.equals("B")){
+				zdlx = "0";
+			}else if(zdlx.equals("E")){
+				zdlx = "1";
+			}else{
+				zdlx = "2";
+			}
+			sBuffer.append("<Point>");
+			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</POINT_ID>");
+			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
+			sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");
+			sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");
+			sBuffer.append("</Point>");
+			startId++;
+		}
+		return startId;
+	}
+
+	/**
 	 *
 	 * @param lineCode 线路编码
 	 * @param direction 线路方向
-	 * @param stationName 让点名称
+	 * @param stationCode 让点名称
 	 * @return 运管处站点序号
 	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationName){
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationCode){
 		Integer number = 0;
-		number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationName);
-		return number;
+		number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode);
+		return number == null ? 0 : number;
 	}
 }
@@ -47,6 +47,10 @@ public class ReportUtils {
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
 					sourcePath));
 			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			Map<String, Object> m = (Map<String, Object>)tArray[0];
+			if(m.containsKey("sheetName") && m.get("sheetName")!=null
+					&& m.get("sheetName").toString().trim().length()!=0)
+				wb.setSheetName(0, m.get("sheetName").toString());
 			HSSFSheet sheet = wb.getSheetAt(0);
 			HSSFRow row;
 			HSSFCell cell = null;
@@ -325,11 +325,9 @@ var BaseFun = function() {
 			},
 			BXPplaceClassesTime01 : function(saa,cara,map,seMap,dataMap,lpNoA) {
-				var allJsonD = baseF.plgfbc(saa,cara,map,seMap,dataMap);
-				var jsonArray = baseF.tzsmbcsj01(baseF.setbcsAndfcno(allJsonD),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
+				var jsonArray = baseF.plgfbc(saa,cara,map,seMap,dataMap);
 				var list = baseF.splitBxRc(map.bxrc);
 				baseF.fprclp01(list,cara);
-				console.log(list);
 				var bxrclist = list.data;
 				var rs = new Array(),bxrcgs= new Array();
 				// 遍历已分配好路牌的班型人次数组.	
@@ -356,12 +354,19 @@ var BaseFun = function() {
 						// 按照发车序号顺序排序.
 						lpbc.sort(function(a,b){return b.fcno-a.fcno});
 						// 调整班次数.也就是说调整工时.
-						baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa);
-						rs = rs.concat(lpbc);
+						rs = rs.concat(baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
 					}
 				}
-				var jar = baseF.tzsmbcsj01(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
-				//var jar = baseF.tzsmbcsj(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
+				var jar01 = baseF.tzsmbcsj01(
+						baseF.setbcsAndfcno(
+								baseF.tzsztest(cara,
+										baseF.tzsmbcsj01(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap),
+										dataMap)),
+								dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
+				baseF.jhfcjx01(jar01,dataMap);
+				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);
 				var resultJA = new Array();
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
@@ -369,17 +374,138 @@ var BaseFun = function() {
 					// 定义路牌下的所有班次.
 					var lpbc_ = new Array();
 					// 遍历班次数.
-					for(var j =0 ; j <jar.length; j++) {
+					for(var x =0 ; x <jar.length; x++) {
 						// 判断当期遍历的班次是否属于当前的路牌.
-						if(jar[j].lpNo == lpNo_)
-							lpbc_.push(jar[j]);
+						if(jar[x].lpNo == lpNo_)
+							lpbc_.push(jar[x]);
 					}
 					// 按照发车序号顺序排序.
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
 					resultJA = resultJA.concat(baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map));
-					// resultJA = resultJA.concat(lpbc_);
 				}
-				return {'json':resultJA,'bxrcgs':null};
+				return {'json':resultJA,'bxrcgs':bxrcgs};
+			},
+			
+			tzsztest : function(cara,tempa,dataMap) {
+				var jsrs = new Array();
+				for(var t = 0 ; t < cara.length; t++) {
+					var sslpbcA = new Array();
+					for(var j =0 ; j <tempa.length; j++) {
+						// 判断当期遍历的班次是否属于当前的路牌.
+						if(tempa[j].lpNo == cara[t].lpNo)
+							sslpbcA.push(tempa[j]);
+					}
+					sslpbcA.sort(function(a,b){return a.fcno-b.fcno});
+					baseF.isbczt(sslpbcA,dataMap);
+					baseF.istccf(sslpbcA,dataMap);
+					baseF.tztzsjInit01(sslpbcA,dataMap);
+					jsrs = jsrs.concat(sslpbcA);
+				}
+				return jsrs;
+			},
+			
+			isbczt : function(ar,dataMap) {
+				for(var r = 0 ; r< ar.length-1;r++) {
+					if(ar[r].bcType==dataMap.bcTypeArr.cf)
+						continue;
+					if(ar[r].xlDir == ar[r+1].xlDir) {
+						ar.splice(r, 1);
+						r--;
+					}
+						
+				}
+			},
+			
+			istccf : function(ar,dataMap) {
+				for(var r = 0 ; r < ar.length;r++) {
+					if(ar[r].bcType==dataMap.bcTypeArr.cf){
+						if(r == ar.length-1){
+							ar.splice(r, 1);
+							break;
+						}else {
+							 var xbcsj = baseF.getDateTime(ar[r+1].fcsj);
+							 if(dataMap.wgfsjd[0].st <= xbcsj && xbcsj <=  dataMap.wgfsjd[0].ed) {
+								 ar.splice(r, 1);
+								 r--;
+							 }
+						}
+					}
+				}
+				
+			},
+			
+			tztzsjInit01 : function(ar,dataMap) {
+				for(var r = 0 ; r< ar.length-1;r++) {
+					var sgbcfcsj = baseF.getDateTime(ar[r+1].fcsj),dqbcddsj = baseF.getDateTime(ar[r].ARRIVALTIME);
+					var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
+					if(dxmin<0 || ar[r].STOPTIME<0) {
+						var cctag = baseF.dirDmToIndex(ar[r].xlDir);
+						dxmin =  ar[r].bcType == dataMap.bcTypeArr.cf ? 0 :  baseF.isgfsjd01(baseF.getDateTime(ar[r].fcsj),dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+						ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
+						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
+						/*sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - dxmin);
+						ar[r].ARRIVALTIME = baseF.getTimeStr(sgbcfcsj);
+						sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - ar[r].bcsj);
+						ar[r].fcsj = baseF.getTimeStr(sgbcfcsj);*/
+					}
+					ar[r].STOPTIME = dxmin>180 ? 0 : dxmin;
+				}
+			},
+			
+			/** 
+			 * @description : (TODO) 均匀发车间隙
+			 * 
+			 * @params : [arr--某个方向下的班次数组;dir--方向;zzsj--周转时间]
+			 * 
+			 * @return : 返回一个数组.这里返回的是调整过后 发车间距均匀的班次数组
+			 **/
+			jhfcjx01 : function(bcArr,dataMap) {
+				if(bcArr.length<=0)
+					return;
+				var dirA = dataMap.dira;
+				for(var d = 0 ; d < dirA.length; d++) {
+					var fxdm = dirA[d],fxbc = new Array();
+					var cctag = baseF.dirDmToIndex(fxdm);
+					for(var b = 0;b<bcArr.length ; b++) {
+						bcArr[b].fcint = baseF.getDateTime(bcArr[b].fcsj).getTime();
+						if(bcArr[b].xlDir == fxdm)
+							fxbc.push(bcArr[b]);
+					}
+					var kssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].kssj),// 开始时间.
+						jssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].jssj);// 结束时间.
+					fxbc.sort(function(m,n){return m.fcint - n.fcint});
+					while(kssj<=jssj) {
+						var tagboolean = baseF.isgfsjd01(kssj,dataMap);
+						var zzsj =  tagboolean ?  dataMap.zzsj.gfzzsj : dataMap.zzsj.dgzzsj;
+						if(!tagboolean){
+							var temp = new Date();
+							temp.setHours(kssj.getHours());
+							temp.setMinutes(kssj.getMinutes()+zzsj);
+							var sjdbcArr = baseF.getObjRegion(kssj,temp,fxbc,dataMap);
+							var len_ = sjdbcArr.length;
+							var bcCount = baseF.getlpNum(sjdbcArr);// 定长度
+							if(len_>0 && bcCount > 0) {
+								var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
+								var fcnosj = new Date(kssj);
+								for(var l = 0 ; l< len_ ; l++) {
+									sjdbcArr[l].fcsj = baseF.getTimeStr(fcnosj);
+									var _xxsj = baseF.getxssj(dataMap.zgfsjd,
+											  dataMap.wgfsjd,fcnosj,dataMap.pcxssjArr,
+											  dataMap.gfxxsjArr,baseF.dirDmToIndex(sjdbcArr[l].xlDir));// 获取行驶时间
+									sjdbcArr[l].bcsj = _xxsj;
+									var ddsj = new Date();
+									ddsj.setHours(fcnosj.getHours());
+									ddsj.setMinutes(fcnosj.getMinutes()+_xxsj);
+									sjdbcArr[l].ARRIVALTIME = baseF.getTimeStr(ddsj);
+									fcnosj.setMinutes(fcnosj.getMinutes() + _fcjx);
+								}
+							} 	
+						}
+						kssj = new Date(kssj.setMinutes(kssj.getMinutes() + zzsj));
+					}
+				}
 			},
 			/**
@@ -432,20 +558,10 @@ var BaseFun = function() {
 			 * @param [arr--当前路牌下的班次数组;gs--当前路牌的总工时;dataMap--参数信息;lpNo--路牌编码;saa--参数信息]
 			 * 
 			 * */
-			tzlpgs01 : function(arr,gs,map,dataMap,lpNo,saa) {
+			tzlpgs01 : function(arr,gs,map,dataMap,lpNo,saa,type,lpNo,cla) {
 				// 定义当前路牌的进场时间、早晚例保时间.
 				var jczwsj = saa[0].lbsj*2 + dataMap.ccsjArr[baseF.dirDmToIndex(arr[0].xlDir)] + 
 							 dataMap.jcsjArr[baseF.dirDmToIndex(arr[arr.length-1].xlDir)];
-				// 定义开始、结束时间.
-				//var st = null , ed = null;
-				// 根据路牌编码依次轮流取高峰之间和晚高峰之后的时间段.
-				/*if(lpNo%2!=0) {
-					st = dataMap.gfzjsjd[0].st;
-					ed = dataMap.gfzjsjd[0].ed;
-				}else {
-					st = dataMap.wgfzhsjd[0].st;
-					ed = dataMap.wgfzhsjd[0].ed;
-				}*/
 				// 定义路牌总工时.第一次切高峰之间和晚高峰之后的班次.
 				var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
 				while(lpdqzgs>gs) {
@@ -453,31 +569,66 @@ var BaseFun = function() {
 						// 得到当前路牌下的发车时间.
 						var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
 						// 判断时间范围.
-						if(!baseF.isgfsjd01(dqbcfcsj,dataMap)) {
+						if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
 							arr.splice(t,1);
 							break;
 						}
 					}
 					lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
 				}
-				// 判断总工时是否大于班型对应的工时.
-				/*if(lpdqzgs>gs) {
-					// 定义相差值.
-					var dx = parseFloat((lpdqzgs - gs).toFixed(2));
-					// 定义圈数.
-					var qs = Math.round(dx*60/70);
-					for(var t = 0 ; t<arr.length;t++) {
-						// 得到当前路牌下的发车时间.
-						var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
-						// 判断时间范围.
-						if(dqbcfcsj>st && dqbcfcsj<ed) {
-							arr[t-1].STOPTIME = 0;
-							// 切割.
-							arr.splice(t,qs*2);
-							break;
+				for(var c = 0 ; c<arr.length;c++) {
+					var cfsjbc = baseF.getDateTime(arr[c].fcsj);
+					if(dataMap.gfzjsjd[0].st <= cfsjbc && cfsjbc <= dataMap.gfzjsjd[0].ed && arr[c].bcType == dataMap.bcTypeArr.cf )
+						gfzjst = baseF.getDateTime(arr[c].ARRIVALTIME);
+				}
+				gfzjst == null ? dataMap.gfzjsjd[0].st  : gfzjst;
+				var gfzjbc = new Array(),wgfbc = new Array(),zgfbc = new Array();
+				for(var a = 0 ; a<arr.length;a++) {
+					var tmkssj = baseF.getDateTime(arr[a].fcsj)
+					if(gfzjst <= tmkssj && tmkssj <= dataMap.gfzjsjd[0].ed)
+						gfzjbc.push(arr[a]);
+					else if(dataMap.wgfsjd[0].st <= tmkssj && tmkssj <= dataMap.wgfsjd[0].ed)
+						wgfbc.push(arr[a]);
+					else
+						zgfbc.push(arr[a]);
+				}
+				gfzjbc.sort(function(a,b){return a.fcno-b.fcno});
+				wgfbc.sort(function(a,b){return a.fcno-b.fcno});
+				if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir)
+					gfzjbc.splice(gfzjbc.length-1,1);
+				if(type!='五工二休') {
+					var gfzjst = null;
+					var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
+					var addmin = parseInt(dxmin/gfzjbc.length);
+					for(var g = 0 ;g < gfzjbc.length;g++) {
+						if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
+							gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
+						if(g==0) {
+							continue;
+						}else {
+							var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
+							tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
+							gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
+							tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
+							gfzjbc[g].ARRIVALTIME =  baseF.getTimeStr(tempd);
 						}
 					}
-				}*/
+					gfzjbc[gfzjbc.length-1].STOPTIME  = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
+				}
+				return gfzjbc.concat(wgfbc).concat(zgfbc);
+			},
+			
+			issplice : function (kssj,dataMap,type,lpNo,cla){
+				var tag = false;
+				if(type=='五工二休' || lpNo <Math.round(cla/2)) {
+					if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || 
+							( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
+						tag = true;
+				}else {
+					if(dataMap.zgfsjd[0].ed >= kssj || kssj >= dataMap.wgfsjd[0].st)
+						tag = true;
+				}
+				return tag;
 			},
 			/**
@@ -966,6 +1117,15 @@ var BaseFun = function() {
 				return tag;
 			},
+			getcfdd : function(value,dirc) {
+				var inv;
+				if(value =='allYes')
+					inv = parseInt(dirc);
+				else
+					inv = parseInt(value);
+				return inv;
+			},
+			
 			plgfbc : function(saa , cara , map, seMap ,dataMap) {
 				var len = cara.length,rs = new Array();
 				var lbsj = map.lb=='' ? 0:parseInt(map.lb);
@@ -982,14 +1142,16 @@ var BaseFun = function() {
 					while(kssj<=endTime) {
 						cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 						fxTagDm = 1;
+						var cfdd = baseF.getcfdd(map.cfdd,cctag);
 						if(kssj> new Date (baseF.getCFDate(10,30)) && 
-								kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
+								kssj<new Date (baseF.getCFDate(11,30)) && $_cfn<1 && cfdd == cctag) {
 							$_cfn++;
 							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(20,0)) && $_cfw<1 ) {
+									kssj<new Date (baseF.getCFDate(19,30)) && $_cfw<1 && cfdd == cctag &&
+									parseInt((endTime-kssj)/60000) > parseInt(dataMap.zwcArr[1])) {
 							$_cfw++;
 							rs.push(baseF.getbcObj(
 									kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
@@ -1009,8 +1171,7 @@ var BaseFun = function() {
 				return rs;
 			},
-			isgfsjd01 :　function(kssj,dataMap) {
-				
+			isgfsjd01 :　function(kssj,dataMap,type) {
 				var tag = false;
 				if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || ( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
 					tag = true;
@@ -1178,8 +1339,8 @@ var BaseFun = function() {
 			 * 
 			 * @return : 返回一个数组对象。这里返回的是时刻表明细数据
 			 **/
-			tzsmbcsj01 : function(list,smbcsj,sj,cl,zd,lbsj) {
-				var _obj = baseF.getsxAndxxbc(list);
+			tzsmbcsj01 : function(list,smbcsj,sj,cl,zd,lbsj,dm) {
+				var _obj = baseF.getsxAndxxbc(list,dm);
 				baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj ,_obj.xxbc);// 剔除上行不在时间范围内的班次
 				baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 剔除下行不在时间范围内的班次
 				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
@@ -1191,7 +1352,7 @@ var BaseFun = function() {
 					if(baseF.isDelete(baseF.getDateTime(kssj),
 										baseF.getDateTime(jssj),
 										baseF.getDateTime(ar[s].fcsj))) {
-						var tempa = ar.concat(ppar),sslpA = new Array();
+						/*var tempa = ar.concat(ppar),sslpA = new Array();
 						for(var r  = 0 ; r<tempa.length;r++) {
 							if(tempa[r].lpNo == ar[s].lpNo)
 								sslpA.push(tempa[r]);
@@ -1211,7 +1372,7 @@ var BaseFun = function() {
 									break;
 								}
 							}
-						}
+						}*/
 						ar.splice(s, 1);
 						s--;
 					}  
@@ -1331,15 +1492,19 @@ var BaseFun = function() {
 				return tag;
 			},
-			getsxAndxxbc : function(json) {
+			getsxAndxxbc : function(json,dataMap) {
 				var upArray = new Array(),downArray = new Array(),qt = new Array();
             	for(var j = 0 ; j< json.length ; j++) {
-            		if(json[j].bcType=='normal' || json[j].bcType=='region') {
+            		//json[j].fcint = baseF.getDateTime(json[j].fcsj).getTime();
+            		if(json[j].bcType== dataMap.bcTypeArr.normal || 
+            				json[j].bcType== dataMap.bcTypeArr.region || 
+            				json[j].bcType== dataMap.bcTypeArr.major ||
+            				json[j].bcType== dataMap.bcTypeArr.venting) {
             			if(json[j].xlDir == 'relationshipGraph-up')
                 			upArray.push(json[j]);
                 		else if(json[j].xlDir == 'relationshipGraph-down')
                 			downArray.push(json[j]);
-            		}else {
+            		}else if(json[j].bcType == dataMap.bcTypeArr.cf) {
             			qt.push(json[j]);
             		}
             	}
@@ -1676,24 +1841,26 @@ var BaseFun = function() {
 				dqbcddsj.setMinutes(dqbcddsj.getMinutes() + _xxsj);
 				xgbc.ARRIVALTIME =  baseF.getTimeStr(dqbcddsj);// 修改下个班次的到达时间
 			},
-			getObjRegion : function(t1,t2,arr) {
+			getObjRegion : function(t1,t2,arr,dataMap) {
 				var _r = new Array();
 				for(var p= 0; p<arr.length ; p++) {
 					var _t = baseF.getDateTime(arr[p].fcsj);
-					if(_t >= t1 && _t <= t2)
+					if(_t >= t1 && _t <= t2 && arr[p].bcType != dataMap.bcTypeArr.cf )
 						_r.push(arr[p]);
 				}
-				/*return baseF.sortDirArray(_r);*/
 				return _r.sort(function(a,b){return a.fcno-b.fcno});
 			},
-			getlpNum : function(arr) {
-				var array = new Array(); 
-				for(var r = 0 ; r < arr.length ; r++) {
-					if(array.indexOf(arr[r].lpNo)<0)
-						array.push(arr[r].lpNo);
+			getlpNum : function(sz) {
+				var temparray = new Array(),len_ = 0; 
+				for(var r = 0 ; r <sz.length ; r++) {
+					if(temparray.indexOf(sz[r].lpNo)<0){
+						temparray.push(sz[r].lpNo);
+					}
 				}
-				return (array.length-1);
+				len_ = temparray.length;
+				temparray = null;
+				return len_;
 			},
 			/** 
 			 * @description : (TODO)更新进场与离场班次
@@ -219,11 +219,11 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
 			// 执行选择框关闭函数.
 			RelationshipGraph.gClose();
 			// 执行均匀发车间隙函数.
-			RelationshipGraph.updownread();
+			RelationshipGraph.updownread01();
 		});
 	}else {
 		// 执行均匀发车间隙函数
-		RelationshipGraph.updownread();
+		RelationshipGraph.updownread01();
 	}
 });
 /************************************************************************************************************************************************/
@@ -1226,6 +1226,43 @@ var RelationshipGraph = function () {
     		}
     	}
     }, {
+    	key : 'updownread01',
+    	value : function updownread01() {
+    		// 1、获取所有班次数.
+    		var list = $_GlobalGraph.getDataArray();
+    		var dataMap = $_GlobalGraph.configuration.dataMap;
+    		var rsmap = BaseFun.getsxAndxxbc(list,dataMap);
+    		var cara =  $_GlobalGraph.configuration.taskTypes;
+    		var jar01 = rsmap.qt.concat(rsmap.sxbc).concat(rsmap.xxbc);
+    		BaseFun.jhfcjx01(jar01,dataMap);
+    		var jar = BaseFun.tzsmbcsj01(
+					BaseFun.setbcsAndfcno(BaseFun.tzsmbcsj01(BaseFun.setbcsAndfcno(BaseFun.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap)),
+							dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap);
+			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 <jar.length; x++) {
+					// 判断当期遍历的班次是否属于当前的路牌.
+					if(jar[x].lpNo == lpNo_)
+						lpbc_.push(jar[x]);
+				}
+				// 按照发车序号顺序排序.
+				lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+				resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,dataMap.lbsj,dataMap.map));
+			}
+			// 删除图形.
+   		 	$('svg.svg-chart').remove();
+   		 	// 重新创建图形.
+   		 	var graph_ = d3.select('#ganttSvg').relationshipGraph($_GlobalGraph.configuration);
+   		 	// 根据数据重新渲染图形.
+   		 	graph_.data(resultJA);
+   		 	$_GlobalGraph = graph_;
+    	}
+    }, {
     	key :　'updownread',
     	value : function updownread() {
     		//var index = layer.load(1, {shade: [0.1,'#fff'] });//0.1透明度的白色背景
@@ -32,7 +32,6 @@
 		});
 		$('.tipso-animation').tipso('show');
 		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
-		console.log(map);
 		//debugger;
 		// 1、定义开始与结束时间点字符串.
 		var seMap = getStartAndEndDate(map);
@@ -267,8 +267,8 @@
 		<div class="col-md-5">
 		 	<select type="text" class="form-control" name="cfdd" id="cfddSelect">
 				<option value="">请选择...</option>
-				<option value="{{map.line.startStationName}}">{{map.line.startStationName}}</option>
-				<option value="{{map.line.endStationName}}">{{map.line.endStationName}}</option>
+				<option value="0">{{map.line.startStationName}}</option>
+				<option value="1">{{map.line.endStationName}}</option>
 				<option value="allYes">起终点站都可以</option>
 			</select> 
 		</div>