基础信息功能修订.

李强
1 parent ce4e5383
Showing 11 changed files with 161 additions and 47 deletions
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/section/editsection.html
src/main/resources/static/pages/base/station/edit.html
src/main/resources/static/pages/base/stationroute/add.html
src/main/resources/static/pages/base/stationroute/css/bmap_base.css
src/main/resources/static/pages/base/stationroute/edit.html
src/main/resources/static/pages/base/stationroute/editsection.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/list.html
@@ -113,8 +113,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	/*@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
 						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
 				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)*/
-	@Query(value = "SELECT s.b_jwpoints,s.station_name,r.station_route_code FROM (" +
-			"SELECT b.station,b.station_route_code FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+	@Query(value = "SELECT s.b_jwpoints,r.station_name,r.station_route_code FROM (" +
+			"SELECT b.station,b.station_route_code,b.station_name FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
 	   "LEFT JOIN bsth_c_station s on r.station = s.id order by r.station_route_code asc", nativeQuery=true)
 	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
@@ -248,13 +248,13 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			for(int i = 0;i <stationsArray.size();i++) {
 				// 站点名称
 				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
-				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
+				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0.0d : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
 				// 转成公里
 				distance = distance/1000;
 				BigDecimal d = new BigDecimal(distance);
 				distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 				sectionDistance= distance + sectionDistance;
-				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
+				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0.0d : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
 				// 转成分钟
 				duration = duration/60;
 				BigDecimal t = new BigDecimal(duration);
@@ -792,9 +792,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Station station = repository.findOne(stationId);
 			StationRoute arg0 = new StationRoute();
 			// 距离
-			Double distances =  map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
+			Double distances =  map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
 			// 时间
-			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
+			Double toTime = map.get("toTime").equals("") ? 0.0d : Double.parseDouble(map.get("toTime").toString());
 			// 站点路由名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
 			// 线路ID
@@ -952,8 +952,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			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());
+			Double distances = map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
+			Double toTime = map.get("toTime").equals("") ? 0.0d : 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);
 <!-- 编辑路段 -->
-<div class="modal fade" id="edit_section_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_section_mobal"  role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -49,7 +49,7 @@
           						上一路段：
                     		</label>
 							<div class="col-md-6">
-								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect"></select>
+								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect" style="width:100%"></select>
 								<span class="help-block">说明：选择的路段将作为本路段序号的参考，成为选择路段的下一个路段。 </span>
 							</div>
 						</div>
@@ -162,7 +162,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 	var sectionRouteId = Section.sectionRouteId;
 	// 获取路段号元素，并添加下拉属性值
 	ajaxd.getStation(lineId,dir,function(treeData) {
-		var options = '<option value="">请选择...</option>';
+		/* var options = '<option value="">请选择...</option>';
 		var dArray = treeData[0].children[1].children;	
 		var eq_stationRouteCode =  Section.sectionRouteCode;
 		for(var i = 0 ; i<dArray.length; i++){
@@ -181,6 +181,33 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			}else {
 				$('#sectionrouteCodeSelect').val('');
 			}
+		}); */
+		var array = treeData[0].children[1].children,paramsD =new Array();	
+		var eq_scetionRouteCode =  Section.sectionRouteCode;
+		paramsD.push({'id':'请选择...','text':'请选择...'});
+		// 遍历.
+		$.each(array, function(i, g){
+			// 判断.
+			if(g.sectionName!='' || g.sectionName != null) {
+				var ptions_v = g.sectionrouteCode;
+				if(eq_scetionRouteCode != ptions_v){
+					// 添加拼音检索下拉框格式数据数组.
+					paramsD.push({'id':ptions_v,
+								  'text':g.sectionName + '(' + ptions_v + ')' + '  --' + dirdmToName(g.sectionrouteDirections)});
+				}
+			}
+		});
+		// 初始化上一个路段拼音检索下拉框.
+		initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
+			$('#sectionDirSelect').val('');// 设值方向.
+			ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+				if(str.length>0){
+					var upStationRouteCode = str[0].sectionrouteCode;
+					$('#sectionrouteCodeSelect').select2('val',upStationRouteCode);
+				}else {
+					$('#sectionrouteCodeSelect').select2('val','请选择...');
+				}
+			});
 		});
 	});
 	function dirdmToName(value) {
@@ -257,6 +284,8 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			// 设置日期
 			params.createDate =  moment(Section.carParkCreateDate).format(fs);
 			error.hide();
+			if(params.sectionrouteCode=='请选择...')
+				params.sectionrouteCode='';
 			ajaxd.sectionUpdate(params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
 <!-- 编辑站点弹出层mobal -->
-<div class="modal fade" id="editPoitsions_station_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="editPoitsions_station_mobal" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<!-- 弹出层标题title容器 -->
@@ -209,6 +209,7 @@
 </div>
 <script type="text/javascript">
 $('#editPoitsions_station_mobal').on('editStationMobal_show', function(e, map,fun,stat){
+	layer.closeAll();
 	// 获取站点对象信息
 	var editStation = stat.getAddStation();
 	// 初始化表单值
@@ -297,7 +298,9 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		if(stationRValue) {
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
 			var tempStr = stationRValue.split('_');
 			if(tempStr[1] == 'E') {
 				$('#stationMarkSelect').val('E');
@@ -318,8 +321,15 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 					if(g.name!='' || g.name != null) {
 						if(g.stationRouteCode != editStation.stationRouteCode) {
 							// 添加拼音检索下拉框格式数据数组.
-							paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
-										  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							/* paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+										  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)}); */
+							if(editStation.stationRouteStationMark=='E' && i == (len_-2)){
+								paramsD.push({'id':g.stationRouteCode + '_' + 'E' + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}else {
+								paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}
 						}
 					}
 				});
@@ -333,10 +343,17 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 	}
 	function setZdlyValue() {
 		fun.findUpStationRouteCode(editStation.stationRouteLine,editStation.stationRoutedirections,editStation.stationRouteCode,function(str) {
-			if(str.length>0){
+			/* if(str.length>0){
 				var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStation.stationRoutedirections;
 				$('#stationrouteSelect').select2('val',upStationRouteCode);
+			} */
+			if(str.length>0){
+				var upStationRouteCode = str[0].stationRouteCode + '_' + editStation.stationRouteStationMark  + '_' + editStation.stationRoutedirections;
+				$('#stationrouteSelect').select2('val',upStationRouteCode);
+			}else {
+				$('#stationrouteSelect').select2('val','请选择...');
 			}
+			$('#stationMarkSelect').val(editStation.stationRouteStationMark);
 		});
 	}
 	// 当站点类型为中途站或者终点站时,上一站点为必填项！
 <!-- 新增站点 -->
-<div class="modal fade" id="add_station_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="add_station_mobal" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -180,7 +180,7 @@
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;: </label>
+	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                  		<div class="col-md-6">
                      		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
                     	</div>
@@ -243,7 +243,9 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		if(stationRValue) {
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
 			var tempStr = stationRValue.split('_');
 			if(tempStr[1] == 'E') {
 				$('#stationMarkSelect').val('E');
@@ -93,4 +93,39 @@ html,body{
 	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
+}
+
+.defeat-scroll {
+width: 98%;
+height:380px;
+/* overflow:auto; */
+overflow:hidden;
+}
+.defeat-scroll::-webkit-scrollbar {
+width:6px;
+height:6px;
+}
+.defeat-scroll::-webkit-scrollbar-button    {
+/* background-color:#FF7677; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-track     {
+/* background:#FF66D5; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-track-piece {
+/* background:#ff0000; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-thumb{
+background:rgba(197, 196, 196, 0.81);
+border-radius:10px !important;
+}
+.defeat-scroll::-webkit-scrollbar-corner {
+/* background:#82AFFF; */
+background:rgba(255, 255, 255, 0);
+}
+.defeat-scroll::-webkit-scrollbar-resizer  {
+/* background:#FF0BEE; */
+background:rgba(255, 255, 255, 0);
 }
 \ No newline at end of file
 <!-- 编辑站点 -->
-<div class="modal fade" id="edit_station_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_station_mobal"  role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -50,7 +50,7 @@
           						<span class="required"> * </span> 站点编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationCod" id="stationCodInput" placeholder="站点编码">
+								<input type="text" class="form-control" name="stationCod" id="stationCodInput" placeholder="站点编码" readonly="readonly">
 							</div>
 						</div>
 					</div>
@@ -177,7 +177,7 @@
 					</div>
 					<!-- 描述/说明 -->
 	                <div class="form-group">
-	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;: </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>
@@ -194,6 +194,7 @@
 <script type="text/javascript">
 $('#edit_station_mobal').on('editSelectMobal_show', function(e, map_,ajaxd,station_,Line_,fun){
+	layer.closeAll();
  	var editStationParmasObj = station_.getEitdStation();
 	var addLine = Line_.getLineObj();
 	fun.setFormValue(editStationParmasObj);
@@ -290,7 +291,9 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		if(stationRValue) {
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
 			var tempStr = stationRValue.split('_');
 			if(tempStr[1] == 'E') {
 				$('#stationMarkSelect').val('E');
@@ -311,8 +314,13 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 					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)});
+							if(editStationParmasObj.stationRouteStationMark=='E' && i == (len_-2)){
+								paramsD.push({'id':g.stationRouteCode + '_' + 'E' + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}else {
+								paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+							}
 						}
 					}
 				});
@@ -327,12 +335,14 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	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;
+				/* var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStationParmasObj.stationRouteDirections; */
+				var upStationRouteCode = str[0].stationRouteCode + '_' + editStationParmasObj.stationRouteStationMark  + '_' + editStationParmasObj.stationRouteDirections;
 				$('#stationrouteSelect').select2('val',upStationRouteCode);
 			}else {
 				$('#stationrouteSelect').select2('val','请选择...');
-				$('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark);
+				/* $('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark); */
 			}
+			$('#stationMarkSelect').val(editStationParmasObj.stationRouteStationMark);
 		});
 	}
 	// 当站点类型为中途站或者终点站时,上一站点为必填项！
 <!-- 编辑路段 -->
-<div class="modal fade" id="edit_section_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_section_mobal" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -49,7 +49,7 @@
           						上一路段:
                     		</label>
 							<div class="col-md-6">
-								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect"></select>
+								<select name="sectionrouteCode" class="form-control" id="sectionrouteCodeSelect" style="width:100%"></select>
 								<span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
 							</div>
 						</div>
@@ -157,10 +157,9 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 	var lineId = Section.sectionrouteLine;
 	// 获取路段号元素，并添加下拉属性值
 	ajaxd.getStation(lineId,dir,function(treeData) {
-		var options = '<option value="">请选择...</option>';
-		var dArray = treeData[0].children[1].children;	
+		var array = treeData[0].children[1].children,paramsD =new Array();	
 		var eq_scetionRouteCode =  Section.sectionrouteCode;
-		for(var i = 0 ; i<dArray.length; i++){
+		/* for(var i = 0 ; i<dArray.length; i++){
 			var ptions_v = dArray[i].sectionrouteCode;
 			if(eq_scetionRouteCode == ptions_v){
 				continue;
@@ -168,17 +167,32 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			options += '<option value="'+ ptions_v +'">'+dArray[i].sectionName + ' (' + ptions_v +')'  
 										+ ' --' + fun.dirdmToName(dArray[i].sectionrouteDirections)  + '</option>' ;
 		}
-		$('#sectionrouteCodeSelect').html(options);
-		ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
-			debugger;
-			console.log(eq_scetionRouteCode);
-			if(str.length>0){
-				var upStationRouteCode = str[0].sectionrouteCode;
-				$('#sectionrouteCodeSelect').val(upStationRouteCode);
-			}else {
-				$('#sectionrouteCodeSelect').val('');
+		$('#sectionrouteCodeSelect').html(options); */
+		paramsD.push({'id':'请选择...','text':'请选择...'});
+		// 遍历.
+		$.each(array, function(i, g){
+			// 判断.
+			if(g.sectionName!='' || g.sectionName != null) {
+				var ptions_v = g.sectionrouteCode;
+				if(eq_scetionRouteCode != ptions_v){
+					// 添加拼音检索下拉框格式数据数组.
+					paramsD.push({'id':ptions_v,
+								  'text':g.sectionName + '(' + ptions_v + ')' + '  --' + fun.dirdmToName(g.sectionrouteDirections)});
+				}
 			}
 		});
+		// 初始化上一个路段拼音检索下拉框.
+		initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
+			$('#sectionDirSelect').val('');// 设值方向.
+			ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+				if(str.length>0){
+					var upStationRouteCode = str[0].sectionrouteCode;
+					$('#sectionrouteCodeSelect').select2('val',upStationRouteCode);
+				}else {
+					$('#sectionrouteCodeSelect').select2('val','请选择...');
+				}
+			});
+		});
 	});
 	// 显示mobal
 	$('#edit_section_mobal').modal({show : true,backdrop: 'static',keyboard: false});
@@ -238,6 +252,8 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 		submitHandler : function(f) {
 			var params = form.serializeJSON();
 			error.hide();
+			if(params.sectionrouteCode=='请选择...')
+				params.sectionrouteCode='';
 			ajaxd.sectionUpdate(params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
@@ -238,4 +238,9 @@ $(function(){
 			}
 		});
 	});
+	$('#scrllmouseEvent').on('mousemove',function() {
+		$('.defeat-scroll').css('overflow','auto');
+	}).on('mouseleave',function() {
+		$('.defeat-scroll').css('overflow','hidden');
+	});
 });
 \ No newline at end of file
@@ -354,7 +354,7 @@ var PublicFunctions = function () {
 				// 获取站点编码元素设值
 				$('#stationCodInput').val(editStationParmas.stationStationCod);
 				// 获取站点类型元素设值
-				$('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
+				// $('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
 				// 获取站点方向元素设值
 				$('#stationdirSelect').val(editStationParmas.stationRouteDirections);
 				// 获取站点道路编码元素设值
@@ -4,7 +4,7 @@
 	<div id="bmap_basic" class="bmaps"></div>
 	<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="portlet-title" style="background-color:#12527f;">
 			<div class="caption">
 				<!-- 途径站点  -->
 			</div>
@@ -13,7 +13,7 @@
 			</div>
 		</div>
 		<!-- 左边栏 -->
-		<div class="portlet-body" style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 200px;">
+		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 380px;">
 			<div class="row">
 				<!-- 上下行栏 -->
 				<div class="col-md-3 col-sm-3 col-xs-3">
@@ -83,8 +83,8 @@
 	                                </div>
 	                            </div>
 	                            <!-- 树 -->
-	                            <div class="portlet-body">
-									<div id="station_Up_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
+	                            <div class="portlet-body" >
+									<div id="station_Up_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
 								</div>
                              </div>
                              <!-- 无上行站点添加方式 -->
@@ -176,7 +176,7 @@
 	                            </div>
 	                            <!-- 树 -->
 	                            <div class="portlet-body">
-									<div id="station_Down_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
+									<div id="station_Down_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
 								</div>
 	            		</div>
 	            		<!-- 无上行站点添加方式 -->