Merge branch 'minhang' into pudong

徐烜
2 parents 73f39937 931d141f
Showing 23 changed files with 956 additions and 122 deletions
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/SectionRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/resources/static/pages/base/stationroute/delete_select.html
src/main/resources/static/pages/base/stationroute/deletesection.html
src/main/resources/static/pages/base/stationroute/deletestation.html
src/main/resources/static/pages/base/stationroute/js/deletebatch.js
src/main/resources/static/pages/base/stationroute/js/editsection.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
src/main/resources/static/pages/base/stationroute/list.html
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/forms/mould/shifday.xls
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
@@ -35,6 +35,16 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	@Autowired
 	SectionRouteService routeService;
+	/**
+     * @param String
+     * @throws
+     * @Description: TODO(批量撤销路段)
+     */
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.GET)
+    public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
+    	return routeService.updateSectionRouteInfoFormId(map);
+    }
+	
 	 /**
      * @param @param map
      * @throws
@@ -47,6 +47,16 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
         return service.list(map);
     }
+    /**
+     * @param String
+     * @throws
+     * @Description: TODO(批量撤销站点)
+     */
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.GET)
+    public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
+    	return service.updateStationRouteInfoFormId(map);
+    }
+    
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -87,6 +87,7 @@ public class ExportController {
 	public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String, Object> map2 = new HashMap<String, Object>();
 		ReportUtils ee = new ReportUtils();
 		List<Shifday> shifday = formsService.shifday(map);
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -110,11 +111,15 @@ public class ExportController {
 			m.put("sjbc", l.getSjbc());
 			resList.add(m);
 		}
+		if(resList.size() > 0){
+			map2 = resList.get(resList.size() - 1);
+			resList.remove(map2);
+		}
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/shifday.xls",
+			ee.excelReplace(listI, new Object[] { map2 }, path + "mould/shifday.xls",
 					path + "export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -175,6 +175,10 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+10) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
 	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
+	@Modifying
+	@Query(value="UPDATE bsth_c_sectionroute set destroy = 1 where id = ?1", nativeQuery=true)
+	public void sectionRouteIsDestroyUpdBatch(Integer ids);
+	
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
 	public void sectionRouteDir(Integer line);
@@ -282,4 +282,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
 	@Query(value="UPDATE bsth_c_stationroute  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
 	public void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
+    
+    @Modifying
+   	@Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true)
+   	public void stationRouteIsDestroyUpdBatch(Integer ids);
 }
@@ -33,6 +33,15 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	List<Map<String, Object>> getSectionRoute(Map<String, Object> map);
 	/**
+	 * @Description : TODO(根据路段路由Id批量撤销路段)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	Map<String, Object> updateSectionRouteInfoFormId(Map<String, Object> map);
+	
+	/**
 	 * @Description : TODO(根据路段路由Id查询详情)
 	 * 
 	 * @param  map <id:路段路由ID> 
@@ -31,6 +31,15 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	Iterable<StationRoute> list(Map<String, Object> map);
 	/**
+	 * @Description : TODO(根据路段站点Id批量撤销站点)
+	 * 
+	 * @param  map <id:站点路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	Map<String, Object> updateStationRouteInfoFormId(Map<String, Object> map);
+	
+	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
 	 * @param map <line.id_eq:线路ID； directions_eq：方向>
@@ -92,4 +101,5 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 Map<String, Object> updSwitchDir(String lineIds);
 	 Map<String, Object> upddis(Map<String, Object> map);
+
 }
@@ -5,10 +5,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
@@ -49,6 +54,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	@Autowired
 	LineRepository lineRepository;
+	@Autowired
+    private EntityManager entityManager;
+	
+	@Value("${hibernate.jdbc.batch_size}")
+    private int batchSize;
+	
 	@Override
 	public Iterable<SectionRoute> list(Map<String, Object> map) {
 		List<Sort.Order> orderList = new ArrayList<>();
@@ -106,6 +117,9 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		return resultList;
 	}
+	
+		
+	
 	/**
 	 * @Description : TODO(根据路段路由Id查询详情)
 	 * 
@@ -297,4 +311,33 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return resultMap;
 	}
+	
+	/**
+	 * @Description : TODO(根据路段路由Id批量撤销路段)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> updateSectionRouteInfoFormId(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			//int i = 0;
+			String[] idsStr = map.get("ids").toString().split(",") ;
+	        for (String id : idsStr) {
+	         /*   entityManager.persist(Integer.parseInt(id));*/
+	            repository.sectionRouteIsDestroyUpdBatch(Integer.parseInt(id));
+/*	            i++;
+	            if (i % batchSize == 0) {
+	                entityManager.flush();
+	                entityManager.clear();
+	            }*/
+	        }
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
 }
 \ No newline at end of file
@@ -24,7 +24,6 @@ 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.*;
@@ -68,6 +67,29 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return repository.findAll(new CustomerSpecs<StationRoute>(map), new Sort(orderList));
 	}
+	
+	/**
+	 * @Description : TODO(根据路段路由Id批量撤销路段)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> updateStationRouteInfoFormId(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			String[] idsStr = map.get("ids").toString().split(",") ;
+	        for (String id : idsStr) {
+	            repository.stationRouteIsDestroyUpdBatch(Integer.parseInt(id));
+	        }
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+	
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -512,38 +534,57 @@ 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)
@@ -557,12 +598,6 @@ 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);
@@ -633,23 +668,25 @@ 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("") ? "0" : objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-				
-				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
+				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
 				lat = "\t" +  lat;
@@ -659,32 +696,23 @@ 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 =  String.valueOf(defaultZdxh);
+				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
 				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;
@@ -704,33 +732,41 @@ 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) {
-					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);
+					
+					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+					
+					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+					
 				}else if(sobje.size()>1){
+					
+					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 					for(int j =0;j<sobje.size();j++) {
-						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;
+						
+						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);
+							
 						}
+						
 					}
 				}
-				if(sleepStr.equals("")) 
-					sleepStr  =  "\t" + "60";
+				
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -749,12 +785,9 @@ 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("") ? "0" : objects.get(i)[0].toString();
-					
+					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
 					// 纬度
-					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-					
-					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
+					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
 					lat = "\t" +  lat;
 					// 站点类型
 					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
@@ -769,17 +802,6 @@ 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);
@@ -795,28 +817,20 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						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);
+						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
 					}else if(sobje.size()>1){
+						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 						for(int j =0;j<sobje.size();j++) {
-							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;
+							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);
 							}
 						}
 					}
-					if(sleepStr.equals("")) 
-						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 				}
+<!-- 批量撤销选项 -->
+<div class="modal fade" id="delete_select_mobal" tabindex="-1"
+	role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">
+					批量撤销选项
+				</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post"
+					id="formBootbox" role="form">
+					<div class="form-group">
+						<label class="col-md-3 control-label">撤销选项：</label>
+						<div class="col-md-9">
+							<div class="icheck-list">
+								<label>
+									<input type="radio" name="deleteOptions" value="0" checked> 批量撤销站点
+								</label>
+								<label >
+									<input type="radio" name="deleteOptions" value="1" > 批量撤销路段
+								</label>
+							</div>
+						</div>
+					 </div>			 
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary"
+					id="deleteSelectnextButton">下一步</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+	$('#delete_select_mobal').on('deleteSelectMobal.show',function(e,ajaxd,line,fun,delBatch) {
+		// 加载显示mobal
+		$('#delete_select_mobal').modal({
+			show : true,
+			backdrop : 'static',
+			keyboard : false
+			});
+		// 获取表单元素
+		var form = $('#formBootbox');
+		// 下一步点击事件
+		$('#deleteSelectnextButton').on('click', function() {
+			// 获取撤销类型
+			deleteOptions = $("input[name='deleteOptions']:checked").val();
+			// 表单提交
+			form.submit();
+		});
+		// 表单验证
+		form.validate({
+			// 表单序列化
+			submitHandler : function(f) {
+				// 批量删除站点 （deleteOptions：0）
+				if(deleteOptions == 0) {
+					// 隐藏选项mobal
+					$('#delete_select_mobal').modal('hide');
+					//　加载deletestation页面
+					$.get('deletestation.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#delete_station_mobal').trigger('deleteStationMobal.show', [ajaxd,line,fun,delBatch]);
+					});
+				// 批量删除路段（deleteOptions：1）
+				} else if(deleteOptions == 1) {
+					// 隐藏选项mobal
+					$('#delete_select_mobal').modal('hide');
+					//　加载deletesection页面
+					$.get('deletesection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#delete_section_mobal').trigger('deleteSectionMobal.show', [ajaxd,line,fun,delBatch]);
+					});
+				}
+				
+			}
+		});
+	});
+</script>
 \ No newline at end of file
+<!-- 编辑路段 -->
+<div class="modal fade" id="delete_section_mobal" role="basic"
+	aria-hidden="true">
+	<div style="margin:5% auto">
+		<div class="modal-content">
+			<div class="col-md-12">
+				<div class="portlet light porttlet-fit bordered">
+					<div class="portlet-title">
+						<div class="tipso-animation">
+						</div>
+						<div class="caption">
+							<i class="fa fa-info-circle font-dark"></i> <span
+								class="caption-subject font-dark sbold uppercase">路段信息</span>
+						</div>
+						<div class="actions">
+							<div class="modal-footer-left">
+								<button type="button" class="btn btn-primary" id="batchDeleteSectionButton">批量撤销路段</button>									
+								<button type="button" class="btn default" data-dismiss="modal">取消</button>
+							</div>
+						</div>
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<from class="form-horizontal" role="form"
+								id="batch_delete_section_form">
+							<table
+								class="table table-striped table-bordered table-hover table-checkable"
+								id="datatable_section_detele">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="2%"><input type="checkbox" name="scetionCheckItems"
+											id="scetionCheckItems"></input></th>
+										<th width="2%">序号</th>
+										<th width="5%">路段路由编号</th>
+										<th width="5%">线路编号</th>
+										<th width="11%">线路名称</th>
+										<th width="7%">线路方向</th>
+										<th width="11%">路段名称</th>
+										<th width="5%">路段编码</th>
+										<th width="5%">路段序号</th>
+										<th width="5%">路段限速</th>
+										<th width="5%">路段长度</th>
+										<th width="5%">路段历时</th>
+										<th width="5%">版本号</th>
+										<!-- 	<th width="6%">是否撤销</th>
+								<th width="9%">操作</th> -->
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+							</from>
+							<div class="actions">
+								<div style="text-align: right">
+										<ul id="pagination" class="pagination"></ul>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="sectionInfo_list_table_temp_detele">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" name="items" value="{{obj.id}}" id="{{obj.id}}" >
+			</td>
+			<td style="vertical-align: middle;">
+				 {{(list.page*10)+(i+1)}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.id}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.lineCode}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.line.name}}
+			</td>
+			<td style="vertical-align: middle;"> 
+				{{if obj.directions == '0'}}
+					上行
+				{{else if obj.directions == '1'}}
+					下行
+				{{/if}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.section.sectionName}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionCode}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionrouteCode}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.speedLimit}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionDistance}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionTime}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.versions}}
+			</td>			
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#delete_section_mobal').on('deleteSectionMobal.show',function(e, ajaxd, line, fun, delBatch) {
+	layer.closeAll();
+	// 显示mobal
+	$('#delete_section_mobal').modal({
+		show : true,
+		backdrop : 'static',
+		keyboard : false
+	});
+	// 编辑表单元素
+	var form = $('#batch_delete_section_form');
+	// 提交数据按钮事件
+	$('#batchDeleteSectionButton').on('click', function() {
+		var checked = $("[name=items]:checked");
+		var ids = "";
+		checked.each(function() {
+			ids = ids + "," + $(this).val();
+			//ids.push($(this).val()); 
+		});
+		if (ids != "" && ids != null && ids != undefined) {
+			console.log("ids:" + ids);
+			ids = ids.substr(1, ids.length - 1);
+			var params = {};
+			params.ids = ids;
+			$.get('/sectionroute/batchDestroy',params,function(resuntDate) {
+				if (resuntDate.status == 'SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+					/** 通知更新缓存区 */
+					//$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs) {console.log(rs)})
+				} else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+				initSearch();
+				// 刷新左边树
+				fun.resjtreeDate(line.id,delBatch.dir);
+				/** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
+				ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
+				/** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
+					fun.linePanlThree(line.id,data,delBatch.dir);
+				});
+			});
+		} else {
+			layer.msg('请选择要删除的路段！！！');
+		}
+	});
+
+	/** 全选框 */
+	document.getElementById('scetionCheckItems').onclick = function() {
+		// 获取所有的复选框  
+		var checkElements = document.getElementsByName('items');
+		if (this.checked) {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = "checked";
+			}
+		} else {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = null;
+			}
+		}
+	}
+
+	/** 页面加载完显示数据 */
+	window.onload = initSearch();
+
+	/**
+	 * @description : (TODO) 页面加载事件
+	 * 
+	 */
+	function initSearch() {
+		var params = new getParams();
+		page = 0;
+		loadTableDate(params, true);
+	}
+	function getParams() {
+		// 搜索参数集合
+		params = {};
+		params.lineCode_eq = line.id;
+		params.directions_eq = delBatch.dir;
+		params.destroy_eq = "0"; //默认查没有撤销的路段
+		return params;
+	}
+	/**
+	 * @description : (TODO) 表格数据分页加载事件
+	 * 
+	 * ------@param : 查询参数
+	 * 
+	 * ------@isPon : 是否重新分页
+	 * 
+	 */
+	function loadTableDate(param, isPon) {
+		// 搜索参数
+		var params = {};
+		if (param)
+			params = param;
+		// 排序（按方向与序号）
+		params['order'] = 'directions,sectionrouteCode';
+		// 排序方向.
+		params['direction'] = 'ASC,ASC';
+		// 记录当前页数
+		params['page'] = page;
+		// 弹出正在加载层
+		var i = layer.load(2);
+		// 异步请求获取表格数据
+		$.get('/sectionroute',params,function(result) {
+			// 添加序号
+			result.content.page = page;
+			// 把数据填充到模版中
+			var tbodyHtml = template('sectionInfo_list_table_temp_detele',{list : result.content});
+			// 把渲染好的模版html文本追加到表格中
+			$('#datatable_section_detele tbody').html(tbodyHtml);
+			// 是重新分页且返回数据长度大于0
+			if (isPon && result.content.length > 0) {
+			// 重新分页
+			initPag = true;
+			// 分页栏
+			showPagination(result);
+			}
+			// 关闭弹出加载层
+			layer.close(i);
+		});
+	}
+	/**
+	 * @description : (TODO) 分页栏组件
+	 * 
+	 */
+	function showPagination(data) {
+		// 分页组件
+		$('#pagination').jqPaginator({
+			// 总页数
+			totalPages : data.totalPages,
+			// 中间显示页数
+			visiblePages : 6,
+			// 当前页
+			urrentPage : page + 1,
+			first : '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+			prev : '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+			next : '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+			last : '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+			page : '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+			onPageChange : function(num, type) {
+				if (initPag) {
+					initPag = false;
+					return;
+				}
+				var pData = getParams();
+				page = num - 1;
+				loadTableDate(pData, false);
+			}
+		});
+	}
+});
+</script>
 \ No newline at end of file
+<!-- 编辑路段 -->
+<div class="modal fade" id="delete_station_mobal" role="basic"
+	aria-hidden="true">
+	<div style="margin:5% auto">
+		<div class="modal-content">
+			<div class="col-md-12">
+				<div class="portlet light porttlet-fit bordered">
+					<div class="portlet-title">
+						<div class="tipso-animation">
+						</div>
+						<div class="caption">
+							 <i class="fa fa-info-circle font-dark"></i> 
+							 <span class="caption-subject font-dark sbold uppercase">站点信息</span>
+						</div>
+						<div class="actions">
+							<div class="btn-group btn-group-devided" data-toggle="buttons">
+								<button type="button" class="btn btn-primary" id="batchDeleteStationButton">批量撤销站点</button>									
+								<button type="button" class="btn default" data-dismiss="modal">取消</button>
+							</div>
+						</div>
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<from class="form-horizontal" role="form" id="batch_delete_station_form">
+							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_station_detele">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="2%"><input type="checkbox" name="checkItems"
+											id="stationCheckItems"></input></th>
+										<th width="2%">序号</th>
+										<th width="5%">站点路由编号</th>
+										<th width="5%">线路编号</th>										
+										<th width="8%">线路名称</th>
+										<th width="5%">线路方向</th>
+										<th width="8%">站点路由名称</th>
+										<th width="4%">站点编码</th>
+										<th width="4%">站点序号</th>
+										<th width="4%">站点类型</th>
+										<th width="6%">站点距离(km)</th>
+										<th width="6%">站点时长(min)</th>
+										<th width="4%">版本号</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+							</from>
+							<div class="actions">
+								<div style="text-align: right">
+										<ul id="pagination" class="pagination"></ul>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="stationInfo_list_table_temp_detele">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" name="items" value="{{obj.id}}" id="{{obj.id}}" >
+			</td>
+			<td style="vertical-align: middle;">
+				 {{(list.page*10)+(i+1)}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.id}}
+			</td>
+			<td>
+				{{obj.lineCode}}
+			</td>
+			<td>
+				{{obj.line.name}}
+			</td>
+			<td>
+				{{if obj.directions == '0'}}
+					上行
+				{{else if obj.directions == '1'}}
+					下行
+				{{/if}}
+			</td>
+			<td>
+				{{obj.stationName}}
+			</td>
+			<td>
+				{{obj.stationCode}}
+			</td>
+			<td>
+				{{obj.stationRouteCode}}
+			</td>
+			<td>	
+				{{if obj.stationMark == 'B'}}
+					起始站
+				{{else if obj.stationMark == 'Z'}}
+					中途站
+				{{else if obj.stationMark== 'E'}}
+					终点站
+				{{/if}}
+			</td>
+			<td>
+				{{obj.distances}}
+			</td>
+			<td>
+				{{obj.toTime}} 
+			</td>
+			<td>
+				{{obj.versions}}
+			</td>		
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#delete_station_mobal').on('deleteStationMobal.show',function(e, ajaxd, line, fun, delBatch) {
+	layer.closeAll();
+	// 显示mobal
+	$('#delete_station_mobal').modal({
+		show : true,
+		backdrop : 'static',
+		keyboard : false
+	});
+	// 编辑表单元素
+	var form = $('#batch_delete_station_form');
+	// 提交数据按钮事件
+	$('#batchDeleteStationButton').on('click', function() {
+		var checked = $("[name=items]:checked");
+		var ids = "";
+		checked.each(function() {
+			ids = ids + "," + $(this).val();
+			//ids.push($(this).val()); 
+		});
+		if (ids != "" && ids != null && ids != undefined) {
+			console.log("ids:" + ids);
+			ids = ids.substr(1, ids.length - 1);
+			var params = {};
+			params.ids = ids;
+			$.get('/stationroute/batchDestroy',params,function(resuntDate) {
+				if (resuntDate.status == 'SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+					/** 通知更新缓存区 */
+					//$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs) {console.log(rs)})
+				} else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+				initSearch();
+				// 刷新左边树
+				fun.resjtreeDate(line.id,delBatch.dir);
+				/** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
+				ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
+				/** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
+					fun.linePanlThree(line.id,data,delBatch.dir);
+				});
+			});
+		} else {
+			layer.msg('请选择要删除的站点！！！');
+		}
+	});
+
+	/** 全选框 */
+	document.getElementById('stationCheckItems').onclick = function() {
+		// 获取所有的复选框  
+		var checkElements = document.getElementsByName('items');
+		if (this.checked) {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = "checked";
+			}
+		} else {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = null;
+			}
+		}
+	}
+
+	/** 页面加载完显示数据 */
+	window.onload = initSearch();
+
+	/**
+	 * @description : (TODO) 页面加载事件
+	 * 
+	 */
+	function initSearch() {
+		var params = new getParams();
+		page = 0;
+		loadTableDate(params, true);
+	}
+	function getParams() {
+		// 搜索参数集合
+		params = {};
+		params.lineCode_eq = line.id;
+		params.directions_eq = delBatch.dir;
+		params.destroy_eq = "0"; //默认查没有撤销的站点
+		return params;
+	}
+	/**
+	 * @description : (TODO) 表格数据分页加载事件
+	 * 
+	 * ------@param : 查询参数
+	 * 
+	 * ------@isPon : 是否重新分页
+	 * 
+	 */
+	function loadTableDate(param, isPon) {
+		// 搜索参数
+		var params = {};
+		if (param)
+			params = param;
+		// 排序（按方向与序号）
+		params['order'] = 'directions,stationRouteCode';
+		// 排序方向.
+		params['direction'] = 'ASC,ASC';
+		// 记录当前页数
+		params['page'] = page;
+		// 弹出正在加载层
+		var i = layer.load(2);
+		// 异步请求获取表格数据
+		$.get('/stationroute',params,function(result) {
+			// 添加序号
+			result.content.page = page;
+			// 把数据填充到模版中
+			var tbodyHtml = template('stationInfo_list_table_temp_detele',{list : result.content});
+			// 把渲染好的模版html文本追加到表格中
+			$('#datatable_station_detele tbody').html(tbodyHtml);
+			// 是重新分页且返回数据长度大于0
+			if (isPon && result.content.length > 0) {
+			// 重新分页
+			initPag = true;
+			// 分页栏
+			showPagination(result);
+			}
+			// 关闭弹出加载层
+			layer.close(i);
+		});
+	}
+	/**
+	 * @description : (TODO) 分页栏组件
+	 * 
+	 */
+	function showPagination(data) {
+		// 分页组件
+		$('#pagination').jqPaginator({
+			// 总页数
+			totalPages : data.totalPages,
+			// 中间显示页数
+			visiblePages : 6,
+			// 当前页
+			urrentPage : page + 1,
+			first : '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+			prev : '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+			next : '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+			last : '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+			page : '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+			onPageChange : function(num, type) {
+				if (initPag) {
+					initPag = false;
+					return;
+				}
+				var pData = getParams();
+				page = num - 1;
+				loadTableDate(pData, false);
+			}
+		});
+	}
+});
+</script>
 \ No newline at end of file
+var DeleteBatchObj = function(){	
+	
+	/** 定义修改线路对象 */
+	
+	var deleteBatchObj = {
+			/** 获取批量撤销对象 @return：<Batch：批量撤销对象> */
+			getDeleteBatch : function() {
+				return deleteBatchObj;
+			},
+			
+			/** 设置批量撤销的线路方向 @param：<dir：方向（0：上行；1：下行）> */
+			setDeteleBatchDiraction : function(dir) {
+				
+				deleteBatchObj.dir = dir;
+			},
+	}	
+	
+	return deleteBatchObj;
+}();
@@ -7,7 +7,6 @@ var EditSectionObj = function () {
 			/** 获取修改路段集合对象 @return：<Section：修改路段对象> */
 			getEitdSection : function() {
-				
 				return Section;
 			},
@@ -56,6 +56,18 @@ $(function(){
 		PublicFunctions.stationRevoke(directionUpValue);
 	});
+	// 上行批量撤销事件
+	$('.module_tools #batchUpDelete').on('click', function() {
+		var Line = LineObj.getLineObj();
+		/** 设置批量删除的线路方向 @param：<directionUpValue：方向（0：上行；1：下行）> */
+		DeleteBatchObj.setDeteleBatchDiraction(directionUpValue);
+		// 加载选择新增方式mobal
+		$.get('delete_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
+		});
+	});
+	
 	// 切换上下行.
 	$('.retweet').on('click',function() {
 		layer.confirm('您是否确定将【上、下】行站点和路段进行对换!', {
@@ -210,6 +222,18 @@ $(function(){
 	$('.module_tools #deleteDownStation').on('click', function() {
 		PublicFunctions.stationRevoke(directionDownValue);
 	});
+
+	// 下行批量撤销事件
+	$('.module_tools #batchDownDelete').on('click', function() {
+		var Line = LineObj.getLineObj();
+		/** 设置批量删除的线路方向 @param：<directionDownValue：方向（0：上行；1：下行）> */
+		DeleteBatchObj.setDeteleBatchDiraction(directionDownValue);
+		// 加载选择新增方式mobal
+		$.get('delete_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
+		});
+	});
 	// 编辑线路下行走向
 	$('.module_tools #editDownlineTrend').on('click', function() {
@@ -242,5 +266,5 @@ $(function(){
 		$('.defeat-scroll').css('overflow','auto');
 	}).on('mouseleave',function() {
 		$('.defeat-scroll').css('overflow','hidden');
-	});
+	});	
 });
 \ No newline at end of file
@@ -59,6 +59,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="batchUpDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
@@ -69,6 +73,7 @@
 			                                                <li>
 			                                                    <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
 			                                                </li>
+			                                                 <li class="divider"> </li>
 			                                                <!-- <li>
 			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
 			                                                </li> -->
@@ -154,6 +159,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="batchDownDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
@@ -227,6 +236,8 @@
 <script src="/pages/base/stationroute/js/editstationobj.js"></script>
 <!-- 修改路段对象类 -->
 <script src="/pages/base/stationroute/js/editsection.js"></script>
+<!-- 批量撤销对象类 -->
+<script src="/pages/base/stationroute/js/deletebatch.js"></script>
 <!-- 绘图类 -->
 <script src="/pages/base/stationroute/js/drawingManager.js"></script>
 <!-- 地图类 -->
@@ -414,7 +414,7 @@ var BaseFun = function() {
 							var wgfhtcbcNum = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
 							// 定义时间段内剔除班次规则.
 							tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed ,  'deletebcNum' : wgfhtcbcNum},
-									 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum},);
+									 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
 							// 逆序排序剔除.
 							lpbc.sort(function(r,s){return s.fcno-r.fcno});
 							// 剔除不在高峰时间段内的班次.
@@ -431,30 +431,29 @@ var BaseFun = function() {
 							if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {
 								if( (a + 1) <= dgminpcs) {
 									var dgzjsj = baseF.getDateTime('12:30');
+									/*var zgfyh = dataMap.zgfsjd[0].ed;
+									zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/
 									if( a % 2 == 0) {
 										// 定义早高峰结束 ~ 12:30 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
 										var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
-										if(initdx < 240) {
-											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+										if(deletebcNum < swmaxtcbcNum) {
+											// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+											tcbcgzA.push({'minsj':  dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
 										}else { 
-											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
+											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
 														 {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
 										}
-										// 顺序排序
-										// lpbc.sort(function(x,y){return x.fcno-y.fcno});
+										// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
 									}else {
 										// 定义12:30 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
 										var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
-										if(initdx < 210) {
+										if(deletebcNum < xwmaxtcbcNum) {
 											tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
 										}else {
-											
 											tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum - xwmaxtcbcNum},
-														 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum},);
+														 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
 										}
-										// 逆序排序.
-										// lpbc.sort(function(m,n){return n.fcno-m.fcno});
-										// order = 'desc';
+										// tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
 									}
 									// 按规则剔除班次.并且分班.路牌班次断开.
 									baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
@@ -489,12 +488,12 @@ var BaseFun = function() {
 						wgfhtcbcNum  = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfzhsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj))
 						tcbcgzA = new Array();
 					if( wgfhtcbcNum  >= deletebcNum) {
-						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum},);
+						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum});
 					}else if(zgfzqtcbcNum >= deletebcNum){
-						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum},);
+						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
 					}else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
 						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : wgfhtcbcNum},
-									 {'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed ,  'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum},);
+									 {'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed ,  'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
 					}
 					// lpbc.sort(function(m,n){return n.fcno-m.fcno});
 					baseF.spliceBc02(lpbc ,  tcbcgzA , dataMap , isfb);
@@ -655,9 +654,10 @@ var BaseFun = function() {
 				var ttsmbA =  baseF.tzsmbcsj01(tempA,dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
 				baseF.jhfcjx02(ttsmbA,dataMap);
-				return {'json':ttsmbA,'bxrcgs':null};
-				// var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
-				// return {'json':rsjar,'bxrcgs':null};
+				//return {'json':baseF.addjcclcbc01(cara,ttsmbA,dataMap,saa,map),'bxrcgs':null};
+				//return {'json':ttsmbA,'bxrcgs':null};
+				var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
+				return {'json':rsjar,'bxrcgs':null};
 				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':null};
 			},
@@ -312,22 +312,50 @@
 		<tr>
 			<td>{{obj.date}}</td>
 			<td>{{obj.line}}</td>
-			<td>{{obj.qdzFirst0}}</td>
-			<td>{{obj.jhfcFirst0}}</td>
-			<td>{{obj.sjfcFirst0}}</td>
-			<td>{{obj.delayFirst0}}</td>
-			<td>{{obj.qdzLast0}}</td>
-			<td>{{obj.jhfcLast0}}</td>
-			<td>{{obj.sjfcLast0}}</td>
-			<td>{{obj.delayLast0}}</td>
-			<td>{{obj.qdzFirst1}}</td>
-			<td>{{obj.jhfcFirst1}}</td>
-			<td>{{obj.sjfcFirst1}}</td>
-			<td>{{obj.delayFirst1}}</td>
-			<td>{{obj.qdzLast1}}</td>
-			<td>{{obj.jhfcLast1}}</td>
-			<td>{{obj.sjfcLast1}}</td>
-			<td>{{obj.delayLast1}}</td>
+			{{if obj.delayFirst0 != '/' && (obj.delayFirst0 > 1 || obj.delayFirst0 < -2)}}
+				<td style="background-color: #FF9999">{{obj.qdzFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.delayFirst0}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst0}}</td>
+				<td>{{obj.jhfcFirst0}}</td>
+				<td>{{obj.sjfcFirst0}}</td>
+				<td>{{obj.delayFirst0}}</td>
+			{{/if}}
+			{{if obj.delayLast0 != '/' && (obj.delayLast0 > 1 || obj.delayLast0 < -2)}}
+				<td style="background-color: #FF9999">{{obj.qdzLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.delayLast0}}</td>
+			{{else}}
+				<td>{{obj.qdzLast0}}</td>
+				<td>{{obj.jhfcLast0}}</td>
+				<td>{{obj.sjfcLast0}}</td>
+				<td>{{obj.delayLast0}}</td>
+			{{/if}}
+			{{if obj.delayFirst1 != '/' && (obj.delayFirst1 > 1 || obj.delayFirst1 < -2)}}
+				<td style="background-color: #FF9999">{{obj.qdzFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.delayFirst1}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst1}}</td>
+				<td>{{obj.jhfcFirst1}}</td>
+				<td>{{obj.sjfcFirst1}}</td>
+				<td>{{obj.delayFirst1}}</td>
+			{{/if}}
+			{{if obj.delayLast1 != '/' && (obj.delayLast1 > 1 || obj.delayLast1 < -2)}}
+				<td style="background-color: #FF9999">{{obj.qdzLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.delayLast1}}</td>
+			{{else}}
+				<td>{{obj.qdzLast1}}</td>
+				<td>{{obj.jhfcLast1}}</td>
+				<td>{{obj.sjfcLast1}}</td>
+				<td>{{obj.delayLast1}}</td>
+			{{/if}}
 		</tr>
 	{{/each}}
 </script>
 \ No newline at end of file
@@ -309,9 +309,6 @@
 				layer.msg("请选择时间");
 				return;
 			}
-				if($("#table").height() > $(window).height() - 110){
-				$("#table").height($(window).height()-110);
-			}
 			var reason = $("input[name='reason']");
 			var params = {};
 			if(line == " ")
@@ -348,7 +345,12 @@
 					$('#export').attr('disabled', "true");
 				else
 					$("#export").removeAttr("disabled");
-				
+
+				if($("#forms").height()+70 > $(window).height()-110){
+					$("#table").height($(window).height()-110);
+				} else {
+					$("#table").height($("#forms").height()+70);
+				}
 			});
 		}
@@ -520,7 +520,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id'},
+            {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -84,10 +84,20 @@
                     <span ng-bind="info.bcType | dict:'ScheduleType':'未知' "></span>
                 </td>
                 <td>
-                    <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                    <a href="#" ng-if="info.xlDir == '0'">
+                        <i class="fa fa-arrow-up" aria-hidden="true"></i>
+                        <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                    </a>
+                    <a href="#" ng-if="info.xlDir == '1'">
+                        <i class="fa fa-arrow-circle-down" aria-hidden="true"></i>
+                        <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                    </a>
                 </td>
                 <td>
-                    <span ng-bind="info.fcsj"></span>
+                    <a href="#">
+                        <i class="fa fa-clock-o" aria-hidden="true"></i>
+                        <span ng-bind="info.fcsj"></span>
+                    </a>
                 </td>
                 <td>
                     <a href="#"
@@ -64,7 +64,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id'},
+            {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',