基础数据功能代码完善

李强
1 parent f386d7bf
Showing 25 changed files with 1556 additions and 342 deletions
pom.xml
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/repository/SectionRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/SectionService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/StationService.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/section/js/section-list-table.js
src/main/resources/static/pages/base/section/list.html
src/main/resources/static/pages/base/station/js/station-list-table.js
src/main/resources/static/pages/base/station/list.html
src/main/resources/static/pages/base/stationroute/add_manual_select.html
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
@@ -158,6 +158,13 @@
 	<repositories>
 		<repository>
 			<id>spring-snapshots</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<!-- <repository>
+			<id>spring-snapshots</id>
 			<url>http://repo.spring.io/snapshot</url>
 			<snapshots>
 				<enabled>true</enabled>
@@ -166,7 +173,7 @@
 		<repository>
 			<id>spring-milestones</id>
 			<url>http://repo.spring.io/milestone</url>
-		</repository>
+		</repository> -->
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
 package com.bsth.controller;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.Section;
+import com.bsth.service.SectionService;
 /**
  * 
@@ -24,5 +30,17 @@ import com.bsth.entity.Section;
 @RestController
 @RequestMapping("section")
 public class SectionController extends BaseController<Section, Integer> {
+	
+	@Autowired
+	SectionService service;
+	
+	@RequestMapping(value="sectionUpdate" , method = RequestMethod.POST)
+	public Map<String, Object> sectionUpdate(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		return service.sectionUpdate(map);
+		
+	}
 }
@@ -43,6 +43,13 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	}
+	@RequestMapping(value="manualSave" , method = RequestMethod.POST)
+	public Map<String, Object> manualSave(@RequestParam Map<String, Object> map) {
+		
+		return service.manualSave(map);
+		
+	}
+	
 	@RequestMapping(value="stationSave" , method = RequestMethod.POST)
 	public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
@@ -38,22 +38,6 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	@Autowired
 	StationRouteService service;
-	/*@RequestMapping(method = RequestMethod.GET)
-	public Page<StationRoute> list(@RequestParam Map<String, Object> map,
-			@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "5") int size,
-			@RequestParam(defaultValue = "id") String order,
-			@RequestParam(defaultValue = "DESC") String direction){
-		
-		Direction d;
-		
-		if(null != direction && direction.equals("ASC"))
-			d = Direction.ASC;
-		else
-			d = Direction.DESC;
-		
-		return service.list(map, new PageRequest(page, size, new Sort(d, order)));
-	}*/
 	@RequestMapping(value = "/findStations" , method = RequestMethod.GET)
 	public  List<Map<String, Object>> findPoints(@RequestParam Map<String, Object> map) {
@@ -69,4 +53,14 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return service.findUpStationRouteCode(map);
 	}
+	
+	@RequestMapping(value = "/getStationRouteCenterPoints" , method = RequestMethod.GET)
+	public List<Map<String, Object>> getStationRouteCenterPoints(@RequestParam Map<String, Object> map) {
+		return service.getStationRouteCenterPoints(map);
+	}
+	
+	@RequestMapping(value = "/stationRouteIsDestroy" , method = RequestMethod.POST)
+	public Map<String, Object> stationRouteIsDestroy(@RequestParam Map<String, Object> map) {
+		return service.stationRouteIsDestroy(map);
+	}
 }
@@ -61,5 +61,11 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 						   String descriptions, int versions);
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_section SET " +
+				"gsection_vector = GEOMFROMTEXT(?2) , " +
+				"bsection_vector = GEOMFROMTEXT(?3) WHERE id = ?1", nativeQuery=true)
+	public void sectionUpdate(Integer sectionId,String gsectionVector,String bsectionVector);
 }
@@ -2,8 +2,10 @@ package com.bsth.repository;
 import java.util.List;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.StationRoute;
@@ -83,4 +85,16 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				"select  MAX(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
 					"r.line=?1 and r.directions =?2 and station_route_code< ?3  ) and t.line=?1 and t.directions = ?2", nativeQuery=true)
 	List<Object[]> findUpStationRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
+	
+	
+	@Query(value = "SELECT s.b_jwpoints FROM (" +
+						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2) r " +
+				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)
+	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_stationroute SET " +
+				"destroy = ?2 WHERE id = ?1", nativeQuery=true)
+	public void stationRouteIsDestroyUpd(Integer stationRouteId, Integer destroy);
 }
 package com.bsth.service;
+import java.util.Map;
+
 import com.bsth.entity.Section;
 /**
@@ -18,5 +20,6 @@ import com.bsth.entity.Section;
  * 
  */
 public interface SectionService extends BaseService<Section, Integer> {
-
+	
+	Map<String, Object> sectionUpdate(Map<String, Object> map);
 }
@@ -27,4 +27,8 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 Map<String, Object> systemQuote(Map<String, Object> map);
 	 List<Map<String, Object>> findUpStationRouteCode(Map<String, Object> map);
+	 
+	 List<Map<String, Object>> getStationRouteCenterPoints(Map<String, Object> map);
+	 
+	 Map<String, Object> stationRouteIsDestroy(Map<String, Object> map);
 }
@@ -23,6 +23,8 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
 	Map<String, Object> systemSaveStations(Map<String, Object> map);
+	Map<String, Object> manualSave(Map<String, Object> map);
+	
 	int getStationCode();
 	Map<String, Object> stationSaveMap(Map<String, Object> map);
 package com.bsth.service.impl;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.Section;
+import com.bsth.repository.SectionRepository;
 import com.bsth.service.SectionService;
 /**
@@ -23,5 +31,81 @@ import com.bsth.service.SectionService;
 @Service
 public class SectionServiceImpl extends BaseServiceImpl<Section, Integer> implements SectionService{
+	
+	@Autowired
+	SectionRepository repository;
+	
+	@Override
+	public Map<String, Object> sectionUpdate(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		try {
+			
+			Integer sectionId = map.get("sectionId").equals("") ? 0 : Integer.parseInt(map.get("sectionId").toString());
+			
+			// 路段信息字符串
+			String sectionJSON = map.get("sectionJSON").toString().equals("")  ? "" : map.get("sectionJSON").toString();
+			
+			// 如果路段信息JSON字符串不为空
+			if(!sectionJSON.equals("")) {
+				
+
+				// 转换成JSON数组
+				JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+				
+				// 原始线状图形坐标集合
+				String sectionsBpoints = "";
+				
+				// WGS线状图形坐标集合
+				String sectionsWJPpoints = "";
+				
+				// 遍历
+				for(int s = 0 ;s<sectionsArray.size();s++) {
+					
+					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+					
+					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+					
+					String WGSLngStr = JSONObject.parseObject(sectionsArray.getJSONObject(s).get("WGSpotion").toString()).get("Lng").toString();
+					
+					String WGSLatStr = JSONObject.parseObject(sectionsArray.getJSONObject(s).get("WGSpotion").toString()).get("Lat").toString();
+					
+					if(s==0) {
+						
+						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+						
+						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+						
+					}else {
+						
+						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+						
+						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+						
+					}
+					
+					
+				}
+				
+				// WGS坐标点集合
+				String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+				
+				// 原坐标点集合
+				String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
+				repository.sectionUpdate(sectionId, gsectionVector, bsectionVector);
+			}
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}
+		
+		return resultMap;
+	}
 }
@@ -346,4 +346,57 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return list;
 	}
+	@Override
+	public List<Map<String, Object>> getStationRouteCenterPoints(Map<String, Object> map) {
+		
+		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
+		
+		Integer lineId = map.get("lineId").equals("") ? null : Integer.parseInt(map.get("lineId").toString());
+		
+		Integer direction = map.get("direction").equals("") ? null : Integer.parseInt(map.get("direction").toString());
+		
+		List<Object[]> list = repository.getSelectStationRouteCenterPoints(lineId, direction);
+		
+		if(list.size()>0) {
+			
+			for(int i = 0;i<list.size();i++) {
+				
+				Map<String, Object> tempM = new HashMap<String,Object>();
+				
+				tempM.put("bJwpoints", list.get(i));
+				
+				resultList.add(tempM);
+				
+			}
+			
+		}
+		
+		return resultList;
+	}
+
+	@Override
+	public Map<String, Object> stationRouteIsDestroy(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String,Object>();
+		
+		try {
+			
+			Integer stationRouteId = map.get("stationRouteId").equals("") ? 0 : Integer.parseInt(map.get("stationRouteId").toString());
+			
+			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
+			
+			repository.stationRouteIsDestroyUpd(stationRouteId, destroy);
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+			
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}
+		
+		return resultMap;
+	}
+
 }
@@ -95,6 +95,10 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 线路ID
 			int lineId = map.get("lineId").toString().equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			Double sectionDistance = 0.0;
+			
+			Double sectionDuration = 0.0;
+			
 			// 线路信息
 			Line resultLine = lineRepository.findOne(lineId);
@@ -118,6 +122,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+						sectionDistance= distance + sectionDistance;
+						
 						Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
 						// 转成分钟
@@ -127,6 +133,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						duration = t.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+						sectionDuration = duration + sectionDuration;
+						
 						// 百度经纬度坐标
 						String bJwpoints = "";
@@ -213,7 +221,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						route.setStationCode(arg0.getStationCod());
 						// 站点序号
-						route.setStationRouteCode((i+1)*10);
+						route.setStationRouteCode((i+1)*100);
 						// 站点类型
 						if(i==0) {
@@ -248,6 +256,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						// 线路编码
 						route.setLineCode(resultLine.getLineCode());
+						route.setDestroy(destroy);
 						// 插入站点路由信息 
 						routeRepository.save(route);
@@ -345,10 +354,10 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				String roadCoding = "";
 				// 路段距离
-				double sectionDistance = 0;
+				// double sectionDistance = 0;
 				// 路段时间
-				double sectionTime = 0;
+				// double sectionTime = 0;
 				// 限速
 				double speedLimit = Double.parseDouble(speedLimitStr);
@@ -361,7 +370,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 											 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
-											 roadCoding, sectionDistance, sectionTime, dbType, speedLimit, 
+											 roadCoding, sectionDistance, sectionDuration, dbType, speedLimit, 
 											 descriptions, versions);
@@ -768,4 +777,341 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		return resultMap;
 	}
+
+	@Override
+	public Map<String, Object> manualSave(Map<String, Object> map) {
+		
+		Map<String, Object> resultMap = new HashMap<String,Object>();
+		
+		try {
+			
+			// 站点信息字符传
+		    String stationJSON = map.get("stationJSON").equals("")  ? "" : map.get("stationJSON").toString();
+						
+		    // 路段信息字符串
+		    String sectionJSON = map.get("sectionJSON").equals("")  ? "" : map.get("sectionJSON").toString();
+		   
+		    // 方向
+		    int directions = Integer.parseInt(map.get("directions").toString());
+					
+		    // 是否撤销
+		    int destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
+					
+		    // 版本
+		    int versions = map.get("versions").equals("") ? 0 : Integer.parseInt(map.get("versions").toString());
+					
+			// 坐标类型
+			String dbType =  map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+					
+			// 限速
+			String speedLimitStr = map.get("speedLimit").equals("") ? "" : map.get("speedLimit").toString();
+			
+			// 线路ID
+			int lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			
+			// 线路信息
+			Line resultLine = lineRepository.findOne(lineId);
+			
+			Double distance = 0.0;
+			
+			Double duration = 0.0;
+			
+			if(!stationJSON.equals("")) {
+				
+				JSONArray stationsArray = JSONArray.parseArray(stationJSON);
+				
+				for(int i = 0;i <stationsArray.size();i++) {
+					
+					// 站点名称
+					String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
+					
+					String distanceStr = stationsArray.getJSONObject(i).get("distance").equals("") ? "" : stationsArray.getJSONObject(i).get("distance").toString();
+					
+					String durationStr = stationsArray.getJSONObject(i).get("duration").equals("") ? "" : stationsArray.getJSONObject(i).get("duration").toString();
+					
+					if(!distanceStr.equals("")){
+						
+						distance = Double.parseDouble(distanceStr.replaceAll("公里", ""));
+						
+					}
+					
+					if(!durationStr.equals("")){
+						
+						duration = Double.parseDouble(durationStr.replaceAll("分钟", ""));
+						
+					}
+					// 百度经纬度坐标
+					String bJwpoints = "";
+					
+					// 百度坐标经度
+					String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
+					
+					// 百度坐标纬度
+					String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
+					
+					// 百度经纬度
+					bJwpoints = bLonx + " " + bLatx;
+					
+					List<Object[]> stationNameList = repository.findStationName(stationName);
+					
+					boolean isHave = isHaveStationname(bJwpoints,stationNameList);
+					
+					// 初始化站点对象
+					Station arg0 =  new Station();
+					
+					// 站点编码
+					int stationCode = 0;
+					
+					if(isHave) {
+						
+						Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());
+						
+						arg0 = repository.findOne(stationId);
+						
+						stationCode = Integer.parseInt(arg0.getStationCod());
+						
+					}else {
+						
+						stationCode = repository.stationMaxId();
+						
+						arg0.setStationName(stationName);
+						
+						// 原坐标类型
+						arg0.setDbType(dbType);
+						
+						// 站点地理位置WGS坐标经度
+						String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
+						arg0.setgLonx(Float.parseFloat(gLonx));
+						
+						// 站点地理位置WGS坐标纬度
+						String gLaty = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lat").toString();
+						arg0.setgLaty(Float.parseFloat(gLaty));
+						
+						// 半径
+						int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
+						arg0.setRadius(radius);
+						
+						// 图形类型
+						String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+						arg0.setShapesType(shapesType);
+						
+						// 站点编码
+						arg0.setStationCod(String.valueOf(stationCode+1));
+						
+						// 是否想撤销
+						arg0.setDestroy(destroy);
+						
+						// 版本号
+						arg0.setVersions(versions);
+						
+						arg0.setbJwpoints(bJwpoints);
+						
+						// 插入站点信息
+						repository.save(arg0);
+						// 站点路由对象
+						StationRoute route = new StationRoute();
+						
+						// 站点名称
+						route.setStationName(stationName);
+						
+						route.setDistances(distance);
+						
+						route.setToTime(duration);
+						
+						
+						// 站点编码
+						route.setStationCode(arg0.getStationCod());
+						
+						// 站点序号
+						route.setStationRouteCode((i+1)*10);
+						
+						// 站点类型
+						if(i==0) {
+							
+							// 起始站
+							route.setStationMark("B");
+							
+						}else if(i==stationsArray.size()-1) {
+							
+							// 终点站
+							route.setStationMark("E");
+							
+						}else {
+							
+							// 中途站
+							route.setStationMark("Z");
+							
+						}
+						
+						// 版本号
+						route.setVersions(versions);
+						
+						// 站点ID
+						route.setStation(arg0);
+						
+						// 方向
+						route.setDirections(directions);
+						
+						// 线路ID
+						route.setLine(resultLine);
+						
+						// 线路编码
+						route.setLineCode(resultLine.getLineCode());
+						
+						
+						// 插入站点路由信息 
+						routeRepository.save(route);
+						
+					}
+				}
+			}
+			
+			// 如果路段信息JSON字符串不为空
+			if(!sectionJSON.equals("")) {
+				
+				// 转换成JSON数组
+				JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+				
+				// 遍历
+				for(int s = 0 ;s<sectionsArray.size();s++) {
+					
+					// 站点名称
+					String sectionName = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("sectionName").toString();
+					
+					String pointsStr = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("points").toString();
+					
+					// 原始线状图形坐标集合
+					String sectionsBpoints = "";
+					
+					// WGS线状图形坐标集合
+					String sectionsWJPpoints = "";
+					
+					if(!pointsStr.equals("")){
+						
+						JSONArray pointsArray = JSONArray.parseArray(pointsStr);
+						
+						for(int p =0;p<pointsArray.size();p++){
+							
+							if(p==pointsArray.size()-1){
+								
+								sectionsBpoints = sectionsBpoints + pointsArray.getJSONObject(p).get("lng").toString() + " " +pointsArray.getJSONObject(p).get("lat").toString();
+								
+								sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat");
+								
+							}else {
+								
+								sectionsBpoints = sectionsBpoints + pointsArray.getJSONObject(p).get("lng").toString() + " " +pointsArray.getJSONObject(p).get("lat").toString()+",";
+								
+								sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat") +",";
+								
+								
+							}
+							
+						}
+						
+					}
+					System.out.println(sectionName);
+					
+					System.out.println(sectionsBpoints);
+					
+					System.out.println(sectionsWJPpoints);
+					 
+					
+					int sectionMaxId = sectionRepository.sectionMaxId();
+					
+					String sectionCode = String.valueOf(sectionMaxId+1);
+					
+					// 交出路
+					String crosesRoad = "";
+					
+					// 终止节点
+					String endNode = "";
+					
+					// 开始节点
+					String startNode = "";
+					
+					// 中间节点
+					String middleNode = "";
+					
+					// WGS坐标点集合
+					String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+					
+					// 原坐标点集合
+					String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
+					
+					// 城建坐标点集合
+					String csectionVector = "";
+					
+					// 路段类型
+					String sectionType = "";
+					
+					// 道路编码
+					String roadCoding = "";
+					
+					// 路段距离
+					double sectionDistance = distance;
+					
+					// 路段时间
+					double sectionTime = duration;
+					
+					// 限速
+					double speedLimit = Double.parseDouble(speedLimitStr);
+					
+					// 说明
+					String descriptions = "";
+					
+					
+					sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, 
+												
+												 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
+												 
+												 roadCoding, sectionDistance, sectionTime, dbType, speedLimit, 
+												 
+												 descriptions, versions);
+												 
+					
+					
+					Section section = sectionRepository.findOne(Integer.parseInt(sectionCode));
+					
+					// 路段路由
+					SectionRoute sectionRoute = new SectionRoute();
+					
+					// 路段序号
+					sectionRoute.setSectionrouteCode(1);
+					
+					// 线路编码
+					sectionRoute.setLineCode(resultLine.getLineCode());
+					
+					// 路段ID
+					sectionRoute.setSection(section);
+					
+					// 线路ID
+					sectionRoute.setLine(resultLine);
+					
+					// 路段编码
+					sectionRoute.setSectionCode(sectionCode);
+					
+					// 版本
+					sectionRoute.setVersions(versions);
+					
+					// 方向
+					sectionRoute.setDirections(directions);
+					
+					sectionRouteRepository.save(sectionRoute);
+				}
+			}
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}
+		
+		return resultMap;
+	}
+
 }
@@ -123,7 +123,6 @@
 		});
 		page = 0;
-		console.log(params);
 		loadTableDate(params,true);
 	});
@@ -13,61 +13,7 @@
  */
 (function(){
-	
-	// 填充公司下拉框选择值
-	$get('/business/all', {upCode_eq: '88'}, function(array){
-		 
-		 // 公司下拉options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 遍历array
-		 $.each(array, function(i,d){
-			 
-			 options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-			 
-		 });
-		 
-		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
-		 $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
-		 
-	 });
-	 
-	 // 填充分公司下拉框
-	 setbrancheCompanySelectOptions();
-	 // 填充分公司下拉框选择值
-	 function setbrancheCompanySelectOptions(){
-		 
-		 // 获取公司下拉框选择值
-		 var businessCode = $('#companySelect').val();
-		 
-		 // 分公司下拉框options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
-		 if(businessCode == null || businessCode ==''){
-			 
-			 // 填充分公司下拉框options
-			 $('#brancheCompanySelect').html(options);
-			 
-		  } else {
-			  
-			  // 查询出所属公司下的分公司名称和相应分公司代码
-			  $get('/business/all', {upCode_eq: businessCode}, function(array){
-				  
-				  // 遍历array
-				  $.each(array, function(i,d){
-					  
-					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-					  
-					  // 填充分公司下拉框options
-					  $('#brancheCompanySelect').html(options);
-					  
-				  });
-			  });
-		  }
-	 }
-	
 	/**
 	 * -----page : 当前页
 	 * 
@@ -76,12 +22,6 @@
 	 */
 	var page = 0,initPag;
-	// 选择框
-	var icheckOptions = {
-		    checkboxClass: 'icheckbox_flat-blue',
-		    increaseArea: '20%'
-		};
-	
 	// 表格数据分页加载
 	loadTableDate(null,true);
@@ -149,16 +89,13 @@
 		// 异步请求获取表格数据
 		$.get('/sectionroute',params,function(result){
-			console.log(result);
+			// 添加序号
+			result.content.page =  page;
 			// 把数据填充到模版中
 			var tbodyHtml = template('sectionInfo_list_table_temp',{list:result.content});
 			// 把渲染好的模版html文本追加到表格中
 			$('#datatable_line tbody').html(tbodyHtml);
-			// 制定复选框
-			$('#datatable_line tbody').find('.icheck').iCheck(icheckOptions);
-			// 复选框改变事件
-			$('#datatable_line tbody').find('.icheck').on('ifChanged', iCheckChange);
 			// 是重新分页且返回数据长度大于0
 			if(isPon && result.content.length > 0){
 				// 重新分页
@@ -171,22 +108,6 @@
 		});
 	}
-	/**
-	 * 复选框组件
-	 * 
-	 */
-	function iCheckChange(){
-		// 获取当前的父节点tr
-		var tr = $(this).parents('tr');
-		
-		// 判断当前是否选中
-		if(this.checked)
-			// 选中，则增添父节点tr的样式
-			tr.addClass('row-active');
-		else
-			// 未选中，则删除父节点tr的样式
-			tr.removeClass('row-active');
-	}
 	/**
 	 * 分页栏组件
@@ -95,7 +95,7 @@
 	{{each list as obj i }}
 		<tr>
 			<td style="vertical-align: middle;">
-				<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+				 {{(list.page*10)+(i+1)}}
 			</td>
 			<td>
 				{{obj.lineCode}}
@@ -13,61 +13,7 @@
  */
 (function(){
-	
-	// 填充公司下拉框选择值
-	$get('/business/all', {upCode_eq: '88'}, function(array){
-		 
-		 // 公司下拉options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 遍历array
-		 $.each(array, function(i,d){
-			 
-			 options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-			 
-		 });
-		 
-		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
-		 $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
-		 
-	 });
-	 
-	 // 填充分公司下拉框
-	 setbrancheCompanySelectOptions();
-	 // 填充分公司下拉框选择值
-	 function setbrancheCompanySelectOptions(){
-		 
-		 // 获取公司下拉框选择值
-		 var businessCode = $('#companySelect').val();
-		 
-		 // 分公司下拉框options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
-		 if(businessCode == null || businessCode ==''){
-			 
-			 // 填充分公司下拉框options
-			 $('#brancheCompanySelect').html(options);
-			 
-		  } else {
-			  
-			  // 查询出所属公司下的分公司名称和相应分公司代码
-			  $get('/business/all', {upCode_eq: businessCode}, function(array){
-				  
-				  // 遍历array
-				  $.each(array, function(i,d){
-					  
-					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-					  
-					  // 填充分公司下拉框options
-					  $('#brancheCompanySelect').html(options);
-					  
-				  });
-			  });
-		  }
-	 }
-	
 	/**
 	 * -----page : 当前页
 	 * 
@@ -76,11 +22,7 @@
 	 */
 	var page = 0,initPag;
-	// 选择框
-	var icheckOptions = {
-		    checkboxClass: 'icheckbox_flat-blue',
-		    increaseArea: '20%'
-		};
+ 
 	// 表格数据分页加载
 	loadTableDate(null,true);
@@ -149,16 +91,13 @@
 		// 异步请求获取表格数据
 		$.get('/stationroute',params,function(result){
-			console.log(result);
+			// 添加序号
+			result.content.page =  page;
 			// 把数据填充到模版中
 			var tbodyHtml = template('staitonInfo_list_table_temp',{list:result.content});
 			// 把渲染好的模版html文本追加到表格中
 			$('#datatable_line tbody').html(tbodyHtml);
-			// 制定复选框
-			$('#datatable_line tbody').find('.icheck').iCheck(icheckOptions);
-			// 复选框改变事件
-			$('#datatable_line tbody').find('.icheck').on('ifChanged', iCheckChange);
 			// 是重新分页且返回数据长度大于0
 			if(isPon && result.content.length > 0){
 				// 重新分页
@@ -172,23 +111,6 @@
 	}
 	/**
-	 * 复选框组件
-	 * 
-	 */
-	function iCheckChange(){
-		// 获取当前的父节点tr
-		var tr = $(this).parents('tr');
-		
-		// 判断当前是否选中
-		if(this.checked)
-			// 选中，则增添父节点tr的样式
-			tr.addClass('row-active');
-		else
-			// 未选中，则删除父节点tr的样式
-			tr.removeClass('row-active');
-	}
-	
-	/**
 	 * 分页栏组件
 	 * 
 	 */
@@ -29,7 +29,7 @@
 					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_line">
 						<thead>
 							<tr role="row" class="heading">
-								<th width="3%">#</th>
+								<th width="3%">序号</th>
 								<th width="8%">线路编号</th>
 								<th width="8%">线路名称</th>
 								<th width="8%">线路方向</th>
@@ -42,7 +42,7 @@
 								<th width="15%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
-								<td></td>
+								<td>#</td>
 								<td>
 									 <input type="text" class="form-control form-filter input-sm" name="carParkCode">
 								</td>
@@ -99,7 +99,7 @@
 	{{each list as obj i }}
 		<tr>
 			<td style="vertical-align: middle;">
-				<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+				 {{(list.page*10)+(i+1)}}
 			</td>
 			<td>
 				{{obj.lineCode}}
-<!-- 手动规划线路站点方式 -->
+<!-- 其他规划方式 -->
 <div class="modal fade" id="add_manual_mobal" tabindex="-1" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
@@ -7,34 +7,27 @@
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-				<h4 class="modal-title">手动规划线路站点方式</h4>
+				<h4 class="modal-title">选择规划方式</h4>
 			</div>
 			<div class="modal-body">
-				<form class="form-horizontal" action="/" method="post" id="formBootbox" role="form">
-					<div class="alert alert-danger display-hide" id="requiredname">
-						<button class="close" data-close="alert"></button>
-							站点名称为必填项
-					</div>
-					<div class="alert alert-danger display-hide" id="serchrname">
-						<button class="close" data-close="alert"></button>
-						系统无法生成，请选择其他方式新增
-					</div>
-					
+				<form class="form-horizontal" action="/" method="post" id="add_manual_form" role="form">
+					 
 					<div class="form-group">
-						<label class="col-md-3 control-label">手动规划方式：</label>
+						<label class="col-md-3 control-label">规划方式：</label>
 						<div class="col-md-9">
 							<div class="icheck-list">
 								<label >
-									<input type="radio" class="icheck" name="addManualRadio" value=1 checked> 模板添加
-								</label>
-								<label>
-										<input type="radio" class="icheck" name="addManualRadio" value=0 checked> 导入Excel文件
+									<input type="radio" class="icheck" name="addManualRadio" value=0 checked> 手动添加站点
 								</label>
+								<!-- <label>
+										<input type="radio" class="icheck" name="addManualRadio" value=1> 导入Excel文件
+								</label> -->
 							</div>
 						</div>
 					 </div>
+					 
 			    </form>
 			</div>
 			<div class="modal-footer">
@@ -47,22 +40,34 @@
 <script type="text/javascript">
 $(function(){
-	$('#add_manual_mobal').modal({
-		
-		show : true,
-		
-		backdrop: 'static', 
-		
-		keyboard: false
-		
-		
-	});
+	// 显示其他规划方式弹出层
+	$('#add_manual_mobal').modal({show : true,backdrop: 'static', keyboard: false});
+	
+	// 获取表单元素
+	var form = $('#add_manual_form');
+	// 表单序列化
+	var params = form.serializeJSON();
+	
+	// 下一步点击事件
 	$('.modal-footer #addManualSelectnextButton').on('click',function() {
+		// 获取其他规划方式值
+		var addManualRadioV = params.addManualRadio;
+		
+		// 隐藏其他规划方式弹出层
 		$('#add_manual_mobal').modal('hide');
-		layer.msg('该功能正在开发过程中...请暂时使用系统规划');
+		if(addManualRadioV==0){
+			
+			//　加载模板手动添加站点页面
+			$.get('addstationstemplate.html', function(m){$(pjaxContainer).append(m);});
+			
+		}else if(addManualRadioV==1) {
+			
+			
+		}
+		
 	});
+<!-- 手动添加站点 -->
+<div class="modal fade" id="add_station_template_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	
+	<div class="modal-dialog">
+		
+		<div class="modal-content">
+		
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">手动添加站点</h4>
+			</div>
+			
+			<div class="modal-body">
+				
+				<form class="form-horizontal" role="form" id="save_station_template_form" action="/module" method="post">
+				
+					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					
+					<!-- 站点名称 -->
+					<div class="form-body">
+					
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span> 站点名称：
+                    		</label>
+							<div class="col-md-6">
+								<textarea class="form-control" rows="10" name="stations" id="stationsInput" placeholder="站点名称"></textarea> 
+							</div>
+						</div>
+						
+					</div>
+					
+					 <div class="form-group">
+					 	<div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
+                            <h5 class="block"><span class="help-block"> *　手动添加站点规划说明： </span></h5>
+                            <p><span class="help-block">&nbsp;请在文本域中按站点顺序依次输入站点名称,每输入完一个站名时请按回车键（Enter）换行.</span> </p>
+                        </div>
+					 </div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal" id="addMobalHiden">取消</button>
+				<button type="button" class="btn btn-primary" id="templateSaveData">提交数据</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$(function(){
+	
+	function eachSectionList(sectiondata,cb) {
+		
+		var dataLen_ = sectiondata.length;
+		
+		(function(){
+			
+			 if (!arguments.callee.count) {
+				 
+				 arguments.callee.count = 0;
+				 
+			 }
+			 
+			 arguments.callee.count++;
+			 
+			 var index_ = parseInt(arguments.callee.count) - 1;
+			 
+			 if (index_ > dataLen_ -1) {
+				 
+				 cb && cb(sectiondata);
+				 return;
+				 
+	          }
+			 
+			 var p = arguments.callee;
+			 
+			 GetAjaxData.MuneBpointsArrayToWGS(sectiondata[index_].points,function(polyGonArray_) {
+					
+				 	sectiondata[index_].points = polyGonArray_;
+					
+					p();
+			});
+			
+		})();
+		
+	}
+	
+	// 延迟加载显示mobal
+	setTimeout(function(){$('#add_station_template_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
+	
+	var directionData =  $('.upManual').data('direction');
+	
+	// console.log();
+	
+	// 获取表单元素
+	var form = $('#save_station_template_form');
+	
+	// 获取错误提示信息元素
+	var error = $('.alert-danger', form);
+	
+	// 提交数据点击事件
+	$('.modal-footer #templateSaveData').on('click',function() {
+		
+		// 表单提交
+		form.submit();
+		
+	});
+	
+	// 表单验证
+	form.validate({
+		
+		errorElement : 'span', 
+		
+		errorClass : 'help-block help-block-error', 
+		
+		focusInvalid : false, 
+		
+		rules : {
+			
+			'stations' : {
+				
+				required : true,
+				
+			}
+	
+		},
+		
+		invalidHandler : function(event, validator) {  
+			
+			error.show();
+			
+			App.scrollTo(error, -200);
+			
+		},
+
+		highlight : function(element) { 
+			
+			$(element).closest('.form-group').addClass('has-error'); 
+			
+		},
+
+		unhighlight : function(element) { 
+			
+			$(element).closest('.form-group').removeClass('has-error'); 
+			
+		},
+
+		success : function(label) {
+			
+			label.closest('.form-group').removeClass('has-error'); 
+			
+		},
+
+		submitHandler : function(f) {
+			
+			// 表单序列画
+			var params = form.serializeJSON();
+			
+			var paramsStationsArray = params.stations.split('\r\n');
+			
+			WorldsBMap.stationsNameToPoints(paramsStationsArray,function(resultJson) {
+				
+				WorldsBMap.getDistanceAndTotime(resultJson,function(stationdataList) {
+					
+					WorldsBMap.getSectionListPlonly(stationdataList,function(sectiondata) {
+						
+						
+						eachSectionList(sectiondata,function(successdata) {
+							
+							GetAjaxData.getFormPointEToWGS(stationdataList,function(stationdata) {
+								
+								console.log(stationdata);
+								
+								console.log();
+								
+								// 定义站点信息JSON字符串
+								var stationJSON = JSON.stringify(stationdata);
+								
+								// 定义路段信息字符串
+								var sectionJSON = JSON.stringify(successdata);
+								
+								// 参数集合
+								var params = {};
+								
+								// 站点信息JSON字符串
+								params.stationJSON = stationJSON;
+								
+								// 线路ID
+								params.lineId = id;
+								
+								// 方向
+								params.directions = directionData;
+								
+								// 原始坐标类型
+								params.dbType = 'b';
+								
+								// 圆形半径
+								params.radius = '300';
+								
+								// 限速
+								params.speedLimit = '60';
+								
+								// 图形类型（r：圆形；p：多边形）
+								params.shapesType = 'r';
+								
+								// destroy：是否撤销
+								params.destroy = '0';
+								
+								// versions：版本号
+								params.versions = '1';
+								
+								// 路段信息JSON字符串
+								params.sectionJSON = sectionJSON;
+								
+								
+								// 保存
+								$post('/station/manualSave',params,function(rd) {
+
+									if(rd.status='SUCCESS') {
+										
+										// 关闭弹出层
+										// layer.closeAll();
+										
+										// 显示表格
+										// $('#hide_table').show();
+										
+										// 刷新树
+										resjtreeDate(id,directionData);
+										
+									}else {
+										
+										// 保存失败
+										
+										
+									}
+									
+									
+								});
+								
+							}); 
+							
+							
+						});
+						// console.log(sectiondata);
+						
+					});
+					
+					/* GetAjaxData.getFormPointEToWGS(stationdataList,function(stationdata) {
+						
+						 
+						
+						
+					}); */
+				 	
+					
+					/* // 百度站点坐标获取WGS坐标
+					GetAjaxData.getFormPointEToWGS(stationdataList,function(stationdata) {
+						
+						eachSectionList(sectiondata,function(successdata) {
+							
+							console.log(successdata);
+							
+							// 定义站点信息JSON字符串
+							var stationJSON = JSON.stringify(stationdata);
+							
+							// 定义路段信息字符串
+							var sectionJSON = JSON.stringify(successdata);
+							
+							// 参数集合
+							var params = {};
+							
+							// 站点信息JSON字符串
+							params.stationJSON = stationJSON;
+							
+							// 线路ID
+							params.lineId = id;
+							
+							// 方向
+							params.directions = directionData;
+							
+							// 原始坐标类型
+							params.dbType = 'b';
+							
+							// 圆形半径
+							params.radius = '300';
+							
+							// 限速
+							params.speedLimit = '60';
+							
+							// 图形类型（r：圆形；p：多边形）
+							params.shapesType = 'r';
+							
+							// destroy：是否撤销
+							params.destroy = '0';
+							
+							// versions：版本号
+							params.versions = '1';
+							
+							// 路段信息JSON字符串
+							params.sectionJSON = sectionJSON;
+							
+							
+							// 保存
+							$post('/station/manualSave',params,function(rd) {
+
+								if(rd.status='SUCCESS') {
+									
+									// 关闭弹出层
+									// layer.closeAll();
+									
+									// 显示表格
+									// $('#hide_table').show();
+									
+									// 刷新树
+									resjtreeDate(id,directionData);
+									
+								}else {
+									
+									// 保存失败
+									
+									
+								}
+								
+								
+							});
+							
+							
+						})
+						
+					});
+					 */
+				});
+				
+			});
+			
+		}
+	});
+	
+	
+	 
+});
+</script>
 \ No newline at end of file
@@ -17,6 +17,16 @@ var GetAjaxData = function(){
 			},
+			getStationRoutePoint : function(id_,dir_,callback) {
+				
+				$get('/stationroute/getStationRouteCenterPoints',{lineId:id_,direction:dir_},function(result) {
+					
+					callback && callback(result);
+					
+				});
+						
+			},
+			
 			getLikeStationName : function (stationName,callback) {
 				 $get('/station/all', {stationName_eq: stationName}, function(array){
@@ -122,6 +132,21 @@ var GetAjaxData = function(){
 			},
+			stationRouteIsDestroy : function(stationRoute,callback) {
+				
+				
+			},
+			
+			sectionUpdate:function(section,callback) {
+				
+				$post('/section/sectionUpdate',section,function(data) {
+					
+					callback && callback(data);
+					
+				})
+				
+			},
+			
 			// 获取线路名称
 			getIdLineName : function (id,callback) {
@@ -193,6 +218,66 @@ var GetAjaxData = function(){
 			},
+			MuneBpointsArrayToWGS : function(polyGonArray,callback) {
+				
+				if(polyGonArray) {
+					
+					// 获取长度
+					var len = polyGonArray.length;
+					
+					(function(){
+						
+						 if (!arguments.callee.count) {
+							 
+							 arguments.callee.count = 0;
+							 
+						 }
+						 
+						 arguments.callee.count++;
+						 
+						 var index = parseInt(arguments.callee.count) - 1;
+						 
+						 if (index >= len) {
+							 
+							 callback && callback(polyGonArray);
+				        	  
+				              return;
+				          }
+						 
+						 var f = arguments.callee;
+						 
+						 $.ajax({
+							  
+							  // 百度坐标获取WGS坐标
+				              url: 'http://api.zdoz.net/bd2wgs.aspx',
+				              
+				              data: {lat: polyGonArray[index].lat , lng: polyGonArray[index].lng},
+				              
+				              dataType: 'jsonp',
+				              
+				              success: function(r){
+				            	  
+				            	  if(r) {
+				            		  
+				            		  polyGonArray[index].WGSpotion = r;
+				            		  
+				            	  }
+				            	  
+				            	  f();
+				              }
+				          });
+						
+					})();
+					
+				}else {
+					
+					callback && callback('');
+					
+				}
+				
+				
+			},
+			
 			getSectionRouteInfo : function(lineId,direction,callback) {
 				$get('/sectionroute/findSection',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
@@ -268,9 +268,10 @@ function systemLineStation(lineNameV,directionData) {
 				if(result) {
 					GetAjaxData.BpolyGonArrayToWGS(polyGonArray,function(arraydata) {
-						
 						WorldsBMap.getDistanceAndDuration(result,function(json) {
+							// console.log(arraydata);
+							
 							json[0].distance = '';
 							json[0].duration = '';
@@ -314,12 +315,11 @@ function systemLineStation(lineNameV,directionData) {
 							// 限速
 							params.speedLimit = '60';
-							console.log(params);
+							// console.log(params);
 							// 保存
 							$post('/station/collectionSave',params,function(rd) {
-								
 								if(rd.status='SUCCESS') {
 									// 关闭弹出层
@@ -337,7 +337,7 @@ function systemLineStation(lineNameV,directionData) {
 								}
-								
+							
 							});
 						});
@@ -387,57 +387,43 @@ $(function(){
 	function systemSaveStation(directionData) {
-		// 根据线路ID获取线路名称
-		GetAjaxData.getIdLineName(id,function(data) {
+		// 定义线路名称
+		var lineNameV = $('.portlet-title .caption').text();
+		
+		if(lineNameV.indexOf('区间')>0){
-			if(data) {
+			var lineNameNew = lineNameV.replace('区间','');
+			
+			layer.confirm('系统无法生成该线路【'+lineNameV+'】的站点与路段！自动修改为如下线路名称【'+lineNameNew+'】生成', {
+				btn : [ '确认提示并提交', '取消' ]
+			}, function(index) {
+				
+				layer.close(index);
-				// 定义线路名称
-				var lineNameV = data.name;
+				lineNameV = lineNameNew;
-				if(lineNameV.indexOf('区间')>0){
+				systemLineStation(lineNameV,directionData);
+			},function(){
+				
+				layer.closeAll();
+				
+				if(directionData==0){
-					var lineNameNew = lineNameV.replace('区间','');
+					$('#upToolsMobal').show();
-					layer.confirm('系统无法生成该线路【'+lineNameV+'】的站点与路段！自动修改为如下线路名称【'+lineNameNew+'】生成', {
-						btn : [ '确认提示并提交', '取消' ]
-					}, function(index) {
-						
-						layer.close(index);
-						
-						lineNameV = lineNameNew;
-						
-						systemLineStation(lineNameV,directionData);
-					},function(){
-						
-						layer.closeAll();
-						
-						if(directionData==0){
-							
-							$('#upToolsMobal').show();
-							
-						}else if(directionData==1){
-							
-							$('#downToolsMobal').show();
-							
-						}
-						
-						
-					});
-				}else {
+				}else if(directionData==1){
-					systemLineStation(lineNameV,directionData);
+					$('#downToolsMobal').show();
 				}
-			}else {
-				
-				alert('线路名称为空');
-			}
+			});
+		}else {
+			systemLineStation(lineNameV,directionData);
-		});
+		}
 	}
@@ -471,7 +457,7 @@ $(function(){
 	});	
-	//删除
+	// 撤销
 	$('.module_tools #deleteUpStation').on('click', function(){
 		var obj = getCurrSelNode('0');
@@ -481,10 +467,30 @@ $(function(){
 			return;
 		}
-		removeConfirm('你确定要删除【'+obj[0].text+'】模块吗？', '/module/' + obj[0].id
-				,function() {
+		layer.confirm('你确定要撤销【'+obj[0].text+'】站点吗?', {btn : [ '确定撤销','返回' ],icon: 3, title:'提示' }, function(index){
+			
+			 var stationRouteId = obj[0].original.stationRouteId;
+			 
+			 var params = {stationRouteId:stationRouteId,destroy:'1'};
+			 
+			 GetAjaxData.stationRouteIsDestroy(params,function(result) {
+				 
+				 layer.close(index);
+				 
+				 if(result.status=='SUCCESS'){
+					 
+					layer.msg('撤销上行站点【'+obj[0].text+'】成功！');
+						
+				 }else{
+						
+					 layer.msg('撤销上行站点【'+obj[0].text+'】失败！');
+						
+				 }
+				 
+			 });
 		});
+	 
 	});
 	// 修改上行站点mobal页面
@@ -527,6 +533,20 @@ $(function(){
 	// 编辑线路走向
 	$('.module_tools #editUplineTrend').on('click', function(){
+		var sel = getCurrSelNode(dir);
+		
+		if(sel.length==0 || sel[0].original.chaildredType !='section'){
+			
+			layer.msg('请先选中要编辑的上行路段！');
+			
+			return;
+		}
+		
+		var sectionId = sel[0].original.sectionId;
+		
+		
+		var sectionrouteDirections = sel[0].original.sectionrouteDirections;
+		
 		//  开启线路编辑
 		polyUpline.enableEditing();
@@ -539,13 +559,45 @@ $(function(){
   			// 关闭
   			layer.close(yindex);
+  			polyUpline.disableEditing();
+  			
+  			// 弹出正在加载层
+  			var i = layer.load(0,{title :'我是标题'});
+  			
   			// 获取折线坐标集合
   			var editPloyLineArray = polyUpline.getPath();
   			// 坐标转换WGS坐标
   			GetAjaxData.BpolyGonArrayToWGS(editPloyLineArray,function(arraydata) {
-  				console.log(arraydata);
+  				// 定义路段信息字符串
+				var sectionJSON = JSON.stringify(arraydata);
+				
+				var params = {sectionId:sectionId,sectionJSON:sectionJSON}
+				
+				GetAjaxData.sectionUpdate(params,function(result) {
+					
+					layer.close(i);
+					
+					if(result.status=='SUCCESS'){
+						
+						layer.msg('修改上行路段成功！');
+						
+					}else{
+						
+						layer.msg('修改上行路段失败！');
+						
+					}
+					mapB.clearOverlays();
+					GetAjaxData.getSectionRouteInfo(id,sectionrouteDirections,function(data) {
+						
+						// 刷新树
+						resjtreeDate(id,sectionrouteDirections);
+						
+						linePanlThree(data,sectionrouteDirections);
+						
+					});
+				});
   			});
@@ -556,14 +608,25 @@ $(function(){
 	// 线路上行
 	$('#leftUpOrDown #upLine').on('click', function(){
-		linePanlThree(id,'0');
+		mapB.clearOverlays();
+		
+		GetAjaxData.getSectionRouteInfo(id,'0',function(data) {
+			
+			linePanlThree(data,'0');
+			
+		});
 	});
 	// 线路下行
 	$('#leftUpOrDown #downLine').on('click', function(){
+		mapB.clearOverlays();
-		linePanlThree(id,'1');
+		GetAjaxData.getSectionRouteInfo(id,'1',function(data) {
+			
+			linePanlThree(data,'1');
+			
+		});
 	});
@@ -7,7 +7,7 @@ var WorldsBMap = function () {
 			// 搜索结果呈现的配置
 			// renderOptions:{map:map},
-			// 设置公交列表查询后的回调函数。参数：rs: BusListResult类型
+		/*	// 设置公交列表查询后的回调函数。参数：rs: BusListResult类型
 			onGetBusListComplete:function(BusListResult) {
 				// 如果不为空
@@ -20,8 +20,7 @@ var WorldsBMap = function () {
 				}
-			},
-			
+			},*/
 			// 设置公交列表查询后的回调函数。参数：rs: BusListResult类型
 			onGetBusListComplete:function(BusListResult) {
@@ -33,7 +32,7 @@ var WorldsBMap = function () {
 					if(fstLine==undefined){
-						layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择手动规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
+						layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
 							layer.closeAll();
@@ -413,6 +412,46 @@ var WorldsBMap = function () {
 			},
+			pointsThread : function(obj,map) {
+				
+				mapB.clearOverlays();
+				
+				if(obj) {
+					
+					var tempStr = obj.substring(11,obj.length-1);
+					
+					var lineArray = tempStr.split(',');
+					
+					var polylineArray = [];
+					
+					for(var i = 0;i<lineArray.length;i++) {
+						
+						polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+						
+					}
+					
+					// 创建线路走向
+					polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 4,strokeOpacity : 0.5});
+			  		
+					// 把折线添加到地图上
+			  		mapB.addOverlay(polyUpline);
+			  		
+			  		// 自定义标注物图片
+			  		var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+			  		
+			  		// 创建标注物
+			  		var markers_target = new BMap.Marker(polylineArray[0],{icon : icon_target});
+			  		
+			  		// 把标注添物加到地图上
+			  		mapB.addOverlay(markers_target);
+			  		
+			  		//设置中心点
+			  		mapB.centerAndZoom(polylineArray[0],16);
+					
+				}
+				
+			},
+			
 			// 画圆
 			pointsCircle : function(objStation,map) {
@@ -440,8 +479,8 @@ var WorldsBMap = function () {
 		  					width : 200,
 		  					// 信息窗口高度
-		  					height : 400,
-		  					
+		  					height : 450,
+		  					offset: new BMap.Size(500,120),
 		  					//标题
 		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
@@ -449,7 +488,9 @@ var WorldsBMap = function () {
 		  					enableMessage : false,
 		  					//是否开启点击地图关闭信息窗口
-		  					enableCloseOnClick : false
+		  					enableCloseOnClick : false,
+		  					
+		  					enableAutoPan:false
 		  			};
 			  		var infoWindow_target = new BMap.InfoWindow('<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
@@ -469,16 +510,21 @@ var WorldsBMap = function () {
 	  			// 把标注添物加到地图上
 	  	  		map.addOverlay(marker);
+	  	  		setTimeout(function(){
+	  	  		//开启信息窗口
+		  	  		marker.openInfoWindow(infoWindow_target,point);
+	  			
+	  	  		},100);
+	  	  		
 	  	  		// marker.disableMassClear();
 	  	  		var PanOptions_ ={noAnimation :true};
 	  	  		map.panTo(point,PanOptions_);
-	  	  		map.panBy(10,110,PanOptions_);
+	  	  		//map.panBy(10,-50,PanOptions_);
+	  	  		
-	  	  		//开启信息窗口
-	  	  		marker.openInfoWindow(infoWindow_target,point);
 	  	  		// 添加标志物监听事件
 	  	  		marker.addEventListener("click",function() {
@@ -505,7 +551,6 @@ var WorldsBMap = function () {
 						if(poi) {
-							
 							//获取经度和纬度
 							resultPoints = poi.point.lng + ' ' + poi.point.lat;
@@ -517,15 +562,11 @@ var WorldsBMap = function () {
 						}
-						
 					}else {
 						callback && callback(false);
 					}
-					
-				 
-					
 				　});
 				　localSearch.search(Address);
@@ -636,27 +677,56 @@ var WorldsBMap = function () {
 			},
 			// 在地图上画出上行线路走向
-			drawingUpline : function (polylineArray) {
+			drawingUpline : function (polylineArray,resultdata) {
-				mapB.clearOverlays();
+				// mapB.clearOverlays();
 				// 创建线路走向
-				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 4,strokeOpacity : 0.5});
+				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
 				// 把折线添加到地图上
 		  		mapB.addOverlay(polyUpline);
-		  		// 自定义标注物图片
-		  		var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+		  		if(resultdata.length>0) {
+		  			
+		  			for(var s = 0 ; s<resultdata.length;s++) {
+		  				
+		  				var bJwpointsStr = resultdata[s].bJwpoints;
+		  				
+		  				var bJwpointsArray = bJwpointsStr.split(' ');
+		  				
+		  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
+		  				
+		  				// 自定义标注物图片
+				  		var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+
+				  		// 创建标注物
+				  		var markers_target = new BMap.Marker(point_center,{icon : icon_target});
+		  				 
+		  				mapB.addOverlay(markers_target);
+		  				
+		  			}
+		  			
+		  		}
+		  		
+		  		var ceter_index = Math.round(resultdata.length / 2);
-		  		// 创建标注物
-		  		var markers_target = new BMap.Marker(polylineArray[0],{icon : icon_target});
+		  		var  ceterPointsStr = resultdata[ceter_index].bJwpoints;
-		  		// 把标注添物加到地图上
-		  		mapB.addOverlay(markers_target);
+		  		var ceterPointsArray = ceterPointsStr.split(' ');
+  				
+  				var polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);
-		  		//设置中心点
-		  		mapB.centerAndZoom(polylineArray[0],16);
+		  		var PanOptions_ ={noAnimation :true};
+	  	  		
+		  		mapB.reset();
+		  		
+	  	  		mapB.panTo(polyline_center,PanOptions_);
+	  	  		
+	  	  		mapB.panBy(500,-510,PanOptions_);
+	  	  		
+	  	  		mapB.setZoom(14);
+	  	  		
 			},
@@ -670,8 +740,198 @@ var WorldsBMap = function () {
 				// 设置属性
 				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
-			}
+			},
+			
+			stationsNameToPoints : function(arra,callback) {
+				
+				// 获取长度
+				var len = arra.length;
+				
+				var stationList = [];
+				
+				(function(){
+					
+					 if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len) {
+						 
+						 callback && callback(stationList);
+			        	  
+			              return;
+			          }
+					 
+					 var f = arguments.callee;
+					 
+					 if(arra[index]!=''){
+						 
+						 var localSearch = new BMap.LocalSearch(mapB);
+						 
+						 localSearch.search(arra[index]);
+						 
+						 localSearch.setSearchCompleteCallback(function (searchResult) {
+							 
+							 var poi = searchResult.getPoi(0);
+							 
+							 
+							 if(poi) {
+								 
+								 stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});
+								 
+								 f();
+								 
+							 }
+							 
+						 });
+					 }else {
+						 
+						 f();
+						 
+					 }
+					 
+				})();
+				
+			},
+			
+			getDistanceAndTotime : function(stationList,cb) {
+				
+				stationList[0].distance = '';
+				
+				stationList[0].duration = '';
+				
+				// var sectionList = [];
+				
+				// 获取长度
+				var len = stationList.length;
+				
+				(function(){
+					
+					 if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						// cb && cb(stationList,sectionList);
+						 cb && cb(stationList);
+			              return;
+			          }
+					 
+					 var f = arguments.callee;
+					 
+					 var poiOne =  new BMap.Point(stationList[index].potion.lng,stationList[index].potion.lat);
+					 
+					 var poiTwo =  new BMap.Point(stationList[index+1].potion.lng,stationList[index+1].potion.lat);
+					 
+					 var transit = new BMap.TransitRoute(mapB, {renderOptions: {map: mapB},onSearchComplete: searchComplete});
+					 
+					 transit.search(poiOne,poiTwo);
+					 
+					 function searchComplete(results){
+						 
+						 var plan = results.getPlan(0);
+						 
+						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
+								
+								stationList[index+1].distance = '';
+								
+								stationList[index+1].duration = '';
+								
+								// sectionList.push({sectionName:stationList[index].name+stationList[index+1].name,points:''});
+								
+						 }else {
+								
+								stationList[index+1].distance = plan.getDistance(true);
+								
+								stationList[index+1].duration = plan.getDuration(true);
+								
+								// var line = plan.getRoute(0);
+								
+								// sectionList.push({sectionName:stationList[index].name+stationList[index+1].name,points:line.getPath()});
+								 
+						 }
+						 
+						f();
+					}
+					 
+				})();
+				
+			},
+			getSectionListPlonly : function(stationsPoint,cb) {
+				
+				var len = stationsPoint.length;
+				
+				var sectionList = [];
+				
+				(function(){
+					
+					 if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1 ) {
+						 
+						cb && cb(sectionList);
+			              return;
+			          }
+					 
+					 var f = arguments.callee;
+					 
+					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
+					 
+					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
+					 
+					 var transit = new BMap.TransitRoute(mapB, {renderOptions: {map: mapB},onPolylinesSet: searchPolylinesSet});
+					 
+					 function searchPolylinesSet(results){
+						 
+						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
+								
+								
+						 }else {
+							 
+							 var sectionArrayList = [];
+							 for (i = 0; i < results.length; i++){
+								 
+								// console.log(results[i].getPolyline().getPath());
+								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
+							
+							 }
+							 
+							 var sectionName = stationsPoint[index].name + '至' + stationsPoint[index+1].name;
+							 
+							 sectionList.push({sectionName:sectionName,points:sectionArrayList});
+								 
+						 }
+						 
+						f();
+					}
+					
+					 transit.search(poiOne,poiTwo);
+					 
+				})();
+				
+			}
 	}
 	return Bmap;
-function linePanlThree(lineId,diraction) {
-	GetAjaxData.getSectionRouteInfo(lineId,diraction,function(data) {
+function linePanlThree(data,direction) {
+	
+	GetAjaxData.getStationRoutePoint(id,direction,function(resultdata) {
-		if(data.length>0) {
-			
-			var sectionBsectionVectorStr = data[0].sectionBsectionVector;
-			
-			var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
-			
-			var lineArray = tempStr.split(',');
-			
-			var polylineArray = [];
+		var dataLen = data.length;
+		
+		if(dataLen>0) {
-			for(var i = 0;i<lineArray.length;i++) {
+			for(var d= 0; d<dataLen;d++){
+				
+				var sectionBsectionVectorStr = data[d].sectionBsectionVector;
-				polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+				if(sectionBsectionVectorStr==null) {
+					
+					continue;
+					
+				}
+				
+				var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
+				
+				var lineArray = tempStr.split(',');
+				
+				var polylineArray = [];
+				
+				for(var i = 0;i<lineArray.length;i++) {
+					
+					polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+					
+				}
+				WorldsBMap.drawingUpline(polylineArray,resultdata);
 			}
-			WorldsBMap.drawingUpline(polylineArray);
+			
 		}
 	});
@@ -79,29 +93,50 @@ function TreeUpOrDown(lineId,diraction) {
 }
+function setTiteText(lineId) {
+	
+	
+	// 根据线路ID获取线路名称
+	GetAjaxData.getIdLineName(lineId,function(data) {
+		
+		// 定义线路名称
+		var lineNameV = data.name;
+		
+		$('.portlet-title .caption').text(lineNameV);
+		
+		
+	});
+	
+}
+
 $(function(){
 	// 获取参数ID
 	id = $.url().param('no');
 	dir = '0';
-
+	
 	if(id) {
 		// 初始化地图和表格
 		setTimeout(function(){
+			setTiteText(id);
+			
 			// 地图初始化
 			var mapB = WorldsBMap.init(map);
 			// 全局变量
 			window.mapB = mapB;
-			
 			TreeUpOrDown(id,'0');
 			TreeUpOrDown(id,'1');
-			linePanlThree(id,'0');
+			GetAjaxData.getSectionRouteInfo(id,'0',function(data) {
+				
+				linePanlThree(data,'0');
+				
+			});
 		},500);
@@ -36,33 +36,60 @@ var StationTreeData = function(){
 						'plugins': ['types']
 					}).bind('click.jstree', function(event) {
-						//单击事件
-						
 						layer.closeAll();
 						var treeOjb = $.jstree.reference("#station_Up_tree").get_selected(true);
 						var len = treeOjb.length;
+						
 						if(len>0) {
-							var shapesTypeT = treeOjb[0].original.stationShapesType;
-							
 							var objStation = treeOjb[0].original;
-							// 如果是圆
-							if(shapesTypeT =='r') {
-								 
-								WorldsBMap.pointsCircle(objStation,map);
+							var chaildredType = objStation.chaildredType;
+							if(chaildredType =='station') {
-							}else if(shapesTypeT == 'd') {
+								mapB.setZoom(16);
+
+								var shapesTypeT = treeOjb[0].original.stationShapesType;
-								WorldsBMap.pointsPolygon(objStation,map);
+								var objStation = treeOjb[0].original;
-							}
+								// 如果是圆
+								if(shapesTypeT =='r') {
+									
+									
+									WorldsBMap.pointsCircle(objStation,map);
+									
+								}else if(shapesTypeT == 'd') {
+									
+									WorldsBMap.pointsPolygon(objStation,map);
+									
+								}
+							
+							}else if(chaildredType =='section'){
+								
+								var objSection = treeOjb[0].original.sectionBsectionVector;
+								
+								var polylineArray = [];
+								
+								polylineArray.push(treeOjb[0].original);
+								
+								var dire_ = treeOjb[0].original.sectionrouteDirections;
+								
+								mapB.clearOverlays();
+								
+								linePanlThree(polylineArray,dire_);
+								
+							}else if(chaildredType ==null){
+							return;
+							
+							}
 						}
+						
 					});
 				}
 			},
@@ -11,7 +11,7 @@
 		<!-- 左边标题栏 -->
 		<div class="portlet-title" style="background-color:#3B3F51">
 			<div class="caption">
-				途径站点 
+				<!-- 途径站点  -->
 			</div>
 			<div class="tools">
 				<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
@@ -41,6 +41,7 @@
 	            		<!-- 左边栏上行 -->
 	            		<div class="tab-pane  active in" id="stationUp" data-direction="0">
+	            		
                             <div class="portlet-body" id="uptreeMobal" style="display: none">
 	                            <div class="table-toolbar">
 	                                <div class="row">
@@ -48,9 +49,14 @@
 	                                        <div class="btn-group" style="float: right;">
 	                                        	<div class="actions  module_tools">
                                         			<div class="btn-group">
-			                                            <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
+			                                           <!--  <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
 			                                                <i class="fa fa-angle-down"></i>
-			                                            </a>
+			                                            </a> -->
+			                                            <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+						                           		 	<i class="fa fa-share"></i>
+						                            			<span>上行操作</span>
+						                            		<i class="fa fa-angle-down"></i>
+						                       		 	</a>
 			                                            <ul class="dropdown-menu pull-right" style="min-width:100px">
 			                                                <li>
 			                                                    <a href="javascript:;" id="addUpStation"><i class="fa fa-plus"></i>  添加站点</a>
@@ -61,11 +67,11 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
-			                                                    <a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i>  删除站点</a>
+			                                                    <a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i>  撤销站点</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
-			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-close"></i>  编辑走向</a>
+			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
 			                                                </li>
 			                                            </ul>
                                         			</div>
@@ -86,16 +92,18 @@
 	                             	<div class="col-md-6" style="float: right;">
 	                             		<div class="btn-group" style="float: right;">
 	                                       	<div class="actions">
-	                                       		 <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
-				                                     <i class="fa fa-angle-down"></i>
-				                                 </a>
+						                        <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+						                            <i class="fa fa-share"></i>
+						                            <span>上行规划选择</span>
+						                            <i class="fa fa-angle-down"></i>
+						                        </a>
 	                                             <ul class="dropdown-menu pull-right" style="min-width:100px">
 	                                                <li>
 	                                                	<a class="upSystem" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
 	                                                </li>
 	                                                <li class="divider"> </li>
 	                                                <li>
-	                                                    <a class="upManual" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-pencil"></i> 手动规划</a>
+	                                                    <a class="upManual" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-pencil"></i> 其它方式</a>
 	                                                </li>
 	                                             </ul>
 											 </div>
@@ -105,8 +113,9 @@
 	                            <div class="row" style="margin-top: 10px;">
 		                            <div class="col-md-12">
 	                             		 <!-- 提示 -->
-											<div class="alert alert-warning">
-	                                        <strong>系统未初始化该线路上行站点!</strong> 请从上方工具里选择任意一种方式规划该线路上行站点 </div>
+											<div class="alert alert-warning" style="background-color: #22313F;border-color: #FFFFFF;color: #2ab4c0;">
+	                                        	<strong>系统未初始化该线路上行站点!</strong> 请从上方【上行规划选择】里选择任意一种方式规划该线路上行站点. 
+	                                        </div>
 		                            </div>
 	                            </div>
                              </div>
@@ -122,9 +131,14 @@
 	                                        <div class="btn-group" style="float: right;">
 	                                        	<div class="actions  module_tools">
                                         			<div class="btn-group">
-			                                            <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
+			                                            <!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
 			                                                <i class="fa fa-angle-down"></i>
-			                                            </a>
+			                                            </a> -->
+			                                           <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+						                           		 	<i class="fa fa-share"></i>
+						                            			<span>下行操作</span>
+						                            		<i class="fa fa-angle-down"></i>
+						                       		 	</a>
 			                                            <ul class="dropdown-menu pull-right" style="min-width:100px">
 			                                                <li>
 			                                                    <a href="javascript:;" id="addDownStation"><i class="fa fa-plus"></i>  添加站点</a>
@@ -135,7 +149,7 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
-			                                                    <a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i>  删除站点</a>
+			                                                    <a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i>  撤销站点</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
@@ -160,16 +174,18 @@
                         		<div class="col-md-6" style="float: right;">
                         			<div class="btn-group" style="float: right;">
                                        	<div class="actions">
-                                       		 <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
-			                                     <i class="fa fa-angle-down"></i>
-			                                 </a>
+			                                 <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+						                            <i class="fa fa-share"></i>
+						                            <span>下行规划选择</span>
+						                            <i class="fa fa-angle-down"></i>
+						                     </a>
                                              <ul class="dropdown-menu pull-right" style="min-width:100px">
                                                 <li>
                                                 	<a class="downSystem" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
                                                 </li>
                                                 <li class="divider"> </li>
                                                 <li>
-                                                    <a class="downManual" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-pencil"></i> 手动规划</a>
+                                                    <a class="downManual" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-pencil"></i> 其它方式</a>
                                                 </li>
                                              </ul>
 										 </div>
@@ -179,9 +195,9 @@
                             <div class="row" style="margin-top: 10px;">
 	                            <div class="col-md-12">
                              		 <!-- 提示 -->
-										<div class="alert alert-warning">
-                                        	<strong>系统未初始化该线路下行站点!</strong> 请从上方工具里选择任意一种方式规划该线路下行站点 
-                                        </div>
+                                        <div class="alert alert-warning" style="background-color: #22313F;border-color: #FFFFFF;color: #2ab4c0;">
+	                                        <strong>系统未初始化该线路下行站点!</strong> 请从上方【下行规划选择】里选择任意一种方式规划该线路下行站点. 
+	                                    </div>
 	                            </div>
                             </div>
                       	</div>