基础信息功能修订

李强
1 parent 02e4c412
Showing 36 changed files with 652 additions and 1364 deletions
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/SectionRouteServiceImpl.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/lineinformation/add.html
src/main/resources/static/pages/base/lineinformation/details.html
src/main/resources/static/pages/base/lineinformation/edit.html
src/main/resources/static/pages/base/section/editsection.html
src/main/resources/static/pages/base/section/js/add-form-reload.js
src/main/resources/static/pages/base/section/js/add-form-wizard.js
src/main/resources/static/pages/base/section/js/section-ajax-getdata.js
src/main/resources/static/pages/base/section/js/section-list-table.js
src/main/resources/static/pages/base/station/add.html
src/main/resources/static/pages/base/station/edit.html
src/main/resources/static/pages/base/station/edit_select.html
@@ -78,7 +78,7 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	 * 
 	 * @return List<Map<String, Object>> 
 	 */
-	@RequestMapping(value = "/findUpStationRouteCode" , method = RequestMethod.GET)
+	@RequestMapping(value = "/findUpSectionRouteCode" , method = RequestMethod.GET)
 	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return routeService.findUpSectionRouteCode(map);
 	}
@@ -107,13 +107,9 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="stationUpdate" , method = RequestMethod.POST)
 	public Map<String, Object> stationUpdate(@RequestParam Map<String, Object> map) {
-		
 		map.put("updateBy", "");
-		
 		return service.stationUpdate(map);
-		
 	}
-	
 	/**
 	 * @Description :TODO(查询站点编码)
 	 * 
@@ -65,7 +65,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			" b.section_distance AS sectionDistance," +
             " b.section_time AS sectionTime," +
 			" b.db_type AS sectiondbType," +
-			" b.speed_limit AS sectionSpeedLimet ,a.destroy,a.versions,a.descriptions FROM (" +
+			" b.speed_limit AS sectionSpeedLimet ,a.destroy,a.versions,a.descriptions,a.isRoadeSpeed FROM (" +
 						"SELECT  r.id AS sectionrouteId," +
 								"r.line AS sectionrouteLine," +
 								"r.line_code AS sectionrouteLineCode," +
@@ -75,7 +75,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 								"r.directions AS sectionrouteDirections," +
 								"r.destroy AS destroy," +
 								"r.versions AS versions," +
-								"r.descriptions AS descriptions" +
+								"r.descriptions AS descriptions, r.is_roade_speed AS isRoadeSpeed" +
 								"  FROM bsth_c_sectionroute r where r.line = ?1 and r.directions = ?2 and r.destroy=0 ) a " +
 								"	LEFT JOIN bsth_c_section b  ON a.sectionrouteSection = b.id order by a.sectionrouteCode asc", nativeQuery=true)
 	List<Object[]> getSectionRoute(int lineId, int directions);
@@ -147,7 +147,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 * 
 	 * @return List<Map<String, Object>> 
 	 */
-	@Query(value = " select  MAX(r.sectionroute_code) as sectionrouteCode   from bsth_c_sectionroute r  WHERE r.line=?1 and r.directions =?2 and r.sectionroute_code< ?3", nativeQuery=true)
+	@Query(value = " select  MAX(r.sectionroute_code) as sectionrouteCode   from bsth_c_sectionroute r  WHERE r.line=?1 and r.directions =?2 and r.sectionroute_code< ?3 and r.destroy = 0", nativeQuery=true)
 	List<Object[]> findUpSectionRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
 	/**
@@ -37,9 +37,15 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 			, nativeQuery=true)
 	long stationMaxId();
-	@Query(value = "SELECT s.b_jwpoints,s.id FROM bsth_c_station s where s.station_name like  ?1"
+	/*@Query(value = "SELECT s.b_jwpoints,s.id FROM bsth_c_station s where s.station_name like  ?1"
 			, nativeQuery=true)
-	List<Object[]> findStationName(String stationName);
+	List<Object[]> findStationName(String stationName);*/
+	@Query(value = " SELECT t.b_jwpoints,t.id FROM (" +
+			" SELECT b.id,b.b_jwpoints,b.station_name,a.directions FROM (" +
+			" SELECT s.station,s.station_name,s.directions FROM bsth_c_stationroute s where s.destroy = 0 and s.directions = ?1) a " +
+			" LEFT JOIN bsth_c_station b on a.station = b. id) t where t.station_name LIKE ?2"
+			, nativeQuery=true)
+	List<Object[]> findStationName(Integer dir , String stationName);
 	/**
 	 * @Description :TODO(站点保存)
@@ -99,7 +99,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query(value = "select t.station_route_code,t.station_mark from bsth_c_stationroute t where " +
 			" t.station_route_code =(" +
 				"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)
+					"r.line=?1 and r.directions =?2 and station_route_code< ?3 and r.destroy = 0  ) and t.line=?1 and t.directions = ?2 AND t.destroy = 0", nativeQuery=true)
 	List<Object[]> findUpStationRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
@@ -206,7 +206,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" b.create_date AS stationCreateDate," +
 			" b.update_by AS stationUpdateBy," +
 			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId"+
+			" a.stationRouteId,b.station_name as zdmc "+
 			" FROM ( SELECT s.id AS stationRouteId," +
 			" s.line AS stationRouteLine," +
 			" s.station as stationRouteStation," +
@@ -276,4 +276,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
     @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
 	public void upddis(Integer id,Double dis);
+    
+    @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);
 }
@@ -99,6 +99,7 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 				tempM.put("destroy",listObjArray.get(i)[23]);
 				tempM.put("versions",listObjArray.get(i)[24]);
 				tempM.put("descriptions",listObjArray.get(i)[25]);
+				tempM.put("isRoadeSpeed",listObjArray.get(i)[26]);
 				resultList.add(tempM);
 			}
 		}
@@ -201,9 +201,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 站点说明
 				tempM.put("stationDescriptions", stationList.get(i)[31]);
-				tempM.put("name", stationList.get(i)[17]);
+				tempM.put("name", stationList.get(i)[3]);
-				tempM.put("text", stationList.get(i)[17]);
+				tempM.put("text", stationList.get(i)[3]);
 				tempM.put("icon", "fa fa-bus");
@@ -305,6 +305,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 说明
 				tempM.put("descriptions",sectionList.get(i)[25]);
+				// 说明
+				tempM.put("isRoadeSpeed",sectionList.get(i)[26]);
 				tempM.put("name", sectionList.get(i)[9]);
@@ -1030,6 +1032,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	    		tempM.put("stationUpdateDate", objects.get(i)[38]);
 	    		tempM.put("stationRouteId", objects.get(i)[39]);
+	    		tempM.put("zdmc", objects.get(i)[40]);
 	    		resultList.add(tempM);
 	    	}
@@ -9,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@@ -267,7 +268,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				// 百度坐标纬度
 				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
 				bLatx = bLatx==null || bLatx.equals("") ? "0" : bLatx;
-				List<Object[]> stationNameList = repository.findStationName(stationName);
+				List<Object[]> stationNameList = repository.findStationName(directions,stationName);
 				Map<String, Object> isHaveMap = isHaveStationname(bLonx,bLatx,stationNameList);
 				// 初始化站点对象
 				Station arg0 =  new Station();
@@ -699,76 +700,103 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 * 
 	 * @return Map<String, Object> <SUCCESS ; ERROR>
 	 */
+	@Transactional
 	@Override
 	public Map<String, Object> stationSaveMap(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
 			// 站点编码
-			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
+			String stationCod = "";
 			// 站点ID
-			int stationId = Integer.valueOf(stationCod);
+			Integer stationId = null;
 			// 站点名称
-			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
-			// 道路编码
-			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			// 原坐标类型
-			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
+			// 方向
+			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
 			// 原坐标点
 			String bJwpoints = map.get("bJwpoints").equals("") ? "" : map.get("bJwpoints").toString();
 			String bJwpointsArray[] = null;
 			if(bJwpoints!=null) {
 				bJwpointsArray = bJwpoints.split(" ");
 			}
-			// WGS经纬度
-			Float gLonx = null;
-			// WGS纬度
-			Float gLaty = null;
-			if(bJwpointsArray.length>0) {
-				Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-				gLonx = (float)resultPoint.getLng();
-				gLaty = (float)resultPoint.getLat();
-			}
-			// 方向
-			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
-			// 距离
-			Double distances =  map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
-			// 时间
-			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
-			// 城建坐标经度
-			Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
-			// 城建坐标纬度
-			Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
-			// 多边形原坐标点集合
-			String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
-			// 多边形WGS坐标点集合
-			String gPloygonGrid ="";
-			if(!bPloygonGrid.equals("")) {
-				String bPloygonGridArray[] = bPloygonGrid.split(",");
-				int bLen_ = bPloygonGridArray.length;
-				for(int b = 0 ;b<bLen_;b++) {
-					String tempArray[]= bPloygonGridArray[b].split(" ");
-					Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-					 if(b==0) {
-						 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-					 }else {
-						 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-					 }
-				}
-			}
+			List<Object[]> stationNameList = repository.findStationName(directions,zdmc);
+			Map<String, Object> isHaveMap = isHaveStationname(bJwpointsArray[0],bJwpointsArray[1],stationNameList);
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			// 圆半径
-			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-			// 图形类型
-			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
 			// 版本
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			// 创建人
-			Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
-			// 修改人
-			Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
+			if(Boolean.parseBoolean(isHaveMap.get("isHave").toString())) {
+				stationId = Integer.parseInt(isHaveMap.get("id").toString());
+			}else {
+				// 站点编码
+				stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
+				// 站点ID
+				stationId = Integer.valueOf(stationCod);
+				// 圆半径
+				Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
+				// 图形类型
+				String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+				// 创建人
+				Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
+				// 修改人
+				Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
+				// 城建坐标经度
+				Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
+				// 城建坐标纬度
+				Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
+				// 道路编码
+				String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
+				// 原坐标类型
+				String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+				// WGS经纬度
+				Float gLonx = null;
+				// WGS纬度
+				Float gLaty = null;
+				if(bJwpointsArray.length>0) {
+					Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
+					gLonx = (float)resultPoint.getLng();
+					gLaty = (float)resultPoint.getLat();
+				}
+				// 多边形原坐标点集合
+				String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
+				// 多边形WGS坐标点集合
+				String gPloygonGrid ="";
+				if(!bPloygonGrid.equals("")) {
+					String bPloygonGridArray[] = bPloygonGrid.split(",");
+					int bLen_ = bPloygonGridArray.length;
+					for(int b = 0 ;b<bLen_;b++) {
+						String tempArray[]= bPloygonGridArray[b].split(" ");
+						Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
+						 if(b==0) {
+							 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+						 }else {
+							 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+						 }
+					}
+				}
+				if(bPloygonGrid.equals(""))
+					bPloygonGrid = null;
+				else
+					bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+				if(gPloygonGrid.equals(""))
+					gPloygonGrid = null;
+				else
+					gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+				// 保存站点
+				repository.stationSave(stationCod, zdmc, roadCoding, dbType, bJwpoints, 
+										gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
+										shapesType, versions, descriptions, createBy, updateBy,stationId);
+			}
+			Station station = repository.findOne(stationId);
+			StationRoute arg0 = new StationRoute();
+			// 距离
+			Double distances =  map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
+			// 时间
+			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
+			// 站点路由名称
+			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
 			// 线路ID
 			int line = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
 			// 线路信息
@@ -784,20 +812,6 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}else {
 				stationRouteCode = 100;
 			}
-			if(bPloygonGrid.equals(""))
-				bPloygonGrid = null;
-			else
-				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-			if(gPloygonGrid.equals(""))
-				gPloygonGrid = null;
-			else
-				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-			// 保存站点
-			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
-									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-									shapesType, versions, descriptions, createBy, updateBy,stationId);
-			Station station = repository.findOne(stationId);
-			StationRoute arg0 = new StationRoute();
 			// 线路
 			arg0.setLine(resultLine);
 			arg0.setLineCode(resultLine.getLineCode());
@@ -806,7 +820,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 站点路由名称
 			arg0.setStationName(stationName);
 			// 站点路由编码
-			arg0.setStationCode(stationCod);
+			arg0.setStationCode(station.getStationCod());
 			// 站点路由序号
 			arg0.setStationRouteCode(stationRouteCode);
 			// 站点路由类型
@@ -823,6 +837,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			arg0.setDestroy(destroy);
 			// 站点路由说明
 			arg0.setDescriptions(descriptions);
+			routeRepository.stationUpdStationRouteCode(line, directions, stationRouteCode);
 			routeRepository.save(arg0);
 			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -849,112 +864,54 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> stationUpdate(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			// 站点Id
 			Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
-			
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
-			
+			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
 			// 站点名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
-			
 			// 所在道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
 			// 经纬坐标类型 
 			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 百度经纬度坐标
 			String bJwpoints = map.get("bJwpoints").equals("") ? "" : map.get("bJwpoints").toString();
-			
-			// WGS经纬度坐标
-			// String gJwpoints = map.get("gJwpoints").equals("") ? "" : map.get("gJwpoints").toString();
-			
 			String bJwpointsArray[] =null;
-			
 			if(bJwpoints!=null) {
-				
 				bJwpointsArray = bJwpoints.split(" ");
-				
 			}
-			
 			// WGS经纬度
 			Float gLonx = null;
-						
 			// WGS纬度
 			Float gLaty = null;
-			
 			if(bJwpointsArray.length>0) {
-				
 				Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-				
 				gLonx = (float)resultPoint.getLng();
-				
 				gLaty = (float)resultPoint.getLat();
-				
 			}
-			
-			/*// 站点地理位置WGS坐标经度
-			String gLonx = "";
-			
-			// 站点地理位置WGS坐标纬度
-			String gLaty = "";
-			
-			if(gJwpoints!=null) {
-				
-				String gJwpointsArray[] = gJwpoints.split(" ");
-				
-				gLonx = gJwpointsArray[0];
-				
-				gLaty = gJwpointsArray[1];
-				
-			}*/
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 圆形半径
 			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-			
-			// 多边形空间WGS坐标点集合
-			/*String gPolygonGrid = map.get("gPolygonGrid").equals("") ? "" : map.get("gPolygonGrid").toString();*/
-			
 			// 多边形空间原坐标坐标点集合
 			String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
-			
 			// 多边形WGS坐标点集合
 			String gPloygonGrid ="";
-			
 			if(!bPloygonGrid.equals("")) {
-				
 				String bPloygonGridArray[] = bPloygonGrid.split(",");
-				
 				int bLen_ = bPloygonGridArray.length;
-				
 				for(int b = 0 ;b<bLen_;b++) {
-					
 					String tempArray[]= bPloygonGridArray[b].split(" ");
-					
 					Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-					
 					 if(b==0) {
-						
 						 gPloygonGrid = resultPoint.getLng() + " " + resultPoint.getLat();
-							
 					 }else {
-						
 						 gPloygonGrid = gPloygonGrid +  ',' + resultPoint.getLng() + " " + resultPoint.getLat();
-						 
 					 }
-					
 				}
-				
 			}
-			
 			if(bPloygonGrid.equals(""))
 				bPloygonGrid = null;
 			else
@@ -964,116 +921,62 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				gPloygonGrid = null;
 			else
 				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-			
-			
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			
 			// 版本号
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
-			
 			// 描述与说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			
 			Float x = map.get("x").equals("") ? null  : Float.parseFloat(map.get("x").toString());
-			
 			Float y = map.get("y").equals("") ?  null  : Float.parseFloat(map.get("y").toString());
-			
 			// 更新
-			repository.stationUpdate(stationCod, stationName, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, destroy, radius, shapesType, versions, descriptions, stationId);
-			
-			
+			repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, destroy, radius, shapesType, versions, descriptions, stationId);
 			// 站点路由Id
 			Integer stationRouteId = map.get("stationRouteId").equals("") ? null : Integer.parseInt(map.get("stationRouteId").toString());
-			
 			StationRoute resultS = routeRepository.findOne(stationRouteId); 
-			
 			// 站点路由序号
 			String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? null : map.get("stationRouteCode").toString();
-						
 			Integer stationRouteCode = null;
-						
 			if(stationRouteCodeStr!=null) {
-							
 					String stationRouteCodeAraay[] = stationRouteCodeStr.split("_");
-					
 					int old_code = resultS.getStationRouteCode();
-					
 					int new_code = Integer.parseInt(stationRouteCodeAraay[0].toString())+100;
-					
 					if(new_code==old_code){
-						
 						stationRouteCode = new_code;
-						
 					}else {
-						
 						stationRouteCode = new_code-100+1;
-						
 					}
-					
 			}else {
-				
 				stationRouteCode = resultS.getStationRouteCode();
-				
 			}
-			
 			stationRouteCode = stationRouteCode == null ? 100 : stationRouteCode;
-			
 			Integer LineId = map.get("stationRouteLine").equals("") ? null : Integer.parseInt(map.get("stationRouteLine").toString());
-			
 			String stationMark = map.get("stationMark").equals("") ? null : map.get("stationMark").toString();
-			
 			Double distances = map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
-			
 			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
-			
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
-			
 			Station station = repository.findOne(stationId);
-			
 			Line line = lineRepository.findOne(LineId);
-			
-			
 			StationRoute stationRoute = new StationRoute();
-			
 			stationRoute.setStationName(stationName);
-			
 			stationRoute.setId(stationRouteId);
-			
 			stationRoute.setStationRouteCode(stationRouteCode);
-			
 			stationRoute.setStation(station);
-			
 			stationRoute.setStationCode(station.getStationCod());
-			
 			stationRoute.setLine(line);
-			
 			stationRoute.setLineCode(line.getLineCode());
-			
 			stationRoute.setStationMark(stationMark);
-			
 			stationRoute.setDistances(distances);
-			
 			stationRoute.setToTime(toTime);
-			
 			stationRoute.setDirections(directions);
-			
 			stationRoute.setVersions(versions);
-			
 			stationRoute.setDestroy(destroy);
-			
 			stationRoute.setDescriptions(descriptions);
-			
 			routeRepository.save(stationRoute);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-			
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
 		return resultMap;
 	}
@@ -23,6 +23,7 @@
 		icheckOptions = {checkboxClass: 'icheckbox_flat-blue',increaseArea: '20%'},
 		storage = window.localStorage;
 	if(storage.xlName_AgursData!=null && storage.xlName_AgursData !='') {
+		$('.tipso-animation').children().remove();
 		// 延迟加载
 		setTimeout(function(){
 			$('.tipso-animation').tipso({
@@ -85,7 +85,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="totalMileage" id="totalMileageInput" placeholder="标准总里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 标准总里程 END -->
@@ -97,7 +97,7 @@
 						</label>
                    	 	<div class="col-md-4">
                      		<input type="text" class="form-control" name="emptyMileage" id="emptyMileageInput" placeholder="空放里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 空放里程 END -->
@@ -113,7 +113,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="upMileage" id="upMileageInput" placeholder="上行里程">
-                    	<span class="help-block"> 单位:公里 </span>
+                    	<span class="help-block"> 单位:公里(km) </span>
                    		</div>
                 	</div>
                 	<!-- 上行里程 END -->
@@ -125,7 +125,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="downMileage" id="downMileageInput" placeholder="下行里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 下行里程 END -->
@@ -141,7 +141,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="upTravelTime" id="upTravelTimeInput" placeholder="上行行驶时间">
-                     		<span class="help-block"> 单位:分钟 </span>
+                     		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 上行行驶时间 END -->
@@ -153,7 +153,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="downTravelTime" id="downTravelTimeInput" placeholder="下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                    		</div>
 	                </div>
 	                <!-- 下行行驶时间 END -->
@@ -197,7 +197,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="earlyUpTime" id="earlyUpTimeInput" placeholder="早高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                   		</div>
 	                </div>
 	                <!-- 早高峰上行行驶时间 END -->
@@ -209,7 +209,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="earlyDownTime" id="earlyDownTimeInput" placeholder="早高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                    		</div>
 	                </div>
 	                <!-- 早高峰下行行驶时间 END -->
@@ -251,7 +251,7 @@
 						<label class="control-label col-md-5"> 晚高峰上行行驶时间&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="lateUpTime" id="lateUpTimeInput" placeholder="晚高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 晚高峰上行行驶时间 END -->
@@ -261,7 +261,7 @@
 						<label class="control-label col-md-5"> 晚高峰下行行驶时间&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="lateDownTime" id="lateDownTimeInput" placeholder="晚高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 晚高峰下行行驶时间 END -->
@@ -304,7 +304,7 @@
 						<label class="control-label col-md-5"> 小夜高峰上行行驶时间: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="nightStartTime" id="nightStartTimeInput" placeholder="小夜高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 小夜高峰上行行驶时间 END -->
@@ -314,7 +314,7 @@
 						<label class="control-label col-md-5"> 小夜高峰下行行驶时间: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="nightEndTime" id="nightEndTimeInput" placeholder="晚高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 小夜高峰下行行驶时间 END -->
@@ -328,7 +328,7 @@
 						<label class="control-label col-md-5"> 低谷上行行驶时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="troughUpTime" id="troughUpTimeInput" placeholder="低谷上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 低谷上行行驶时间 END -->
@@ -338,7 +338,7 @@
 						<label class="control-label col-md-5"> 低谷下行行驶时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="troughDownTime" id="troughDownTimeInput" placeholder="低谷下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 低谷下行行驶时间 END -->
@@ -85,7 +85,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="totalMileage" id="totalMileageInput" placeholder="标准总里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 标准总里程 END -->
@@ -97,7 +97,7 @@
 						</label>
                    	 	<div class="col-md-4">
                      		<input type="text" class="form-control" name="emptyMileage" id="emptyMileageInput" placeholder="空放里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 空放里程 END -->
@@ -113,7 +113,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="upMileage" id="upMileageInput" placeholder="上行里程">
-                    	<span class="help-block"> 单位:公里 </span>
+                    	<span class="help-block"> 单位:公里(km) </span>
                    		</div>
                 	</div>
                 	<!-- 上行里程 END -->
@@ -125,7 +125,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="downMileage" id="downMileageInput" placeholder="下行里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 下行里程 END -->
@@ -141,7 +141,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="upTravelTime" id="upTravelTimeInput" placeholder="上行行驶时间">
-                     		<span class="help-block"> 单位:分钟 </span>
+                     		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 上行行驶时间 END -->
@@ -153,7 +153,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="downTravelTime" id="downTravelTimeInput" placeholder="下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                    		</div>
 	                </div>
 	                <!-- 下行行驶时间 END -->
@@ -197,7 +197,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="earlyUpTime" id="earlyUpTimeInput" placeholder="早高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                   		</div>
 	                </div>
 	                <!-- 早高峰上行行驶时间 END -->
@@ -209,7 +209,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="earlyDownTime" id="earlyDownTimeInput" placeholder="早高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                    		</div>
 	                </div>
 	                <!-- 早高峰下行行驶时间 END -->
@@ -251,7 +251,7 @@
 						<label class="control-label col-md-5"> 晚高峰上行行驶时间&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="lateUpTime" id="lateUpTimeInput" placeholder="晚高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 晚高峰上行行驶时间 END -->
@@ -261,7 +261,7 @@
 						<label class="control-label col-md-5"> 晚高峰下行行驶时间&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="lateDownTime" id="lateDownTimeInput" placeholder="晚高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 晚高峰下行行驶时间 END -->
@@ -304,7 +304,7 @@
 						<label class="control-label col-md-5"> 小夜高峰上行行驶时间: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="nightStartTime" id="nightStartTimeInput" placeholder="小夜高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 小夜高峰上行行驶时间 END -->
@@ -314,7 +314,7 @@
 						<label class="control-label col-md-5"> 小夜高峰下行行驶时间: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="nightEndTime" id="nightEndTimeInput" placeholder="晚高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 小夜高峰下行行驶时间 END -->
@@ -328,7 +328,7 @@
 						<label class="control-label col-md-5"> 低谷上行行驶时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="troughUpTime" id="troughUpTimeInput" placeholder="低谷上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 低谷上行行驶时间 END -->
@@ -338,7 +338,7 @@
 						<label class="control-label col-md-5"> 低谷下行行驶时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="troughDownTime" id="troughDownTimeInput" placeholder="低谷下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(min) </span>
                     	</div>
 	                </div>
 	                <!-- 低谷下行行驶时间 END -->
@@ -86,7 +86,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="totalMileage" id="totalMileageInput" placeholder="标准总里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 标准总里程 END -->
@@ -98,7 +98,7 @@
 						</label>
                    	 	<div class="col-md-4">
                      		<input type="text" class="form-control" name="emptyMileage" id="emptyMileageInput" placeholder="空放里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 空放里程 END -->
@@ -114,7 +114,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="upMileage" id="upMileageInput" placeholder="上行里程">
-                    	<span class="help-block"> 单位:公里 </span>
+                    	<span class="help-block"> 单位:公里(km) </span>
                    		</div>
                 	</div>
                 	<!-- 上行里程 END -->
@@ -126,7 +126,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="downMileage" id="downMileageInput" placeholder="下行里程">
-                     		<span class="help-block"> 单位:公里 </span>
+                     		<span class="help-block"> 单位:公里(km) </span>
                     	</div>
 	                </div>
 	                <!-- 下行里程 END -->
@@ -142,7 +142,7 @@
 						</label>
                     	<div class="col-md-4">
                      		<input type="text" class="form-control" name="upTravelTime" id="upTravelTimeInput" placeholder="上行行驶时间">
-                     		<span class="help-block"> 单位:分钟 </span>
+                     		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 上行行驶时间 END -->
@@ -154,7 +154,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="downTravelTime" id="downTravelTimeInput" placeholder="下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                    		</div>
 	                </div>
 	                <!-- 下行行驶时间 END -->
@@ -198,7 +198,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="earlyUpTime" id="earlyUpTimeInput" placeholder="早高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                   		</div>
 	                </div>
 	                <!-- 早高峰上行行驶时间 END -->
@@ -210,7 +210,7 @@
 						</label>
                    		<div class="col-md-4">
                     		<input type="text" class="form-control" name="earlyDownTime" id="earlyDownTimeInput" placeholder="早高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                    		</div>
 	                </div>
 	                <!-- 早高峰下行行驶时间 END -->
@@ -252,7 +252,7 @@
 						<label class="control-label col-md-5"> 晚高峰上行行驶时间&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="lateUpTime" id="lateUpTimeInput" placeholder="晚高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 晚高峰上行行驶时间 END -->
@@ -262,7 +262,7 @@
 						<label class="control-label col-md-5"> 晚高峰下行行驶时间&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="lateDownTime" id="lateDownTimeInput" placeholder="晚高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 晚高峰下行行驶时间 END -->
@@ -305,7 +305,7 @@
 						<label class="control-label col-md-5"> 小夜高峰上行行驶时间: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="nightStartTime" id="nightStartTimeInput" placeholder="小夜高峰上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 小夜高峰上行行驶时间 END -->
@@ -315,7 +315,7 @@
 						<label class="control-label col-md-5"> 小夜高峰下行行驶时间: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="nightEndTime" id="nightEndTimeInput" placeholder="晚高峰下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 小夜高峰下行行驶时间 END -->
@@ -329,7 +329,7 @@
 						<label class="control-label col-md-5"> 低谷上行行驶时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="troughUpTime" id="troughUpTimeInput" placeholder="低谷上行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 低谷上行行驶时间 END -->
@@ -339,7 +339,7 @@
 						<label class="control-label col-md-5"> 低谷下行行驶时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                     	<div class="col-md-4">
                     		<input type="text" class="form-control" name="troughDownTime" id="troughDownTimeInput" placeholder="低谷下行行驶时间">
-                    		<span class="help-block"> 单位:分钟 </span>
+                    		<span class="help-block"> 单位:分钟(km) </span>
                     	</div>
 	                </div>
 	                <!-- 低谷下行行驶时间 END -->
@@ -174,7 +174,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 										+ ' --' + dirdmToName(dArray[i].sectionrouteDirections)  + '</option>' ;
 		}
 		$('#sectionrouteCodeSelect').html(options);
-		ajaxd.findUpStationRouteCode(lineId,dir,eq_stationRouteCode,function(str) {
+		ajaxd.findUpSectionRouteCode(lineId,dir,eq_stationRouteCode,function(str) {
 			if(str.length>0){
 				var upStationRouteCode = str[0].sectionrouteCode
 				$('#sectionrouteCodeSelect').val(upStationRouteCode);
@@ -49,14 +49,14 @@
 		      background      : '#0ed0e8',
 		      color           : '#ffffff',
 		      position		  :'right',
-		      width           : 550,
+		      width           : 410,
 		      delay           : 400,
 		      animationIn	  : 'bounceIn',
 		      animationOut	  : 'bounceOut',
-		      offsetX         : 8,
+		      offsetX         : 12,
 		      offsetY         : -70,
-		      content	      :'<span style="display:block; float:left;">a)系统生成：根据路段的起、终点站名称自动生成一条折线走向。</span></br></br>'+
-		      				   '<span style="display:block; float:left;">b)手动添加：手动在地图上画出路段，然后双击鼠标右键结束当前绘制。</span>',
+		      content	      :'<span style="display:block; float:left;font-size:x-small;line-height:10px">a)系统生成：根据路段的起、终点站名称自动生成一条折线走向。</span></br>'+
+		      				   '<span style="display:block; float:left;font-size:x-small;">b)手动添加：手动在地图上画出路段，然后双击鼠标右键结束当前绘制。</span>',
 		});
 		$('.tipso-animation').tipso('show');
@@ -86,7 +86,6 @@ var FormWizard = function() {
 						layer.msg('路段几何图形为空~请先在路段位置步骤中绘制出线路走向!');
 						return;
 					}
-					console.log(params);
 					// 保存路段.
 					PublicFunctions.sectionSave(params,function(data) {
 						if(data.status=='SUCCESS') {
@@ -23,12 +23,9 @@ var GetAjaxData = function(){
 				});
 			},
-			findUpStationRouteCode : function(lineId,diraction,sectionRouteCode,callback) {
-				
-				$get('/sectionroute/findUpStationRouteCode',{lineId:lineId,direction:diraction,sectionRouteCode:sectionRouteCode},function(result) {
-					
+			findUpSectionRouteCode : function(lineId,diraction,sectionRouteCode,callback) {
+				$get('/sectionroute/findUpSectionRouteCode',{lineId:lineId,direction:diraction,sectionRouteCode:sectionRouteCode},function(result) {
 					callback && callback(result);
-					
 				});
 			 },
@@ -47,6 +47,7 @@
 	// page : 当前页、initPag :
 	var page = 0,initPag,storage = window.localStorage;
 	if(storage.xlName_AgursData!=null && storage.xlName_AgursData !='') {
+		$('.tipso-animation').children().remove();
 		// 延迟加载
 		setTimeout(function(){
 			$('.tipso-animation').tipso({
@@ -72,7 +73,6 @@
 			return cb && cb(array);
 		});
 	}
-	
 	function initldNameSelect(){
 		var lineInfo = $('#lineSelect').val(),
 			dirInfo = $('#dirSelect').val(),
@@ -106,7 +106,6 @@
 			}
 		});
 	}
-	
 	function cxDmToName(value){
 		var rsStr = '';
 		if(value==0)
@@ -115,7 +114,6 @@
 			rsStr = '撤销';
 		return rsStr;
 	}
-	
 	function dirDmToName(value){
 		var srStr = '';
 		if(value==0)
@@ -124,7 +122,6 @@
 			srStr = '下行';
 		return srStr;
 	}
-	
 	// 初始化是否撤销值.
 	$('#destroy').val(0);
 	getCompInfo(function(compD) {
@@ -81,7 +81,7 @@
 							<div class="form-group" id="formRequ">
 								<label class="col-md-3 control-label"><span class="required"> * </span>站点名称:</label>
 								<div class="col-md-9">
-									<input type="text" class="form-control input-medium" id="statinoNamebooxtInput" name="statinoNamebooxt">
+									<input type="text" class="form-control input-medium" id="zdmcInput" name="zdmc">
 								</div>
 							</div>
 							<!-- 新增方式 -->
@@ -327,7 +327,7 @@
                            <h4 class="form-section"> 站点信息 </h4>
                             <div class="form-group">
-                               <label class="control-label col-md-3">线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <label class="control-label col-md-3">线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
                                <div class="col-md-4">
                                    <p class="form-control-static" data-display="line"> </p>
                                </div>
@@ -336,7 +336,7 @@
                            <div class="form-group">
                                <label class="control-label col-md-3">站点名称 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
                                <div class="col-md-4">
-                                   <p class="form-control-static" data-display="statinoNamebooxt"> </p>
+                                   <p class="form-control-static" data-display="zdmc"> </p>
                                </div>
                            </div>
@@ -38,6 +38,17 @@
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
+          						<span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="zdmc" id="zdmcInput" placeholder="站点名称" readonly="readonly"> 
+							</div>
+						</div>
+					</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">
@@ -267,6 +278,8 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 				params.shapesType = 'r';
 			else if(params.shapesType=='多边形')
 				params.shapesType = 'd';
+			if(params.stationRouteCode=='请选择...')
+				params.stationRouteCode='';
 			fun.stationUpdate(params,function(resuntDate) {
 		  		if(resuntDate.status=='SUCCESS') {
 		  			// 弹出添加成功提示消息
@@ -53,6 +53,7 @@
 <script type="text/javascript">
 $('#editPositions_select_mobal').on('editSelectMobal_show', function(e, map,drm,fun,statn){
 	var EditStation = statn.getAddStation();
+	console.log(EditStation);
 	// 显示选择修改方式弹出层
 	$('#editPositions_select_mobal').modal({show : true,backdrop: 'static',keyboard: false});
 	$('.tipso-animation').tipso({
@@ -60,14 +61,14 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,drm,
 	      background      : '#0ed0e8',
 	      color           : '#ffffff',
 	      position		  :'right',
-	      width           : 380,
+	      width           : 390,
 	      delay           : 400,
 	      animationIn	  : 'bounceIn',
 	      animationOut	  : 'bounceOut',
 	      offsetX         : -485,
 	      offsetY         : -25,
-	      content	      :'<span style="display:block; float:left;font-size:x-small">a)重新绘制位置:手动在地图上画出站点范围,然后双击鼠标右键保存.</span></br>'+
-	      				   '<span style="display:block; float:left;font-size:x-small">b)编辑原始位置:编辑原始位置与站点信息.</span>',
+	      content	      :'<span style="display:block; float:left;font-size:x-small;line-height:12px">A)重新绘制位置：手动在地图上画出站点范围,然后双击鼠标右键保存.</span></br>'+
+	      				   '<span style="display:block; float:left;font-size:x-small">B)编辑原始位置：编辑原始位置与站点信息.</span>',
 	});
 	setTimeout(function(){
@@ -75,7 +76,7 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,drm,
 		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
 	},500);
 	// 获取站点名称元素并赋值
-	$('#stationNamebootboxInput').val(EditStation.stationName);
+	$('#stationNamebootboxInput').val(EditStation.zdmc);
 	// 定义站点图形类型
 	var stationShapesTypeV = EditStation.stationShapesType;
 	// 获取表单元素
@@ -46,14 +46,14 @@
 		      background      : '#0ed0e8',
 		      color           : '#ffffff',
 		      position		  :'right',
-		      width           : 550,
+		      width           : 410,
 		      delay           : 400,
 		      animationIn	  : 'bounceIn',
 		      animationOut	  : 'bounceOut',
-		      offsetX         : 8,
+		      offsetX         : 12,
 		      offsetY         : -70,
-		      content	      :'<span style="display:block; float:left;">a)系统生成：根据站点名称自动生成以100米为半径范围的圆。</span></br></br>'+
-		      				   '<span style="display:block; float:left;">b)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存。</span>',
+		      content	      :'<span style="display:block; float:left;font-size:x-small;line-height:10px">A)系统生成：根据站点名称自动生成以100米为半径范围的圆.</span></br>'+
+		      				   '<span style="display:block; float:left;font-size:x-small;">B)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span>',
 		});
 		$('.tipso-animation').tipso('show');
@@ -27,7 +27,7 @@ var FormWizard = function() {
 				focusInvalid : true, 
 				// 需要验证的表单元素
 				rules : {
-					'statinoNamebooxt' : {required : true, maxlength: 50,},// 站点名称 必填项
+					'zdmc' : {required : true, maxlength: 50,},// 站点名称 必填项
 					'line' : 			 {required : true,},// 线路名称 必填项
 					'stationName' : 	 {required : true,maxlength: 100,},// 站点名称 必填项
 					'stationCod' : 	 	 {required : true,},// 站点编码 必填项
@@ -126,32 +126,6 @@ var FormWizard = function() {
 				}
 				return tel; 
 			}, '当站点类型为中途站或者终点站时,上一站点为必填项!');
-			// 是否为圆
-			/*$.validator.addMethod("isCricle", function(value,element) {
-				var tel = false;
-				var shapeType = $('#shapesTypeSelect').val(),
-					radius =  $('#radiusInput').val()
-				if(shapeType =='r'){
-					if(radius != '' && radius !=null)
-						tel = true;
-				}else if(shapeType =='d'){
-					if(radius == '' || radius ==null)
-						tel = true;
-				}
-				return tel; 
-			}, function() {
-				var rsStr = '';
-				var shapeType = $('#shapesTypeSelect').val(),
-					radius =  $('#radiusInput').val()
-					if(shapeType =='r'){
-						if(radius == '' || radius ==null)
-							rsStr = '当几何图形为圆时,圆形半径为必填项!';
-					}else if(shapeType =='d'){
-						if(radius !=''  &&  radius !=null)
-							rsStr = '当几何图形为多边形时,圆形半径无须填写!';
-					}
-				return rsStr;
-			});*/
 			// 确认提交信息
 			var displayConfirm = function() {
 				// 遍历表单元素下的tab4的class名称为form-control-static
@@ -201,7 +175,6 @@ var FormWizard = function() {
                 	// 显示返回按钮
                     $('#submit_station_form').find('.button-previous').show();
                 }
-                
                 if (current == 2) {
                 	var container = $("#stationbmap_basic");
                 	container.children().remove();
@@ -209,7 +182,7 @@ var FormWizard = function() {
                 	setTimeout(function(){
                 		StationPVmapWorlds.init();
                 		var baseResValue = $('#submit_station_form input[name="baseRes"]:checked').val();
-                    	var stationNameV = $('#statinoNamebooxtInput').val();
+                    	var stationNameV = $('#zdmcInput').val();
                     	$('#stationNameInput').val(stationNameV);
                     	if(baseResValue == 0) {
                     		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV+'公交车站',function(p) {
@@ -16,7 +16,8 @@ var PositionsStationObj = function () {
 			},
 			/**  设置新增站点集合对象站点名称属性值 @param：<name：站点名称） */
 			setEitdStationName : function(name) {
-				station.stationName = name;
+				// station.stationName = name;
+				station.zdmc= name;
 			},
 			/**  设置新增站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
 			setEitdStationBJwpoints : function(bJwpoints) {
@@ -47,6 +47,7 @@
 	/** page : 当前页  initPag : */
 	var page = 0,initPag,storage = window.localStorage;
 	if(storage.xlName_AgursData!=null && storage.xlName_AgursData !='') {
+		$('.tipso-animation').children().remove();
 		// 延迟加载
 		setTimeout(function(){
 			$('.tipso-animation').tipso({
@@ -121,6 +121,8 @@ var PositionsPublicFunctions = function () {
 				// WGS坐标点图形集合
 				$('#bPolygonGridInput').val(stationObj.stationBPolyonGrid);
 				// 获取站点名称元素设值
+				$('#zdmcInput').val(stationObj.zdmc);
+				// 获取站点名称元素设值
 				$('#stationNameInput').val(stationObj.stationName);
 				// 获取站点编码元素设值
 				$('#stationCodInput').val(stationObj.stationCode);
@@ -33,14 +33,16 @@
 							<tr role="row" class="heading">
 								<th width="3%">序号</th>
 								<th width="5%">线路编号</th>
-								<th width="11%">线路名称</th>
+								<th width="8%">线路名称</th>
 								<th width="5%">线路方向</th>
-								<th width="14%">站点路由名称</th>
-								<th width="5%">站点编码</th>
+								<th width="8%">站点路由名称</th>
+								<th width="4%">站点编码</th>
 								<th width="4%">站点序号</th>
-								<th width="6%">站点类型</th>
+								<th width="4%">站点类型</th>
+								<th width="6%">站点距离(km)</th>
+								<th width="6%">站点时长(min)</th>
 								<th width="4%">版本号</th>
-								<th width="6%">是否撤销</th>
+								<th width="4%">是否撤销</th>
 								<th width="8%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
@@ -77,6 +79,12 @@
                                      </select>
 								</td>
 								<td>
+									<input type="text" class="form-control form-filter input-sm"  name="distances_eq">
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm"  name="toTime_eq">
+								</td>
+								<td>
 									 <input type="text" class="form-control form-filter input-sm" name="versions_eq">
 								</td>
 								<td>
@@ -145,6 +153,12 @@
 				{{/if}}
 			</td>
 			<td>
+				{{obj.distances}}
+			</td>
+			<td>
+				{{obj.toTime}} 
+			</td>
+			<td>
 				{{obj.versions}}
 			</td>
 			<td>
@@ -161,7 +175,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan=11><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 <!-- 新增站点 -->
 <div class="modal fade" id="add_station_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="add_station_form" action="/module" method="post">
-				
 					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
 						您的输入有误，请检查下面的输入项
 					</div>
-					
 					<!-- 线路ID -->
 					<input type="hidden" name="lineId" id="lineIdInput"  value="" />
-					
 					<input type="hidden" name="bPolygonGrid" id="bPolygonGridInput"  value="" />
-					
 					<input type="hidden" name="gPolygonGrid" id="gPolygonGridInput"  value="" />
-					
 					<input type="hidden" name="gJwpoints" id="gJwpointsInput">
-					
 					<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
-					
 					<input type="hidden" name="x" id="xInput" value=""/>
-					
 					<input type="hidden" name="y" id="yInput" value=""/>
-					
 					<!-- 站点名称 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span> 站点名称：
+          						<span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称"> 
+								<input type="text" class="form-control" name="zdmc" id="zdmcInput" placeholder="站点名称" readonly="readonly"> 
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点编码 -->
+					<!-- 站点路由名称 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点编码：
+          						<span class="required"> * </span> 站点路由名称:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationCod" id="stationCodInput">
+								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点路由名称"> 
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点序号 -->
+					<!-- 站点编码 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点序号：
+          						<span class="required"> * </span>站点编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<select name="stationRouteCode" class="form-control" id="stationrouteSelect"></select>
-								<span class="help-block"> *说明：选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
+								<input type="text" class="form-control" name="stationCod" id="stationCodInput" readonly="readonly">
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点类型 -->
+					<!-- 站点方向 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点类型：
+          						<span class="required"> * </span>站点方向&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<select name="stationMark" class="form-control" id="stationMarkSelect">
+								<select name="directions" class="form-control" id="stationdirSelect">
 									<option value="">-- 请选择站点类型 --</option>
-									<option value="B">起点站</option>
-									<option value="Z">中途站</option>
-									<option value="E">终点站</option>
-									<option value="T">停车场</option>
+									<option value="0">上行</option>
+									<option value="1">下行</option>
 								</select>
 							</div>
 						</div>
 					</div>
-					<!-- 站点方向 -->
+					<!-- 站点序号 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点方向：
+          						<span class="required"> * </span>站点序号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<select name="directions" class="form-control" id="stationdirSelect">
-									<option value="">-- 请选择站点类型 --</option>
-									<option value="0">上行</option>
-									<option value="1">下行</option>
-								</select>
+								<select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
+								<span class="help-block">说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
 							</div>
 						</div>
 					</div>
-					<!-- 道路编码-->
+					<!-- 站点类型 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="control-label col-md-3">道路编码：</label>
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span>站点类型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput">
+								<select name="stationMark" class="form-control" id="stationMarkSelect">
+									<option value="">-- 请选择站点类型 --</option>
+									<option value="B">起点站</option>
+									<option value="Z">中途站</option>
+									<option value="E">终点站</option>
+									<option value="T">停车场</option>
+								</select>
 							</div>
 						</div>
 					</div>
-					
 					<!-- 中心位置坐标点 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">经纬度坐标点：</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>经纬度坐标点:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="bJwpoints" id="bJwpointsInput">
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点WGS经纬度 -->
-				<!-- 	<div class="form-body">
+					<!-- 几何图形类型 -->
+					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">站点WGS经纬度：</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>几何图形类型:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="gJwpoints" id="gJwpointsInput">
+								<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" placeholder="几何图形类型" readonly="readonly">
 							</div>
 						</div>
-					</div> -->
-					
-					<!-- 范围图形类型 -->
+					</div>
+					<!-- 圆形半径 -->
+					<div class="form-body" id="radiusGroup">
+						<div class="form-group">
+							<label class="col-md-3 control-label"><span class="required"> * </span>圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="圆形半径">
+							</div>
+						</div>
+					</div>
+					<!-- 是否撤销 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">范围图形类型：</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<select name="shapesType" class="form-control" id="shapesTypeSelect">
-									<option value="">-- 请选择站点类型 --</option>
-									<option value="r">圆形</option>
-									<option value="d">多变形</option>
+								<select name="destroy" class="form-control" id="destroySelect">
+									<option value="">-- 请选择撤销类型 --</option>
+									<option value="0">否</option>
+									<option value="1">是</option>
 								</select>
 							</div>
 						</div>
 					</div>
-					<!-- 范围图形类型 -->
+					<!-- 道路编码-->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">圆形半径：</label>
+							<label class="control-label col-md-3">道路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name=radius id="radiusInput">
-								<!-- <select name="radius" class="form-control" id="radiusSelect">
-									<option value="">-- 请选择圆形半径 --</option>
-									<option value="50">50</option>
-									<option value="100">100</option>
-									<option value="150">150</option>
-									<option value="200">200</option>
-									<option value="250">250</option>
-									<option value="300">300</option>
-									<option value="350">350</option>
-									<option value="400">400</option>
-									<option value="450">450</option>
-								</select> -->
+								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput">
 							</div>
 						</div>
 					</div>
-					
 					<!-- 到站时间 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">到站时间：</label>
+							<label class="col-md-3 control-label">到站时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="toTime" id="toTimeInput" >
-								<span class="help-block">单位：分钟</span>
+								<span class="help-block">单位:分钟(min)</span>
 							</div>
 						</div>
 					</div>
-					
 					<!-- 到站距离 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">到站距离：</label>
+							<label class="col-md-3 control-label">到站距离&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="distances" id="distancesInput" >
-								<span class="help-block">单位：公里</span>
+								<span class="help-block">单位:公里(km)</span>
 							</div>
 						</div>
 					</div>
-					
 					<!-- 版本号 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">版本号：</label>
+							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="versions" value='1' Readonly>
 							</div>
 						</div>
 					</div>
-					<!-- 范围图形类型 -->
-					<div class="form-body">
-						<div class="form-group">
-							<label class="col-md-3 control-label">是否撤销：</label>
-							<div class="col-md-6">
-								<select name="destroy" class="form-control" id="destroySelect">
-									<option value="">-- 请选择撤销类型 --</option>
-									<option value="0">否</option>
-									<option value="1">是</option>
-								</select>
-							</div>
-						</div>
-					</div>
-					
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明： </label>
+	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;: </label>
                  		<div class="col-md-6">
                      		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
                     	</div>
@@ -233,285 +195,193 @@
 	</div>
 </div>
 <script type="text/javascript">
-
 $('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,staobj,lineObj,fun){
-	
 	var Station =  staobj.getAddStation();
-	
 	var Line = lineObj.getLineObj();
-	
 	// 延迟加载
 	setTimeout(function(){
-		
 		// 显示mobal
 		$('#add_station_mobal').modal({show : true,backdrop: 'static', keyboard: false});
-		
 	},200);
-	
 	// 当调用 hide 实例方法时触发
 	$('#add_station_mobal').on('hide.bs.modal', function () {
-		
 		closeMobleSetClean();
-		
 	});
-	
 	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
 	$('#add_station_mobal').on('show.bs.modal', function () {
-		
-		// 线路ID
-		$('#lineIdInput').val(Line.id);
-		
-		// 获取站点名称元素设值
-		$('#stationNameInput').val(Station.stationNamebootbox).attr('Readonly','Readonly');
-		
-		// 获取方向元素，并添加值
-		$('#stationdirSelect').val(Station.dir).attr('Readonly','Readonly');
-		
-		// 百度地图经纬度坐标中心点
-		$('#bJwpointsInput').val(Station.bJwpoints).attr('Readonly','Readonly');
-		
-		// 百度坐标点图形集合
-		$('#bPolygonGridInput').val(Station.bPolygonGrid);
-		
-		// 获取图形类型元素，并添加值
-		$('#shapesTypeSelect').val(Station.shapesType).attr('Readonly','Readonly');
-		
-		// 获取圆形半径元素，并添加值
-		$('#radiusInput').val(Station.radius).attr('Readonly','Readonly');
-		
-		// 是否撤销
-		$('#destroySelect').val(0).attr('Readonly','Readonly'); 
-		
-		// 获取站点序号元素，并添加下拉属性值
-		ajaxd.getStation(Line.id,Station.dir,function(treeData) {
-			
-			var options = '<option value="">请选择...</option>';
-			
-			var dArray = treeData[0].children[0].children;	
-			
-			for(var i = 0 ; i<dArray.length; i++){
-				 
-				options += '<option value="'+dArray[i].stationRouteStationRouteCode+ '_'+ dArray[i].stationRouteStationMark+'">'+dArray[i].stationRouteStationName+'</option>'
-				
-			}
-		 
-			$('#stationrouteSelect').html(options);
-			
-		});
-		
 		// 获取站点编码元素，添加站点编码值
 		ajaxd.getStationCode(function(stationCode) {
-			
+			// 线路ID.
+			$('#lineIdInput').val(Line.id);
+			// 获取站点名称元素设值.
+			$('#zdmcInput').val(Station.stationNamebootbox);
+			// 获取站点路由名称元素设值.
+			$('#stationNameInput').val(Station.stationNamebootbox);
+			// 站点编码.
 			$('#stationCodInput').val(stationCode).attr('Readonly','Readonly');
-			
+			// 获取方向元素，并添加值.
+			$('#stationdirSelect').val(Station.dir).attr('Readonly','Readonly');
+			// 百度地图经纬度坐标中心点.
+			$('#bJwpointsInput').val(Station.bJwpoints).attr('Readonly','Readonly');
+			// 百度坐标点图形集合.
+			$('#bPolygonGridInput').val(Station.bPolygonGrid);
+			// 获取图形类型元素，并添加值
+			if(Station.shapesType=='r')
+				$('#shapesTypeSelect').val('圆形');
+			else if(Station.shapesType=='d') {
+				$('#radiusGroup').hide();
+				$('#shapesTypeSelect').val('多边形');
+			}
+			// 获取圆形半径元素，并添加值
+			$('#radiusInput').val(Station.radius);
+			// 是否撤销
+			$('#destroySelect').val(0); 
+			var initzdlyP = {'line.id_eq':Line.id,'destroy_eq':0,'directions_eq':Station.dir};
+			initSelect(initzdlyP);
 		});
-		
 	});
-	
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
-		
 		var stationRValue = $('#stationrouteSelect').val();
-		
 		if(stationRValue) {
-			
 			var tempStr = stationRValue.split('_');
-			
 			if(tempStr[1] == 'E') {
-				
 				$('#stationMarkSelect').val('E');
-				
 			}else {
-				
 				$('#stationMarkSelect').val('Z');
-				
 			}
-			
 		}
-		
 	});
-	
 	// 获取表单元素
 	var form = $('#add_station_form');
-	
 	// 获取错误提示信息元素
 	var error = $('.alert-danger', form);
-	
 	//提交
 	$('#addStationButton').on('click', function() {
-		
 		// 表单提交
 		form.submit();
-		
 	});
-	
 	// 表单验证
 	form.validate({
-		
 		errorElement : 'span', 
-		
 		errorClass : 'help-block help-block-error', 
-		
 		focusInvalid : true, 
-		
 		rules : {
-			
-			// 站点名称
-			'stationName' : {
-				
-				// 必填项
-				required : true
-				
-			},
-			
-			// 站点类型
-			'stationMark' : {
-				
-				// 必填项
-				required : true
-				
-			},
-			
-			// 站点序号
-			'stationRouteCode' : {
-				
-				// 必填项
-				required : true,
-				
-			},
-			
-			// 站点编码
-			'stationCod': {
-				
-				// 必填项
-				required : true,
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 站点方向
-			'directions' : {
-				
-				// 必填项
-				required : true,
-				
-			},
-			
-			// 到站距离
-			'distances' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 到站时间
-			'toTime' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 描述与说明
-			'descriptions' : {
-				
-				// 最大长度
-				maxlength: 150
-				
-			}
+			'stationName' : {required : true,maxlength : 50,},// 站点名称 必填项
+			'stationCod': {required : true,},// 站点编码 必填项 必须输入合法的数字（负数，小数）。
+			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
+			'stationRouteCode' : {isStart : true},// 站点序号
+			'stationMark' : {required : true,},// 站点类型 必填项.
+			'bJwpoints' : {required : true,},// 经纬度坐标点 必填项.
+			'shapesType' : {required : true,},// 几何图形类型 必填项.
+			'radius' : {required : true,},// 几何图形类型 必填项.
+			'destroy' : {required : true,},// 是否撤销 必填项.
+			'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
+			'distances' : {number : true},// 到站距离 必须输入合法的数字（负数，小数）。 
+			'descriptions' : {maxlength: 150}// 描述与说明 // 描述与说明
 		},
 		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();
-			
 			error.hide();
-			
+			if(params.shapesType=='圆形')
+				params.shapesType='r';
+			else if(params.shapesType=='多边形')
+				params.shapesType='d';
+			if(params.stationRouteCode=='请选择...')
+				params.stationRouteCode='';
 			// 保存
 			ajaxd.stationSave(params,function(data) {
-				
 				if(data.status=='SUCCESS') {
-					
 					// 弹出添加成功提示消息
 					layer.msg('添加成功...');
-					
 				}else {
-					
 					// 弹出添加失败提示消息
 					layer.msg('添加失败...');
-					
 				}
-	
 				var id =Line.id;
-				
 				var dir = params.directions
-				
 				// 刷行左边树
 				fun.resjtreeDate(id,dir);
-				
 				closeMobleSetClean();
-				
 				// 隐藏moble
 				hideMoble();
-				
-		
 			});
 		}
 	});
-	
+	function initSelect(p){
+		ajaxd.getzdlyInfo(p,function(array) {
+			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
+			var len_ = array.length,paramsD = new Array();
+			if(len_>0) {
+				paramsD.push({'id':'请选择...','text':'请选择...'});
+				// 遍历.
+				$.each(array, function(i, g){
+					// 判断.
+					if(g.name!='' || g.name != null) {
+						// 添加拼音检索下拉框格式数据数组.
+						paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+					}
+				});
+				$('#stationrouteSelect').empty();
+				// 初始化上一个路段拼音检索下拉框.
+				initPinYinSelect2($('#stationrouteSelect'),paramsD,function(selector) {
+				});
+			}
+		});
+	}
 	function closeMobleSetClean() {
-		
 		// 清除地图覆盖物
 		addMap.clearMarkAndOverlays();
-		
 		/** 设置新增站点集合对象为空 */
 		staobj.setAddStation({});
-		
 		var add_direction_v = $('#stationdirSelect').val();
-		
 		ajaxd.getSectionRouteInfo(Line.id,add_direction_v,function(data) {
-			
 			fun.linePanlThree(Line.id,data,add_direction_v);
-			
 		});
-		
 	}
-	
 	function hideMoble() {
-		
 		// 隐藏mobal
 		$('#add_station_mobal').modal('hide');
-		
 	}
-	
+	// 当站点类型为中途站或者终点站时,上一站点为必填项！
+	$.validator.addMethod("isStart", function(value,element) {
+		var tel = false;
+		var stationMarkV = $('#stationMarkSelect').val();
+		var stationrouteSelectV = $('#stationrouteSelect').val();
+		if(stationMarkV =='B'){
+			tel = true;
+			return  tel;
+		}else if(stationMarkV =='Z' || stationMarkV =='E'){
+			if(stationrouteSelectV!='' && stationrouteSelectV!='请选择...'  && stationrouteSelectV!=null){
+				tel = true;
+				return  tel;
+			}
+		}
+		return tel; 
+	}, '当站点类型为中途站或者终点站时,上一站点为必填项！');
+	// 方向
+	$.validator.addMethod("dirIs", function(value,element) {
+		var tel = true;
+		var stationMarkV = $('#stationdirSelect').val();
+		if(stationMarkV!=Station.dir){
+			tel = false;
+		}
+		return tel; 
+	}, '方向必须一致!');
 });
 </script>
 \ No newline at end of file
 <!-- 选择站点新增方式 -->
 <div class="modal fade" id="add_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>
+				<h4 class="modal-title">站点新增方式
+					<i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
+				</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="form-group" id="formRequ">
 						<label class="col-md-3 control-label"><span class="required"> * </span>站点名称：</label>
@@ -26,33 +21,20 @@
 							<input type="text" class="form-control input-medium" id="stationNamebootboxInput" name="stationNamebootbox">
 						</div>
 					</div>
-					
 					<!-- 新增方式 -->
 					<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" class="icheck" name="baseRes" value=0 checked> 系统生成
+									<input type="radio" class="icheck" name="baseRes" value=0 checked> 系统生成
 								</label>
 								<label >
 									<input type="radio" class="icheck" name="baseRes" value=1 > 手动添加
 								</label>
-								<!-- <label>
-									<input type="radio" class="icheck" name="baseRes" value=2> 系统引用
-								</label> -->
 							</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" style="color:#1bbc9b;"> *　新增方式说明： </span></h5>
-		                            <p><span class="help-block" style="color:#1bbc9b;"> a)系统生成：根据站点名称自动生成以150米为半径范围的圆.</span> </p>
-		                            <p><span class="help-block" style="color:#1bbc9b;"> b)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span> </p>
-		                            <!-- <p><span class="help-block" style="color:#1bbc9b;"> c)选择引用：从系统中选择已有的站点进行引用.</span> </p> -->
-		                        </div>
-							</div> 
 			    </form>
 			</div>
 			<div class="modal-footer">
@@ -63,191 +45,124 @@
 	</div>
 </div>
 <script type="text/javascript">
-
 $('#add_select_mobal').on('AddSelectMobal.show', function(e,map_,drw,ajaxd_,stationObj,lineObj,fun){
-	
 	// 加载显示mobal
 	$('#add_select_mobal').modal({show : true,backdrop: 'static', keyboard: false});
-	
+	$('.tipso-animation').tipso({
+	      speed           : 100,
+	      background      : '#0ed0e8',
+	      color           : '#ffffff',
+	      position		  :'right',
+	      width           : 380,
+	      delay           : 400,
+	      animationIn	  : 'bounceIn',
+	      animationOut	  : 'bounceOut',
+	      offsetX         : -485,
+	      offsetY         : -25,
+	      content	      :'<span style="display:block; float:left;font-size:x-small;line-height:10px">A)系统生成：根据站点名称自动生成以150米为半径范围的圆.</span></br>'+
+	      				   '<span style="display:block; float:left;font-size:x-small">B)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span>',
+	    
+	});
+	setTimeout(function(){
+		$('.tipso-animation').tipso('show');
+		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
+	},500);
 	// 站点名称改变事件
 	$('#stationNamebootboxInput').on('change',function() {
-		
 		//  获取站点名称
 		var stationNamebootbox = $('#stationNamebootboxInput').val();
-		
 		/** 根据站点名称获取坐标在地图上标注 @param ：<stationNamebootbox：站点名称> */
 		map_.localtionPoint(stationNamebootbox);
-		
 	});
-	
 	// 获取表单元素
 	var form = $('#formBootbox');
-	
 	// 错误提示元素
 	var requiredname = $('#requiredname', form);
-	
 	// 下一步点击事件
 	$('#addSelectnextButton').on('click', function() {
-		
 		// 表单提交
 		form.submit();
-		
 	});
-	
 	// 表单验证
 	form.validate({
-		
 		errorElement : 'span', 
-		
 		errorClass : 'help-block help-block-error', 
-		
 		focusInvalid : false, 
-		
 		rules : {
-			
-			'stationNamebootbox' : {
-				
-				minlength : 2,
-				
-				required : true,
-				
-				maxlength : 10
-				
-			}
-	
+			'stationNamebootbox' : {required : true,maxlength : 50}// 必填项  最大长度为50
 		},
-		
 		invalidHandler : function(event, validator) {  
-			
 			requiredname.show();
-			
 			App.scrollTo(requiredname, -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) {
-			
 			// 隐藏错误提示
 			requiredname.hide();
-			
 			// 表单序列化
 			var params = form.serializeJSON();
-			
 			var stationName = params.stationNamebootbox
-			
 			// 获取新增站点方式
 			var baseRes = params.baseRes;
-			
+			/** 设置新增站点对象站点名称属性值 @param：<stationName：站点名称）> */
+			stationObj.setAddStationName(stationName);
+			// 系统生成
+			if(baseRes == 0) {
+				/** 根据站点位置获取坐标 @parma：<stationName：站点名称；callback：返回函数> */
+				map_.localSearchFromAdreesToPoint(stationName,function(Points) {
+					if(Points) {
+						/**  设置新增站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+						stationObj.setAddStationBJwpoints(Points);
+						/**  设置新增站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+						stationObj.setAddStationShapesType('r');
+						/**  设置新增站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+						stationObj.setAddStationRadius(100);
+						/**  设置新增站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+						stationObj.setBPolygonGrid('');
+						// 以藏站点新增方式mobal
+						$('#add_select_mobal').modal('hide');
+						//　加载add页面
+						$.get('add.html', function(m){
+							$(pjaxContainer).append(m);
+							var Station = stationObj.getAddStation();
+							$('#add_station_mobal').trigger('AddStationMobal.show', [map_,ajaxd_,stationObj,lineObj,fun]);
+						});
+					}else {
+						// 返回坐标为空
+						layer.confirm('【系统无法生成，请选择其他方式新增】', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
+							layer.close(index);
+						});
+					}
+				});
+			}else if(baseRes==1) {
+				map_.clearMarkAndOverlays();
+				// 以藏站点新增方式mobal
+				$('#add_select_mobal').modal('hide');
+				// 打开绘制工具
+				drw.openDrawingManager();
+				map_.localtionPoint(stationName); 
+			}
 			// 查询是否存在输入的站点名称
-			ajaxd_.getLikeStationName(stationName,function(data) {
-				
+			/* ajaxd_.getLikeStationName(stationName,function(data) {
 				// 验证系统是存在该站点名称
 				var tempblm = fun.isHaveStationName(data);
-				
 				if(tempblm) {
-					/** 设置新增站点对象站点名称属性值 @param：<stationName：站点名称）> */
-					stationObj.setAddStationName(stationName);
-					
-					// 系统生成
-					if(baseRes == 0) {
-						
-						/** 根据站点位置获取坐标 @parma：<stationName：站点名称；callback：返回函数> */
-						map_.localSearchFromAdreesToPoint(stationName,function(Points) {
-							
-							if(Points) {
-								
-								/**  设置新增站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-								stationObj.setAddStationBJwpoints(Points);
-								
-								/**  设置新增站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
-								stationObj.setAddStationShapesType('r');
-								
-								/**  设置新增站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
-								stationObj.setAddStationRadius(100);
-								
-								/**  设置新增站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
-								stationObj.setBPolygonGrid('');
-								
-								// 以藏站点新增方式mobal
-								$('#add_select_mobal').modal('hide');
-								
-								//　加载add页面
-								$.get('add.html', function(m){
-									
-									$(pjaxContainer).append(m);
-									
-									var Station = stationObj.getAddStation();
-									
-									$('#add_station_mobal').trigger('AddStationMobal.show', [map_,ajaxd_,stationObj,lineObj,fun]);
-								
-								});
-								
-							}else {
-								
-								// 返回坐标为空
-								layer.confirm('【系统无法生成，请选择其他方式新增】', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
-									
-									layer.close(index);
-									
-								});
-								
-							}
-							
-						});
-					
-					}else if(baseRes==1) {
-						
-						map_.clearMarkAndOverlays();
-						
-						// 以藏站点新增方式mobal
-						$('#add_select_mobal').modal('hide');
-						
-						// 打开绘制工具
-						drw.openDrawingManager();
-						
-						map_.localtionPoint(stationName); 
-						
-					}else if(baseRes==2) {
-						
-						// 系统引用 
-						
-						$('#add_select_mobal').modal('hide');
-						
-						$.get('station_tabledate.html', function(m){$(pjaxContainer).append(m);});
-						
-					}
-					
 				}else {
-					
 					// 返回坐标为空
 					layer.confirm('系统已存在【'+ stationName+'】站名!<br/>请选择：<br/>&nbsp;系统引用或者修改站点名进行新增.', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
-						
 						layer.close(index);
-						
 					});
-					
 				}
-				 
-			});
+			}); */
 		}
 	});
 });
 <!-- 编辑站点 -->
 <div class="modal fade" id="edit_station_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="edit_station_form" action="/module" method="post">
-				
 					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
 						您的输入有误，请检查下面的输入项
 					</div>
-					
 					<!-- 线路ID -->
-					
 					<input type="hidden" name="stationId" id="stationIdInput">
-					
 					<input type="hidden" name="stationRouteId" id="stationRouteIdInput">
-					
 					<input type="hidden" name="stationRouteLine" id="stationRouteLineInput">
-					
 					<input type="hidden" name="lineCode" id="lineCodeInput">
-					
 					<input type="hidden" name="bPolygonGrid" id="bPolygonGridInput" />
-					
 					<input type="hidden" name="gPolygonGrid" id="gPolygonGridInput" />
-					
 					<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
-					
 					<input type="hidden" name="x" id="xInput" value=""/>
-					
 					<input type="hidden" name="y" id="yInput" value=""/>
-					
 					<!-- 站点名称 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span> 站点名称：
+          						<span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称"> 
+								<input type="text" class="form-control" name="zdmc" id="zdmcInput" placeholder="站点名称" readonly="readonly"> 
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点编码 -->
+					<!-- 站点路由名称 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点编码：
+          						<span class="required"> * </span> 站点路由名称:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationCod" id="stationCodInput" placeholder="站点编码">
+								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点路由名称"> 
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点序号 -->
+					<!-- 站点编码 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>上一站点：
+          						<span class="required"> * </span> 站点编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<select name="stationRouteCode" class="form-control" id="stationrouteSelect"></select>
-								<span class="help-block"> *说明：选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
+								<input type="text" class="form-control" name="stationCod" id="stationCodInput" placeholder="站点编码">
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点类型 -->
+					<!-- 站点方向 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点类型：
+          						<span class="required"> * </span>站点方向&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<select name="stationMark" class="form-control" id="stationMarkSelect">
+								<select name="directions" class="form-control" id="stationdirSelect">
 									<option value="">-- 请选择站点类型 --</option>
-									<option value="B">起点站</option>
-									<option value="Z">中途站</option>
-									<option value="E">终点站</option>
-									<!-- <option value="T">停车场</option> -->
+									<option value="0">上行</option>
+									<option value="1">下行</option>
 								</select>
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点方向 -->
+					<!-- 站点序号 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>站点方向：
+          						 上一站点&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<select name="directions" class="form-control" id="stationdirSelect">
+								<select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
+								<span class="help-block"> *说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
+							</div>
+						</div>
+					</div>
+					<!-- 站点类型 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span>站点类型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<select name="stationMark" class="form-control" id="stationMarkSelect">
 									<option value="">-- 请选择站点类型 --</option>
-									<option value="0">上行</option>
-									<option value="1">下行</option>
+									<option value="B">起点站</option>
+									<option value="Z">中途站</option>
+									<option value="E">终点站</option>
 								</select>
 							</div>
 						</div>
 					</div>
-					
-					<!-- 道路编码-->
+					<!-- 经纬度坐标点 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="control-label col-md-3">道路编码：</label>
+							<label class="col-md-3 control-label"> <span class="required"> * </span>经纬度坐标点:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput" placeholder="道路编码">
+								<input type="text" class="form-control" name="bJwpoints" id="bJwpointsInput" placeholder="经纬度坐标点">
 							</div>
 						</div>
 					</div>
-					
-					<!-- 中心位置坐标点 -->
+					<!-- 几何图形类型 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">经纬度坐标点：</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>几何图形类型:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="bJwpoints" id="bJwpointsInput" placeholder="经纬度坐标点">
+								<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" placeholder="几何图形类型" readonly="readonly">
 							</div>
 						</div>
 					</div>
-					
-					<!-- 站点WGS经纬度 -->
-					<!-- <div class="form-body">
+					<!-- 圆形半径 -->
+					<div class="form-body" id="radiusGroup">
 						<div class="form-group">
-							<label class="col-md-3 control-label">站点WGS经纬度：</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="gJwpoints" id="gJwpointsInput" placeholder="站点WGS经纬度">
+								<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="圆形半径">
 							</div>
 						</div>
-					</div> -->
-					
-					<!-- 范围图形类型 -->
+					</div>
+					<!-- 是否撤销 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">范围图形类型：</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<select name="shapesType" class="form-control" id="shapesTypeSelect">
-									<option value="">-- 请选择站点类型 --</option>
-									<option value="r">圆形</option>
-									<option value="d">多变形</option>
+								<select name="destroy" class="form-control" id="destroySelect">
+									<option value="">-- 请选择撤销类型 --</option>
+									<option value="0">否</option>
+									<option value="1">是</option>
 								</select>
 							</div>
 						</div>
 					</div>
-					
-					<!-- 范围图形类型 -->
+					<!-- 道路编码-->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">圆形半径：</label>
+							<label class="control-label col-md-3">道路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="圆形半径">
+								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput" placeholder="道路编码">
 							</div>
 						</div>
 					</div>
-					
 					<!-- 到站时间 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">到站时间：</label>
+							<label class="col-md-3 control-label">到站时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="toTime" id="toTimeInput" placeholder="到站时间">
-								<span class="help-block">单位：分钟</span>
+								<span class="help-block">单位:分钟</span>
 							</div>
 						</div>
 					</div>
-					
 					<!-- 到站距离 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">到站距离：</label>
+							<label class="col-md-3 control-label">到站距离&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="distances" id="distancesInput" placeholder="到站距离">
-								<span class="help-block">单位：公里</span>
+								<span class="help-block">单位:公里</span>
 							</div>
 						</div>
 					</div>
-					
 					<!-- 版本号 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">版本号：</label>
+							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="versions" value='1' Readonly>
 							</div>
 						</div>
 					</div>
-					
-					<!-- 范围图形类型 -->
-					<div class="form-body">
-						<div class="form-group">
-							<label class="col-md-3 control-label">是否撤销：</label>
-							<div class="col-md-6">
-								<select name="destroy" class="form-control" id="destroySelect">
-									<option value="">-- 请选择撤销类型 --</option>
-									<option value="0">否</option>
-									<option value="1">是</option>
-								</select>
-							</div>
-						</div>
-					</div>
-					
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明： </label>
+	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;: </label>
                  		<div class="col-md-6">
                      		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
                     	</div>
@@ -228,316 +194,171 @@
 <script type="text/javascript">
 $('#edit_station_mobal').on('editSelectMobal_show', function(e, map_,ajaxd,station_,Line_,fun){
-	
  	var editStationParmasObj = station_.getEitdStation();
-	
 	var addLine = Line_.getLineObj();
-	
 	fun.setFormValue(editStationParmasObj);
-	
-	var edit_direction_v = editStationParmasObj.stationRouteDirections;
-	
-	// 获取站点序号元素，并添加下拉属性值
-	ajaxd.getStation(addLine.id,edit_direction_v,function(treeData) {
-		
-		var options = '<option value="">请选择...</option>';
-		
-		var dArray = treeData[0].children[0].children;	
-		
-		var eq_stationRouteCode = editStationParmasObj.stationRouteStationRouteCode + '_' +editStationParmasObj.stationRouteStationMark;
-		
-		for(var i = 0 ; i<dArray.length; i++){
-			
-			var ptions_v = dArray[i].stationRouteStationRouteCode+ '_'+ dArray[i].stationRouteStationMark;
-			
-			// 排除本站
-			if(eq_stationRouteCode == ptions_v){
-				
-				continue;
-				
-			}
-			
-			options += '<option value="'+ ptions_v +'">'+dArray[i].stationRouteStationName+'</option>'
-			
-		}
-	 
-		$('#stationrouteSelect').html(options);
-		
-		ajaxd.findUpStationRouteCode(addLine.id,edit_direction_v,editStationParmasObj.stationRouteStationRouteCode,function(str) {
-			
-			if(str.length>0){
-				
-				var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke;
-				
-				$('#stationrouteSelect').val(upStationRouteCode);
-				
-			}
-			
-		});
-		
-	});
-	
+	var initzdlyP = {'lineCode_eq':editStationParmasObj.stationRouteLineCode,'destroy_eq':0,'directions_eq':editStationParmasObj.stationRouteDirections};
+	initSelect(initzdlyP);
 	// 显示mobal
 	$('#edit_station_mobal').modal({show : true,backdrop: 'static',keyboard: false});
-	
 	// 当调用 hide 实例方法时触发
 	$('#edit_station_mobal').on('hide.bs.modal', function () {
-		
 		closeMobleSetClean();
-		
 	});
-	
 	function closeMobleSetClean() {
-		
 		// 清除地图覆盖物
 		map_.clearMarkAndOverlays();
-		
 		/** 设置新增站点集合对象为空 */
 		station_.setEitdStation({});
-		
 		var add_direction_v = $('#stationdirSelect').val();
-		
 		fun.resjtreeDate(addLine.id,add_direction_v);
-		
 		fun.editAChangeCssRemoveDisabled();
-		
 		ajaxd.getSectionRouteInfo(addLine.id,add_direction_v,function(data) {
-			
 			fun.linePanlThree(addLine.id,data,add_direction_v);
-			
 		});
-		
 	}
-	
 	// 编辑表单元素
 	var form = $('#edit_station_form');
-	
 	// 获取错误提示元素
 	var error = $('.alert-danger', form);
-	
 	// 提交数据按钮事件
 	$('#editStationButton').on('click', function() {
-		
 		// 表单提交
 		form.submit();
-		
 	});
-	
 	// 表单验证
 	form.validate({
-		
 		errorElement : 'span', 
-		
 		errorClass : 'help-block help-block-error', 
-		
 		focusInvalid : false, 
-		
 		rules : {
-			
-			// 站点名称
-			'stationName' : {
-				
-				// 必填项
-				required : true
-				
-			},
-			
-			// 站点类型
-			'stationMark' : {
-				
-				// 必填项
-				required : true
-				
-			},
-			
-			// 站点序号
-			'stationRouteCode' : {
-				
-				isStart : true
-				
-			},
-			
-			// 站点编码
-			'stationCod': {
-				
-				// 必填项
-				required : true,
-				
-				// 必须输入合法的数字（负数，小数）。
-				/* number : true */
-				
-			},
-			
-			// 站点方向
-			'directions' : {
-				
-				// 必填项
-				required : true,
-				
-				// 方向选择限制
-				dirIs : true
-				
-			},
-			
-			// 到站距离
-			'distances' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 到站时间
-			'toTime' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 描述与说明
-			'descriptions' : {
-				
-				// 最大长度
-				maxlength: 150
-				
-			}
+			'zdmc' : { required : true,maxlength : 50,},// 站点名称 必填项
+			'stationName' : { required : true,maxlength : 50,},// 站点名称 必填项
+			'stationCod': {required : true,},// 站点编码 必填项
+			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
+			'stationRouteCode' : {isStart : true},// 站点序号
+			'stationMark' : {required : true},// 站点类型 必填项
+			'bJwpoints' : {required : true},// 经纬度坐标点 必填项
+			'shapesType' : {required : true},// 几何图形类型 必填项
+			'radius' : {required : true,number : true},// 圆形半径  必填项
+			'destroy' : {required : true},// 是否撤销 必填项
+			'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
+			'distances' : {number : true},// 到站距离 必须输入合法的数字（负数，小数）。
+			'descriptions' : {	maxlength: 150}// 描述与说明 最大长度
 		},
-		
 		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();
-			
 			error.hide();
-			
+			if(params.shapesType=='圆形')
+				params.shapesType='r';
+			else if(params.shapesType=='多边形')
+				params.shapesType='d';
+			if(params.stationRouteCode=='请选择...')
+				params.stationRouteCode='';
 			ajaxd.stationUpdate(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('修改失败...');
-					
 				}
-				
 				$('#edit_station_mobal').modal('hide');
-				
 				var id = addLine.id;
-				
 				var dir = params.directions
-				
 				// 刷行左边树
 				fun.resjtreeDate(id,dir);
-				
 				closeMobleSetClean();
-				
 			});
-			
 		}
 	});
-	
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
-		
 		var stationRValue = $('#stationrouteSelect').val();
-		
 		if(stationRValue) {
-			
 			var tempStr = stationRValue.split('_');
-			
 			if(tempStr[1] == 'E') {
-				
 				$('#stationMarkSelect').val('E');
-				
 			}else {
-				
 				$('#stationMarkSelect').val('Z');
-				
 			}
-			
 		}
-		
 	});
-	
+	function initSelect(p){
+		ajaxd.getzdlyInfo(p,function(array) {
+			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
+			var len_ = array.length,paramsD = new Array();
+			if(len_>0) {
+				paramsD.push({'id':'请选择...','text':'请选择...'});
+				// 遍历.
+				$.each(array, function(i, g){
+					// 判断.
+					if(g.name!='' || g.name != null) {
+						if(g.stationRouteCode != editStationParmasObj.stationRouteStationRouteCode) {
+							// 添加拼音检索下拉框格式数据数组.
+							paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+										  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+						}
+					}
+				});
+				$('#stationrouteSelect').empty();
+				// 初始化上一个路段拼音检索下拉框.
+				initPinYinSelect2($('#stationrouteSelect'),paramsD,function(selector) {
+					setZdlyValue();
+				});
+			}
+		});
+	}
+	function setZdlyValue() {
+		ajaxd.findUpStationRouteCode(editStationParmasObj.stationRouteLine,editStationParmasObj.stationRouteDirections,editStationParmasObj.stationRouteStationRouteCode,function(str) {
+			if(str.length>0){
+				var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStationParmasObj.stationRouteDirections;
+				$('#stationrouteSelect').select2('val',upStationRouteCode);
+			}else {
+				$('#stationrouteSelect').select2('val','请选择...');
+				$('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark);
+			}
+		});
+	}
 	// 当站点类型为中途站或者终点站时,上一站点为必填项！
 	$.validator.addMethod("isStart", function(value,element) {
-		
 		var tel = false;
-		
 		var stationMarkV = $('#stationMarkSelect').val();
-		
 		var stationrouteSelectV = $('#stationrouteSelect').val();
-		
 		if(stationMarkV =='B'){
-			
 			tel = true;
-			
 			return  tel;
-			
 		}else if(stationMarkV =='Z' || stationMarkV =='E'){
-			
-			
 			if(stationrouteSelectV!=''){
-				
 				tel = true;
-				
 				return  tel;
-				
 			}
-			
 		}
-		
 		return tel; 
 	}, '当站点类型为中途站或者终点站时,上一站点为必填项！');
-	
 	// 方向
 	$.validator.addMethod("dirIs", function(value,element) {
-		
 		var tel = true;
-		
 		var stationMarkV = $('#stationdirSelect').val();
-		
 		if(stationMarkV!=editStationParmasObj.stationRouteDirections){
-			
 			tel = false;
-			
 		}
-		
 		return tel; 
 	}, '方向必须一致!');
-	
 });
 </script>
 \ No newline at end of file
 <!-- 选择编辑站点方式 -->
 <div class="modal fade" id="edit_select_mobal" tabindex="-1" role="basic" aria-hidden="true">
-	
 	<div class="modal-dialog">
-		
-		<div class="modal-content">
-		
+		<div class="modal-content" style="width: 700px;">
 			<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">选择修改站点方式
+					<i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
+				</h4>
 			</div>
-			
 			<div class="modal-body">
-			
 				<form class="form-horizontal" action="/" method="post" id="edit_select" role="form">
-					
 					<div class="alert alert-danger display-hide" id="editSelectrequired">
 						<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>
-					
 					<div class="form-group" id="formRequ">
 						<label class="col-md-3 control-label"><span class="required"> * </span>站点名称：</label>
 						<div class="col-md-9" id="errorInfo">
 							<input type="text" class="form-control input-medium" id="stationNamebootbox" name="stationNamebootbox">
 						</div>
 					</div>
-					
 					<div class="form-group">
-						<label class="col-md-3 control-label">修改方式：</label>
+						<label class="col-md-3 control-label"><span class="required"> * </span>修改方式：</label>
 						<div class="col-md-9">
 							<div class="icheck-list">
 								<label>
@@ -41,22 +34,9 @@
 								<label>
 										<input type="radio" class="icheck" name="editselect" value=1 checked> 编辑原始位置
 								</label>
-								<!-- <label >
-									<input type="radio" class="icheck" name="editselect" value=2 > 选择引用
-								</label> -->
 							</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" style="color:#1bbc9b;"> *　修改方式说明： </span></h5>
-                            <p><span class="help-block" style="color:#1bbc9b;"> a)重新绘制位置：手动在地图上画出站点范围，然后双击鼠标右键保存.</span> </p>
-                            <p><span class="help-block" style="color:#1bbc9b;"> b)编辑原始位置：编辑原始位置与站点信息.</span> </p>
-                            <!-- <p><span class="help-block" style="color:#1bbc9b;"> c)选择引用：从系统中选择已有的站点进行引用.</span> </p> -->
-                        </div>
-					 </div>
 			    </form>
 			</div>
 			<div class="modal-footer">
@@ -67,136 +47,88 @@
 	</div>
 </div>
 <script type="text/javascript">
-
 $('#edit_select_mobal').on('editSelectMobal_show', function(e, map_,drw,ajaxd,editStationObj,lineObj,fun,dir_){
-	
 	var sel = fun.getCurrSelNode(dir_);
-	
 	var Station = sel[0].original;
-	
-	// 获取修改站点对象
-	/* var Station = editStationObj.getEitdStation(); */
-	
 	// 显示选择修改方式弹出层
 	$('#edit_select_mobal').modal({show : true,backdrop: 'static',keyboard: false});
-	
+	$('.tipso-animation').tipso({
+	      speed           : 100,
+	      background      : '#0ed0e8',
+	      color           : '#ffffff',
+	      position		  :'right',
+	      width           : 390,
+	      delay           : 400,
+	      animationIn	  : 'bounceIn',
+	      animationOut	  : 'bounceOut',
+	      offsetX         : -485,
+	      offsetY         : -25,
+	      content	      :'<span style="display:block; float:left;font-size:x-small;line-height:10px">A)重新绘制位置：手动在地图上画出站点范围,然后双击鼠标右键保存.</span></br>'+
+	      				   '<span style="display:block; float:left;font-size:x-small">B)编辑原始位置：编辑原始位置与站点信息.</span>',
+	    
+	});
+	setTimeout(function(){
+		$('.tipso-animation').tipso('show');
+		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
+	},500);
 	// 获取站点名称元素并赋值
 	$('#stationNamebootbox').val(Station.stationStationName);
-	
 	// 定义站点图形
 	var stationShapesTypeV = Station.stationShapesType;
-	
 	// 获取表单元素
 	var form = $('#edit_select');
-	
 	// 获取错误提示元素
 	var editSelectrequired = $('#editSelectrequired', form);
-	
 	// 下一步操作事件
 	$('#editselectStationNextButton').on('click', function() {
-		
 		// 表单提交
 		form.submit();
-		
 	});
-	
 	//form  表单验证
 	form.validate({
-		
 		errorElement : 'span', 
-		
 		errorClass : 'help-block help-block-error', 
-		
 		focusInvalid : false, 
-		
 		rules : {
-			
-			'stationNamebootbox' : {
-				
-				minlength : 2,
-				
-				required : true,
-				
-				maxlength : 10
-				
-			}
-	
+			'stationNamebootbox' : {required : true,maxlength : 50,}
 		},
-		
 		invalidHandler : function(event, validator) {  
-			
 			editSelectrequired.show();
-			
 			App.scrollTo(requiredname, -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) {
-			
 			editStationObj.setEitdStation(Station);
-			
 			// 隐藏弹出层
 			$('#edit_select_mobal').modal('hide');
-			
 			$('#downLine').addClass('btn disabled');
-			
 			$('.btn-circle').addClass('disabled');
-			
 			$('#upLine').addClass('btn disabled');
-			
 			// 表单序列
 			var params = form.serializeJSON();
-			
 			// 站点名称
 			var editStationName = params.stationNamebootbox;
-		 	
 			editStationObj.setEitdStationName(editStationName);
-			
 			if(params.editselect==0){
-				
 				map_.clearMarkAndOverlays();
-				
 				// 打开绘制工具
 				drw.openDrawingManager();
-				
 				map_.localtionPoint(editStationName); 
-				
 			}else if(params.editselect==1){
-				
 				// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 				var mindex = layer.msg('编辑完图形后,请双击图形区域保存',{ offset: '126px',
 					  shift: 0,time: 10000});
-				
 				// 编辑图形
 				map_.editShapes(editStationName,stationShapesTypeV,mindex);
-				
-			}else if(params.editselect==2){
-				
-				// 系统引用 
-				$('#edit_select_mobal').modal('hide');
-				
-				$.get('station_tabledate.html', function(m){$(pjaxContainer).append(m);});
-				
 			}
-			
 		}
 	});
 })
@@ -4,7 +4,7 @@
 		<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>
+				<h4 class="modal-title">路段修改</h4>
 			</div>
 			<div class="modal-body">
 				<form class="form-horizontal" role="form" id="edit_section__form" action="/module" method="post">
@@ -19,11 +19,12 @@
 					<input type="hidden" name="bsectionVector" id="bsectionVectorInput" />
 					<input type="hidden" name="csectionVector" id="csectionVectorInput" value=""/>
 					<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
+					<input type="hidden" name="isRoadeSpeed" id="isRoadeSpeedInput"/>
 					<!-- 路段名称 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span> 路段名称：
+          						<span class="required"> * </span> 路段名称:
                     		</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="sectionName" id="sectionNameInput" placeholder="路段名称"> 
@@ -34,10 +35,10 @@
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span> 路段编码：
+          						<span class="required"> * </span> 路段编码:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="sectionCode" id="sectionCodeInput" placeholder="路段编码">
+								<input type="text" class="form-control" name="sectionCode" id="sectionCodeInput" placeholder="路段编码"  readonly="readonly">
 							</div>
 						</div>
 					</div>
@@ -45,11 +46,11 @@
 					<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">
 								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect"></select>
-								<span class="help-block"> *说明：选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
+								<span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
 							</div>
 						</div>
 					</div>
@@ -57,7 +58,7 @@
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span>路段方向：
+          						<span class="required"> * </span>路段方向:
                     		</label>
 							<div class="col-md-6">
 								<select name="directions" class="form-control" id="directionsSection">
@@ -68,71 +69,71 @@
 							</div>
 						</div>
 					</div>
-					<!-- 道路编码-->
+					<!-- 路段限速 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="control-label col-md-3">道路编码：</label>
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span> 路段限速:
+                    		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput" placeholder="道路编码">
+								<input type="text" class="form-control" name="speedLimit" id="speedLimitInput" placeholder="路段限速">
 							</div>
 						</div>
 					</div>
-					<!-- 路段限速 -->
+					<!-- 是否撤销 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="control-label col-md-3">
-          						<span class="required"> * </span> 路段限速：
-                    		</label>
+							<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="speedLimit" id="speedLimitInput" placeholder="路段限速">
+								<select name="destroy" class="form-control" id="destroySelect">
+									<option value="">-- 请选择撤销类型 --</option>
+									<option value="0">否</option>
+									<option value="1">是</option>
+								</select>
 							</div>
 						</div>
 					</div>
-					<!-- 路段时长 -->
+					<!-- 道路编码-->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">路段时长：</label>
+							<label class="control-label col-md-3">道路编码:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="sectionTime" id="sectionTimeInput" placeholder="路段时长">
-								<span class="help-block">单位：分钟</span>
+								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput" placeholder="道路编码">
 							</div>
 						</div>
 					</div>
 					<!-- 路段长度 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">路段长度：</label>
+							<label class="col-md-3 control-label">路段长度:</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="sectionDistance" id="sectionDistanceInput" placeholder="路段长度">
-								<span class="help-block">单位：公里</span>
+								<span class="help-block">单位:公里(km)</span>
 							</div>
 						</div>
 					</div>
-					<!-- 版本号 -->
+					<!-- 路段历时 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">版本号：</label>
+							<label class="col-md-3 control-label">路段历时:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
+								<input type="text" class="form-control" name="sectionTime" id="sectionTimeInput" placeholder="路段历时">
+								<span class="help-block">单位:分钟(min)</span>
 							</div>
 						</div>
 					</div>
-					<!-- 范围图形类型 -->
+					<!-- 版本号 -->
 					<div class="form-body">
 						<div class="form-group">
-							<label class="col-md-3 control-label">是否撤销：</label>
+							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<select name="destroy" class="form-control" id="destroySelect">
-									<option value="">-- 请选择撤销类型 --</option>
-									<option value="0">否</option>
-									<option value="1">是</option>
-								</select>
+								<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
 							</div>
 						</div>
 					</div>
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明： </label>
+	                	<label class="control-label col-md-3"> 描述/说明: </label>
                  		<div class="col-md-6">
                      		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
                     	</div>
@@ -158,19 +159,24 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 	ajaxd.getStation(lineId,dir,function(treeData) {
 		var options = '<option value="">请选择...</option>';
 		var dArray = treeData[0].children[1].children;	
-		var eq_stationRouteCode =  Section.sectionrouteCode;
+		var eq_scetionRouteCode =  Section.sectionrouteCode;
 		for(var i = 0 ; i<dArray.length; i++){
 			var ptions_v = dArray[i].sectionrouteCode;
-			// 排除本站
-			if(eq_stationRouteCode == ptions_v)
+			if(eq_scetionRouteCode == ptions_v){
 				continue;
-			options += '<option value="'+ ptions_v +'">'+dArray[i].sectionName+'</option>'
+			}
+			options += '<option value="'+ ptions_v +'">'+dArray[i].sectionName + ' (' + ptions_v +')'  
+										+ ' --' + fun.dirdmToName(dArray[i].sectionrouteDirections)  + '</option>' ;
 		}
 		$('#sectionrouteCodeSelect').html(options);
-		ajaxd.findUpSectionRouteCode(lineId,dir,eq_stationRouteCode,function(str) {
+		ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+			debugger;
+			console.log(eq_scetionRouteCode);
 			if(str.length>0){
-				var upStationRouteCode = str[0].sectionrouteCode
+				var upStationRouteCode = str[0].sectionrouteCode;
 				$('#sectionrouteCodeSelect').val(upStationRouteCode);
+			}else {
+				$('#sectionrouteCodeSelect').val('');
 			}
 		});
 	});
@@ -200,112 +206,35 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 		// 表单提交
 		form.submit();
 	});
-	
 	// 表单验证
 	form.validate({
-		
 		errorElement : 'span', 
-		
 		errorClass : 'help-block help-block-error', 
-		
 		focusInvalid : false, 
-		
 		rules : {
-			
-			// 路段名称
-			'sectionName' : {
-				
-				// 必填项
-				required : true
-				
-			},
-			
-			/* // 路段序号
-			'sectionrouteCode' : {
-				
-				isStart : true
-				
-			}, */
-			
-			// 路段编码
-			'sectionCode': {
-				
-				// 必填项
-				required : true,
-				
-			},
-			
-			// 路段方向
-			'directions' : {
-				
-				// 必填项
-				required : true,
-				
-				// 方向选择限制
-				/* dirIs : true */
-				
-			},
-			
-			
-			// 路段限速
-			'speedLimit' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 路段长度
-			'sectionTime' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 路段时长
-			'sectionDistance' : {
-				
-				// 必须输入合法的数字（负数，小数）。
-				number : true
-				
-			},
-			
-			// 描述与说明
-			'descriptions' : {
-				
-				// 最大长度
-				maxlength: 150
-				
-			}
+			'sectionName' : {required : true,maxlength:50},// 路段名称  必填项
+			'sectionCode': {required : true,},// 路段编码  必填项
+			'directions' : {required : true,},// 路段方向 必填项
+			'speedLimit' : {required : true,number : true},// 路段限速 必须输入合法的数字（负数，小数）。
+			'destroy' : {required : true,},// 是否撤销 必填项.
+			'roadCoding' : {number : true},// 道路编码 必须输入合法的数字（负数，小数）。
+			'sectionTime' : {number : true},// 路段时长 必须输入合法的数字（负数，小数）。
+			'sectionDistance' : {number : true},//  路段长度 必须输入合法的数字（负数，小数）。
+			'descriptions' : {maxlength: 150}// 描述与说明 最大长度.
 		},
-		
 		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();
 			error.hide();
@@ -41,91 +41,60 @@ var GetAjaxData = function(){
 			// 树数据获取
 			getStation : function(id_,dir_,callback) {
-				
 				var treeDateJson = [];
-						
 				$get('/stationroute/findStations',{'line.id_eq' : id_ , 'directions_eq' : dir_},function(resultdata) {
-					
 					treeDateJson = createTreeData(resultdata);
-							
 					callback && callback(treeDateJson);
-							
 				});
-						
 			},
-			
+			getzdlyInfo : function(params,callback) {
+				$get('/stationroute/all',params,function(result) {
+					callback && callback(result);
+				});
+			},
 			// 查询线路某方向下所有站点的中心百度坐标
 			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){
-					 
 					 callback && callback(array);
-					 
 				 });
-				
 			},
 			// 查询站点编码
 			getStationCode : function(callback) {
 				$get('/station/getStationCode',null,function(stationCode) {
-					if(stationCode>0 || stationCode==0) {
+					if(stationCode>0) {
 						callback && callback(stationCode);
 					}
 				});
 			},
-			
 			findUpStationRouteCode : function(lineId,diraction,stationRouteCode,callback) {
-				
 				$get('/stationroute/findUpStationRouteCode',{lineId:lineId,direction:diraction,stationRouteCode:stationRouteCode},function(result) {
-					
 					callback && callback(result);
-					
 				});
-				
 			},
-			
-			
 			findUpSectionRouteCode : function(lineId,diraction,sectionRouteCode,callback) {
-				
-				$get('/sectionroute/findUpStationRouteCode',{lineId:lineId,direction:diraction,sectionRouteCode:sectionRouteCode},function(result) {
-					
+				$get('/sectionroute/findUpSectionRouteCode',{lineId:lineId,direction:diraction,sectionRouteCode:sectionRouteCode},function(result) {
 					callback && callback(result);
-					
 				});
-				
 			 },
-			
 			// 新增站点保存
 			stationSave : function(station,callback) {
-				
 				$post('/station/stationSave',station,function(data) {
-					
 					callback && callback(data);
-					
 				});
-				
 			},
-			
 			// 站点更新
 			stationUpdate : function(station,callback) {
-				
 				$post('/station/stationUpdate',station,function(data) {
-					
 					callback && callback(data);
-					
 				});
-				
 			},
 			// 撤销站点
@@ -348,7 +348,9 @@ var PublicFunctions = function () {
 				// 百度坐标点图形集合 
 				$('#bPolygonGridInput').val(editStationParmas.stationBPolygonGrid);
 				// 获取站点名称元素设值
-				$('#stationNameInput').val(editStationParmas.stationStationName);
+				$('#zdmcInput').val(editStationParmas.stationStationName);
+				// 获取站点路由名称元素设值
+				$('#stationNameInput').val(editStationParmas.stationRouteStationName);
 				// 获取站点编码元素设值
 				$('#stationCodInput').val(editStationParmas.stationStationCod);
 				// 获取站点类型元素设值
@@ -359,8 +361,13 @@ var PublicFunctions = function () {
 				$('#roadCodingCodInput').val(editStationParmas.stationRoadCoding);
 				// 百度地图经纬度坐标中心点
 				$('#bJwpointsInput').val(editStationParmas.stationBJwpoints);
-				// 获取图形类型元素，并添加值
-				$('#shapesTypeSelect').val(editStationParmas.stationShapesType);
+				if(editStationParmas.stationShapesType=='r') {
+					// 获取图形类型元素，并添加值
+					$('#shapesTypeSelect').val('圆形');
+				}else if(editStationParmas.stationShapesType=='d'){
+					$('#radiusGroup').hide();
+					$('#shapesTypeSelect').val('多边形');
+				}
 				// 获取半径元素，并添加值
 				$('#radiusInput').val(editStationParmas.stationRadius);
 				// 是否撤销
@@ -374,6 +381,7 @@ var PublicFunctions = function () {
 			},
 			setSectionFormValue : function(Section) {
+				$('#isRoadeSpeedInput').val(Section.isRoadeSpeed);
 				// 路段ID
 				$('#sectionIdInput').val(Section.sectionId);
 				// 路段路由ID
@@ -535,7 +543,16 @@ var PublicFunctions = function () {
 				$('#downLine').removeClass('btn disabled');
 				$('.btn-circle').removeClass('disabled');
 				$('#upLine').removeClass('btn disabled');
-			}
+			},
+			// 方向代码转名称.
+			dirdmToName : function(value){
+				var srStr = '';
+				if(value=='0')
+					srStr = '上行';
+				else if(value=='1')
+					srStr = '下行';
+				return srStr;
+			},
 	}
 	return PubFun ;
 }();
 \ No newline at end of file
@@ -44,7 +44,6 @@ $(function(){
 			/** 查询路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
 			GetAjaxData.getSectionRouteInfo(Line.id,'0',function(data) {
-				
 				/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
 				PublicFunctions.linePanlThree(Line.id,data,'0');
@@ -47,26 +47,22 @@ var StationTreeData = function(){
 		// 选中的是路段
 		}else if(chaildredType =='section'){
-			
 			// 路段矢量坐标点
 			var polylineArray = [data];
-			
 			// 路段方向
 			var dire_ = data.sectionrouteDirections;
-			
 			// 线路ID
 			var Line = LineObj.getLineObj();
-			
 			/*// 百度地图画路段
 			PublicFunctions.linePanlThree(Line.id,polylineArray,dire_);*/
 			// 百度地图画路段
 			PublicFunctions.treeSectionClick(Line.id,polylineArray,dire_);
-		
 		}
-		
 	}
 	function TreeOnclickEvent(treeOjb) {
+		if(treeOjb==null)
+			return;
 		// 节点个数
 		var len = treeOjb.length;
 		if(len<0) {
@@ -74,124 +70,78 @@ var StationTreeData = function(){
 		}
 		// 获取数据
 		var stationData = treeOjb[0].original;
-		
 		// 站点范围类型
 		var shapesType_ = stationData.stationShapesType;
-		
 		// 选中的节点类型
 		var chaildredType_ = stationData.chaildredType;
-		
 		// 选中的其它节点
 		if(chaildredType_ ==null){
-			
 			return;
 		}
-		
 		var edtsta = EditStationObj.getEitdStation();
-		
 		var edtste = EditSectionObj.getEitdSection();
-		
 		if(!$.isEmptyObject(edtsta)){
-			
 			var stationName = edtsta.stationStationName;
-			
 			var txType = edtsta.stationShapesType;
-			
 			// 是否继续弹出层
 			layer.confirm('您正处于站点【'+stationName+'】的编辑状态！是否退出!', {
 				btn : [ '确认并退出', '返回并继续' ]
 			}, function(index) {
-				
 				DrawingManagerObj.closeDrawingManager();
-				
 				PublicFunctions.editAChangeCssRemoveDisabled();
-				
 				// 关闭弹出层
 				layer.close(index);
-				
+				WorldsBMap.clearMarkAndOverlays();
 				if(txType=='r'){
-					
 					WorldsBMap.pointsCircle(edtsta);
-					
-					
 				}else if(txType=='d') {
-					
 					// 百度地图画多边形
 					WorldsBMap.pointsPolygon(edtsta);
 				}
-				
 				parmasObj();
-				
-				// upIsEidtStauts(objStation,chaildredType,len);
-				
 			},function(){
-				
 				// 关闭弹出层
 				layer.closeAll();
-				
 				return false;
 			});
 		}else if(!$.isEmptyObject(edtste)) {
-			
 			var sectionName = edtste.sectionName;
-			
 			// 是否继续弹出层
 			layer.confirm('您正处于路段【'+sectionName+'】的编辑状态！是否退出!', {
 				btn : [ '确认并退出', '返回并继续' ]
 			}, function(index) {
-				
 				// 关闭弹出层
 				layer.close(index);
-				
 				PublicFunctions.editAChangeCssRemoveDisabled();
-				
 				var polylineArray_ = [edtste];
-				
+				WorldsBMap.clearMarkAndOverlays();
 				// 百度地图画路段
-				// PublicFunctions.linePanlThree(edtste.sectionrouteLine,polylineArray_,edtste.sectionrouteDirections);
 				PublicFunctions.treeSectionClick(Line.id,polylineArray,dire_);
-				
 				parmasObj();
-				// upIsEidtStauts(objStation,chaildredType,len);
-				
 			},function(){
-				
 				// 关闭弹出层
 				layer.closeAll();
 				return false;
 			});
-			
 		}else {
-			
+			WorldsBMap.clearMarkAndOverlays();
 			upIsEidtStauts(shapesType_,chaildredType_,stationData);
-			
 		}
-		
 	}
-	
 	var stationTree = {
-			
 			upInit : function(treeDateJson) {
-				
 				// 如果不为空
 				if(treeDateJson) {
-					
 					// 加载树load事件
 				   $('#station_Up_tree').on('loaded.jstree', function(e, data){
-					   
 					   // 展开树
 					   $.jstree.reference("#station_Up_tree").open_all();
-					   
 					}).jstree({
-						
 						'core' : {
-							
 							'themes' : {
-								
 								'responsive': false
-								
 							},
 							'data': treeDateJson,
@@ -231,31 +181,22 @@ var StationTreeData = function(){
 					// 树节点单击事件
 					}).bind('click.jstree', function(event) {
-						
 						// 获取上行选中树节点
 						var treeOjb = $.jstree.reference("#station_Up_tree").get_selected(true);
-						
 						TreeOnclickEvent(treeOjb);
 					});
 				}
 			},
-			
 			downInit : function(treeDateJson) {
-				
 				// 如果不为空
 				if(treeDateJson) {
-					
 				   // 树初始化load事件
 				   $('#station_Down_tree').on('loaded.jstree', function(e, data){
-					   
 					   // 展开树
 					   $.jstree.reference("#station_Down_tree").open_all();
-					   
 					}).jstree({
-						
 						'core' : {
-							
 							'themes' : {
 								'responsive': false
@@ -294,48 +235,31 @@ var StationTreeData = function(){
 								}
 						},
-						
 						'plugins': ['types']
-					
 					// 树节点单击事件
 					}).bind('click.jstree', function(event) {
-						
 						// 获取下行选中树节点
 						var treeOjb = $.jstree.reference("#station_Down_tree").get_selected(true);
-						
 						TreeOnclickEvent(treeOjb);
-						 
 					});
 				}
 			},
-			
 			upreloadeTree : function (treeDateJson) {
-				
 				// 获取上行树
 				var tree = $.jstree.reference('#station_Up_tree');
-				
 				// 赋值数据
 				tree.settings.core.data = treeDateJson;
-				
 				// 刷新上行树
 				tree.refresh();
-				
-				
 			},
-			
 			dwonreloadeTree : function (treeDateJson) {
-				
 				// 获取下行树
 				var tree = $.jstree.reference('#station_Down_tree');
-				
 				// 赋值数据
 				tree.settings.core.data = treeDateJson;
-				
 				// 刷行下行树
 				tree.refresh();
-				
 			}
-			
 	}
 	return stationTree;
@@ -2,7 +2,7 @@
 <div class="portlet-body">
 	<!-- 地图 -->
 	<div id="bmap_basic" class="bmaps"></div>
-	<div class="portlet box protlet-box" style="top:20px">
+	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;">
 		<!-- 左边标题栏 -->
 		<div class="portlet-title" style="background-color:#3B3F51">
 			<div class="caption">
@@ -114,7 +114,7 @@
 	                            <div class="row" style="margin-top: 10px;">
 		                            <div class="col-md-12">
 	                             		<!-- 提示 -->
-										<div class="alert alert-warning" style="background-color: #22313F;border-color: #FFFFFF;color: #2ab4c0;">
+										<div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;">
                                         	<strong>系统未初始化该线路上行站点!</strong> 请从上方【上行规划选择】里选择任意一种方式规划该线路上行站点. 
                                         </div>
 		                            </div>
@@ -206,7 +206,7 @@
                             <div class="row" style="margin-top: 10px;">
 	                            <div class="col-md-12">
                              		 <!-- 提示 -->
-                                        <div class="alert alert-warning" style="background-color: #22313F;border-color: #FFFFFF;color: #2ab4c0;">
+                                        <div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;">
 	                                        <strong>系统未初始化该线路下行站点!</strong> 请从上方【下行规划选择】里选择任意一种方式规划该线路下行站点. 
 	                                    </div>
 	                            </div>