bsthlq 李强<2519941818@qq.com>

李强
1 parent a74f9f1b
Showing 38 changed files with 227 additions and 113 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/resources/static/pages/base/carpark/add.html
src/main/resources/static/pages/base/carpark/css/carpark-add.css
src/main/resources/static/pages/base/carpark/css/positions.css
src/main/resources/static/pages/base/carpark/edit_select.html
src/main/resources/static/pages/base/carpark/js/add-form-events.js
src/main/resources/static/pages/base/carpark/js/add-form-reload.js
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
src/main/resources/static/pages/base/carpark/js/add-vmap-world.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-events.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-function.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-map.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-reload.js
src/main/resources/static/pages/base/carpark/positions.html
src/main/resources/static/pages/base/section/add.html
src/main/resources/static/pages/base/section/css/addmap.css
src/main/resources/static/pages/base/section/css/positions.css
src/main/resources/static/pages/base/section/js/add-form-events.js
src/main/resources/static/pages/base/section/js/add-form-reload.js
src/main/resources/static/pages/base/section/js/add-form-wizard.js
@@ -552,9 +552,11 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				String textStr = newTextFileToFTP(objects,lineId);
-				textStr = line.getName() + " " + "2" + "\r\n" + textStr;
+				/*textStr = line.getName() + "\t" + "2" + "\r\n" + textStr;*/
-				InputStream input = new ByteArrayInputStream(textStr.getBytes("utf-8"));
+				textStr = line.getName() + "\t" + "2" + "\r" + textStr;
+				
+				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
 				/** 生成text文件 */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
@@ -611,37 +613,37 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 纬度
 				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
-				lat = " " +  lat;
+				lat = "\t" +  lat;
 				// 站点类型
 				String stationMake =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
 				if(stationMake.equals("E")) {
-					stationMake = " " + "2";
+					stationMake = "\t" + "2";
 				}else {
-					stationMake =" " + "1";
+					stationMake ="\t" + "1";
 				}
 				// 站点序号 
 				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
-				stationNo = " " + stationNo;
+				stationNo = "\t" + stationNo;
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
-				stationCode =  " " +stationCode;
+				stationCode =  "\t" +stationCode;
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString());
 				double tempd = dis*1000;
 				// 站点距离
-				String staitondistance = " " + String.valueOf((int) tempd);
+				String staitondistance = "\t" + String.valueOf((int) tempd);
 				// 站点名称
 				String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
@@ -659,7 +661,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					sleepStr = sobje.get(0)[2] == null ? "" : sobje.get(0)[2].toString();
-					sleepStr =  " " + sleepStr;
+					sleepStr =  "\t" + sleepStr;
 				}else if(sobje.size()>1){
@@ -674,7 +676,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 							sleepStr = sobje.get(j)[2].toString();
-							sleepStr =  " " + sleepStr;
+							sleepStr =  "\t" + sleepStr;
 						}
@@ -697,10 +699,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 				if(sleepStr.equals(""))
-					sleepStr = " " + "60";
+					sleepStr = "\t" + "60";
-				stationName = " " +stationName;
+				stationName = "\t" +stationName;
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
@@ -120,7 +120,7 @@
                         <!-- 站点位置 -->
                         <div class="tab-pane" id="tab2">
                         	<h3 class="block">  站点位置  </h3>
-                            <div id="bmap_basic"></div>
+                            <div id="addCarParkbmap_basic"></div>
                             <div class="leftUtils">
 								<div class="btn-group" style="left: 100px;">
@@ -7,7 +7,7 @@
     padding-top: 7px;
     top: 400px;
 }
-#bmap_basic{
+#addCarParkbmap_basic{
 	min-width: 100%;
 	width: 100%; 
 	margin-top: -28px;
-#bmap_basic{
+#carParkbmap_basic{
 	min-width: 100%;
 	width: calc(100% + 26px); 
 	margin-top: -28px;
@@ -143,6 +143,10 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,fun,
 			// 隐藏弹出层
 			$('#editPositions_select_mobal').modal('hide');
+			$('#eidt').attr("disabled",true);
+		　	
+		  	$('#eidt').addClass('btn disabled');
+			
 			// 表单序列
 			var params = form.serializeJSON();
@@ -12,13 +12,13 @@ $(function(){
 	$('#oppenDrawingManager').on('click',function() {
-		VmapWorlds.drawingManagerOpen();
+		addCarParkVmapWorlds.drawingManagerOpen();
 	});
 	$('#closeDrawingManager').on('click',function() {
-		VmapWorlds.drawingManagerClose();
+		addCarParkVmapWorlds.drawingManagerClose();
 	});
@@ -25,7 +25,7 @@
 		FormWizard.init();
-		mapB = VmapWorlds.init();
+		mapB = addCarParkVmapWorlds.init();
 		PublicFunctions.getCarParkCode(function(carParkCode) {
@@ -266,19 +266,27 @@ var FormWizard = function() {
                 	// 设置停车场名称
                 	$('#parkNameInput').val(stationNameV);
-                	VmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
-                	
                 	if(baseResValue == 0) {
-    		  			
-    		  			$('.leftUtils').hide();
-    		  			
-    		  			VmapWorlds.pointsCircle(p);
+                		$('.leftUtils').hide();
+                		
+                		addCarParkVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
+                			
+                			if(p) {
+                				
+                				addCarParkVmapWorlds.pointsCircle(p);
+                				
+                			}
+                			
+                		});
+    		  			
                 	}else if(baseResValue ==1) {
+                		addCarParkVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
+                		
                 		$('.leftUtils').show();
-                		VmapWorlds.drawingManagerOpen();
+                		addCarParkVmapWorlds.drawingManagerOpen();
                 	} 
                 }
@@ -353,9 +361,9 @@ var FormWizard = function() {
                     if(index==2) {
-                    	VmapWorlds.clearMarkAndOverlays();
+                    	addCarParkVmapWorlds.clearMarkAndOverlays();
-                    	VmapWorlds.drawingManagerClose();
+                    	addCarParkVmapWorlds.drawingManagerClose();
                     }
@@ -372,11 +380,11 @@ var FormWizard = function() {
                     if(index ==0) {
-                    	VmapWorlds.drawingManagerClose();
+                    	addCarParkVmapWorlds.drawingManagerClose();
                     }
-                    VmapWorlds.clearMarkAndOverlays();
+                    addCarParkVmapWorlds.clearMarkAndOverlays();
                     handleTitle(tab, navigation, index);
-var VmapWorlds = function() {
+var addCarParkVmapWorlds = function() {
 	var mapB = '', circle = '', drawingManager = '',circle='',marker='';
@@ -13,7 +13,7 @@ var VmapWorlds = function() {
 				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
 				// 初始化百度地图
-				mapB = new BMap.Map("bmap_basic");
+				mapB = new BMap.Map("addCarParkbmap_basic");
 				//中心点和缩放级别
 				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
@@ -16,7 +16,7 @@ $(function(){
 			$(pjaxContainer).append(m);
-			$('#editPositions_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+			$('#editPositions_select_mobal').trigger('editSelectMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
 		});
@@ -41,10 +41,10 @@ var PublicFunctions = function () {
 								var nameV =  r[0].carParkName;
 								/** 根据名称定位 */
-								WorldsBMap.localSearchFromAdreesToPoint(nameV);
+								CarParkPWorldsBMap.localSearchFromAdreesToPoint(nameV);
 								// 打开绘制工具
-								WorldsBMap.openDrawingManager();
+								CarParkPWorldsBMap.openDrawingManager();
 							});
@@ -213,12 +213,12 @@ var PublicFunctions = function () {
 						if(stationShapesType == 'r') {
 							/**  画圆 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
-							WorldsBMap.pointsCircle(r,point,htm,opts);
+							CarParkPWorldsBMap.pointsCircle(r,point,htm,opts);
 						}else if(stationShapesType == 'd'){
 							/** 画多边形 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */ 
-							WorldsBMap.pointsPolygon(r,point,htm,opts);
+							CarParkPWorldsBMap.pointsPolygon(r,point,htm,opts);
 						}
 					} 
@@ -3,7 +3,7 @@
  * 
  */
-var WorldsBMap = function () {
+var CarParkPWorldsBMap = function () {
 	var mapValue='',drawingManager='',marker='',circle='',polygon='';
@@ -18,7 +18,7 @@ var WorldsBMap = function () {
 				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
 				// 初始化百度地图
-				mapValue = new BMap.Map("bmap_basic");
+				mapValue = new BMap.Map("carParkbmap_basic");
 				//中心点和缩放级别
 				mapValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
@@ -141,7 +141,7 @@ var WorldsBMap = function () {
 							 $(pjaxContainer).append(m);
-							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
 						 });
@@ -370,7 +370,7 @@ var WorldsBMap = function () {
 							$(pjaxContainer).append(m);
-							$('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+							$('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
 						}); 
@@ -428,7 +428,7 @@ var WorldsBMap = function () {
 							 $(pjaxContainer).append(m);
-							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
 						 });
@@ -28,7 +28,7 @@
 	setTimeout(function(){
 		// 地图初始化
-		mapB = WorldsBMap.init();
+		mapB = CarParkPWorldsBMap.init();
 		/** 停车场信息初始化 @param：<id：停车场ID> */
 		PublicFunctions.initCarPark(id);
 <link href="/pages/base/carpark/css/positions.css" rel="stylesheet" type="text/css" />
 <!-- 地图容器-->
-<div id="bmap_basic"></div>
+<div id="carParkbmap_basic"></div>
 <!-- 操作工具容器 -->
 <div class="leftUtils">
-<link href="/pages/base/station/css/addmap.css" rel="stylesheet" type="text/css" />
+<link href="/pages/base/section/css/addmap.css" rel="stylesheet" type="text/css" />
 <div class="page-head">
 	<div class="page-title">
 		<h1>添加路段</h1>
@@ -131,7 +131,7 @@
                         <!-- 站点位置 -->
                         <div class="tab-pane" id="tab2">
                         	<h3 class="block">  路段位置  </h3>
-                            <div id="bmap_basic"></div>
+                            <div id="sectionBmap_basic"></div>
                         </div>
                         <!-- 站点信息 -->
+#sectionBmap_basic{
+	min-width: 100%;
+	width: 100%; 
+	margin-top: -28px;
+	border: 2px solid #fdfdfd;
+	min-height: 400px;
+	height:100%;
+	overflow: hidden;
+	top: 15px;
+}
+
+
+/* 隐藏百度地图logo */
+.anchorBL,
+.anchorBL,
+.amap-logo,
+.amap-copyright{
+	display: none;
+}
+ 
+.BMap_pop div:nth-child(1) ,
+.BMap_pop div:nth-child(2) ,
+.BMap_pop div:nth-child(3) ,
+.BMap_pop div:nth-child(4) ,
+.BMap_pop div:nth-child(5) ,
+.BMap_pop div:nth-child(6) ,
+.BMap_pop div:nth-child(7) {
+	
+	border:0px solid rgb(255, 255, 255) !important;
+	background-color:#3B3F51 !important;
+	
+}
+
+.BMap_pop div:nth-child(3){
+	
+	width:23px !important;
+	
+}
+
+.BMap_pop div:nth-child(7) {
+	
+	width:23px !important;
+	
+	height:24px !important;
+	
+}
+
+.BMap_pop div:nth-child(5) {
+	
+	height:24px !important;
+	
+}
+
+/* 图片以后在弄，先隐藏div */
+.BMap_pop div:nth-child(8) {
+	
+	height:0px !important;
+	/*  background:url('/pages/base/stationroute/css/img/iw3-1.png') no-repeat !important; */
+	/* background-image:url('/pages/base/stationroute/css/img/windowinfo_b.jpg')  !important;  */
+	
+}
+
+.BMap_pop {
+	
+	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
+	
+}
 \ No newline at end of file
-#bmap_basic{
+#sectionPbmap_basic{
 	min-width: 100%;
 	width: calc(100% + 26px); 
 	margin-top: -28px;
@@ -12,13 +12,13 @@ $(function(){
 	$('#oppenDrawingManager').on('click',function() {
-		VmapWorlds.drawingManagerOpen();
+		SectionVmapWorlds.drawingManagerOpen();
 	});
 	$('#closeDrawingManager').on('click',function() {
-		VmapWorlds.drawingManagerClose();
+		SectionVmapWorlds.drawingManagerClose();
 	});
@@ -27,7 +27,7 @@
 		FormWizard.init();
 		// 地图初始化
-		var mapB = VmapWorlds.init();
+		var mapB = SectionVmapWorlds.init();
 		/** 路段编码 */
 		PublicFunctions.getSectionCode(function(sectionCode) {
@@ -317,12 +317,12 @@ var FormWizard = function() {
                 	if(baseResValue == 0) {
                 		// 根据站点名称获取百度坐标
-                    	VmapWorlds.stationsNameToPoints(paramsStationsArray,function(resultJson) {
+                    	SectionVmapWorlds.stationsNameToPoints(paramsStationsArray,function(resultJson) {
                     		// 根据坐标点获取两点之间的时间与距离
-                    		VmapWorlds.getDistanceAndDuration(resultJson,function(stationdataList) {
+                    		SectionVmapWorlds.getDistanceAndDuration(resultJson,function(stationdataList) {
-                    			VmapWorlds.getSectionListPlonly(stationdataList,function(sectiondata) {
+                    			SectionVmapWorlds.getSectionListPlonly(stationdataList,function(sectiondata) {
                     				$('#bsectionVectorInput').val(JSON.stringify(sectiondata));
@@ -333,11 +333,11 @@ var FormWizard = function() {
                 	}else if(baseResValue ==1) {
-                		VmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
+                		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
-                    	VmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
+                    	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
-                		VmapWorlds.drawingManagerOpen();
+                		SectionVmapWorlds.drawingManagerOpen();
                 	}else if(baseResValue ==2) {
@@ -416,9 +416,9 @@ var FormWizard = function() {
                     if(index==2) {
-                    	VmapWorlds.drawingManagerClose();
+                    	SectionVmapWorlds.drawingManagerClose();
-                    	VmapWorlds.clearMarkAndOverlays();
+                    	SectionVmapWorlds.clearMarkAndOverlays();
                     }
@@ -432,11 +432,11 @@ var FormWizard = function() {
                     error.hide();
-                    VmapWorlds.clearMarkAndOverlays();
+                    SectionVmapWorlds.clearMarkAndOverlays();
                     if(index==0) {
-                    	VmapWorlds.drawingManagerClose();
+                    	SectionVmapWorlds.drawingManagerClose();
                     }
-var VmapWorlds = function() {
+var SectionVmapWorlds = function() {
 	var mapB = '', drawingManager = '';
@@ -13,7 +13,7 @@ var VmapWorlds = function() {
 				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
 				// 初始化百度地图
-				mapB = new BMap.Map("bmap_basic");
+				mapB = new BMap.Map("sectionBmap_basic");
 				//中心点和缩放级别
 				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
@@ -2,8 +2,8 @@ $(function(){
 	$('#backUp').on('click',function() {
-		// 获取返回元素并修改url地址
-		$('#backUp').attr('href','list.html?');
+		// 返回list.html页面
+		loadPage('/pages/base/section/list.html');
 	});
@@ -17,7 +17,7 @@ $(function(){
 		// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 		var yindex = layer.msg('编辑完线路走向后,请双击线路走向区域保存',{ offset: '126px',shift: 0,time: 10000});
-		WorldsBMap.editPolyUpline();
+		SectionPWorldsBMap.editPolyUpline();
 	});
@@ -18,7 +18,7 @@ var PositionsPublicFunctions = function () {
 					EditSectionObj.setEitdSection(sectionInfo);
-				    WorldsBMap.drawingUpline(r);
+					SectionPWorldsBMap.drawingUpline(r);
 				}
 			});
@@ -3,7 +3,7 @@
  * 
  */
-var WorldsBMap = function () {
+var SectionPWorldsBMap = function () {
 	var mapValue = '',marker='', polyUpline='';
@@ -18,7 +18,7 @@ var WorldsBMap = function () {
 				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
 				// 初始化百度地图
-				mapValue = new BMap.Map('bmap_basic');
+				mapValue = new BMap.Map('sectionPbmap_basic');
 				//中心点和缩放级别
 				mapValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
@@ -133,7 +133,7 @@ var WorldsBMap = function () {
 					// 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
 					polyUpline.disableMassClear();
-					WorldsBMap.clearMarkAndOverlays();
+					SectionPWorldsBMap.clearMarkAndOverlays();
 					// 允许覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
 					polyUpline.enableMassClear();
@@ -161,7 +161,7 @@ var WorldsBMap = function () {
 							$(pjaxContainer).append(m);
-							$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PositionsPublicFunctions]);
+							$('#edit_section_mobal').trigger('editSectionMobal_show', [SectionPWorldsBMap,GetAjaxData,EditSectionObj,PositionsPublicFunctions]);
 						});
 					});
@@ -28,7 +28,7 @@
 	setTimeout(function(){
 		/** 初始化地图 @return <mapB：地图对象> */
-		var mapB = WorldsBMap.init();
+		var mapB = SectionPWorldsBMap.init();
 		/** 初始化路段信息 @return <id：路段路由ID> */
 		PositionsPublicFunctions.initSectionInfo(id);
@@ -104,7 +104,11 @@
 				{{obj.line.name}}
 			</td>
 			<td>
-				{{obj.directions}}
+				{{if obj.directions == '0'}}
+					上行
+				{{else if obj.directions == '1'}}
+					下行
+				{{/if}}
 			</td>
 			<td>
 				{{obj.section.sectionName}}
@@ -119,7 +123,11 @@
 				{{obj.versions}}
 			</td>
 			<td>
-				{{obj.destroy}}
+				{{if obj.destroy == 1}}
+					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
+				{{else if obj.destroy == 0}}
+					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
+				{{/if}}
 			</td>
 			<td>
 				<a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
 <link href="/pages/base/section/css/positions.css" rel="stylesheet" type="text/css" />
-<div id="bmap_basic"></div>
+<div id="sectionPbmap_basic"></div>
 <div class="leftUtils">
 	<div class="btn-group" style="left: 100px;">
@@ -22,6 +22,12 @@
 				 <span class="step-title"> 1 - 4 </span>
 			</span>
 		</div>
+		
+		<div class="actions">
+			<div class="btn-group btn-group-devided" data-toggle="buttons">
+				<a class="btn btn-circle default" href="/pages/base/station/list.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
+			</div>
+		</div>
 	</div>
 	<div class="portlet-body form">
@@ -120,7 +126,7 @@
                         <!-- 站点位置 -->
                         <div class="tab-pane" id="tab2">
                         	<h3 class="block">  站点位置  </h3>
-                            <div id="bmap_basic">
+                            <div id="stationbmap_basic">
                             <div class="leftUtils">
 								<div class="btn-group" style="left: 100px;">
-#bmap_basic{
+#stationbmap_basic{
 	min-width: 100%;
 	width: 100%; 
 	margin-top: -28px;
-#bmap_basic{
+#positionBmap_basic{
 	min-width: 100%;
 	width: calc(100% + 26px); 
 	margin-top: -28px;
@@ -12,13 +12,13 @@ $(function(){
 	$('#oppenDrawingManager').on('click',function() {
-		VmapWorlds.drawingManagerOpen();
+		StationPVmapWorlds.drawingManagerOpen();
 	});
 	$('#closeDrawingManager').on('click',function() {
-		VmapWorlds.drawingManagerClose();
+		StationPVmapWorlds.drawingManagerClose();
 	});
@@ -25,7 +25,7 @@
 		FormWizard.init();
-		var mapB = VmapWorlds.init();
+		var mapB = StationPVmapWorlds.init();
 		PublicFunctions.getStationCode(function(stationCode) {
@@ -178,8 +178,6 @@ var FormWizard = function() {
 					// 表单序列化
 					var params = form.serializeJSON();
-					console.log(params);
-					
 					//保存站点
 					PublicFunctions.stationSave(params,function(data) {
@@ -324,26 +322,31 @@ var FormWizard = function() {
                 	$('#stationNameInput').val(stationNameV);
-                	VmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
-		  				
-		  				if(p) {
-		  					
-		  					if(baseResValue == 0) {
-		    		  			
-		    		  			$('.leftUtils').hide();
-		    		  			
-		    		  			VmapWorlds.pointsCircle(p);
-		                		
-		                	}else if(baseResValue ==1) {
-		                		
-		                		$('.leftUtils').show();
-		                		
-		                		VmapWorlds.drawingManagerOpen();
-		                		
-		                	} 
-		  				}
-		  				
-		  			});
+                	if(baseResValue == 0) {
+                		
+                		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
+    		  				
+    		  				if(p) {
+    		  					
+    		  					$('.leftUtils').hide();
+    	    		  			
+    		  					StationPVmapWorlds.pointsCircle(p);
+    		  					
+    		  				}
+    		  				
+    		  			});
+    		  			
+                		
+                	}else if(baseResValue ==1) {
+                		
+                		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
+                		
+                		$('.leftUtils').show();
+                		
+                		StationPVmapWorlds.drawingManagerOpen();
+                		
+                	} 
+                	
                 }	
                 /** 如果为最后一步显示提交按钮，隐藏下一步按钮,否则隐藏提交按钮，显示下一步按钮 */
@@ -385,6 +388,8 @@ var FormWizard = function() {
                 /** 当一个导航标签被点击,返回错误的移动到该选项卡，并显示它的内容. */
                 onTabClick: function (tab, navigation, index, clickedIndex) {
+                	return false;
+                	
                     success.hide();
                     error.hide();
@@ -414,7 +419,7 @@ var FormWizard = function() {
                     if(index==2) {
-                    	VmapWorlds.clearMarkAndOverlays();
+                    	StationPVmapWorlds.clearMarkAndOverlays();
                     }
@@ -434,7 +439,7 @@ var FormWizard = function() {
                     error.hide();
-                    VmapWorlds.clearMarkAndOverlays();
+                    StationPVmapWorlds.clearMarkAndOverlays();
                   /*  mapB.clearOverlays();
-var VmapWorlds = function() {
+var StationPVmapWorlds = function() {
 	var mapB = '', circle = '', drawingManager = '',circle='',marker='';
@@ -13,7 +13,7 @@ var VmapWorlds = function() {
 				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
 				// 初始化百度地图
-				mapB = new BMap.Map("bmap_basic");
+				mapB = new BMap.Map("stationbmap_basic");
 				//中心点和缩放级别
 				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
@@ -3,8 +3,8 @@ $(function(){
 	// 返回
 	$('#backUp').on('click',function() {
-		// 获取返回元素并修改url地址
-		$('#backUp').attr('href','list.html?');
+		// 返回list.html页面
+		loadPage('/pages/base/station/list.html');
 	});
@@ -25,7 +25,7 @@ var StationPositionsWorldsBMap = function () {
 				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
 				// 初始化百度地图
-				mapBValue = new BMap.Map("bmap_basic");
+				mapBValue = new BMap.Map("positionBmap_basic");
 				//中心点和缩放级别
 				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
@@ -117,7 +117,11 @@
 				{{obj.line.name}}
 			</td>
 			<td>
-				{{obj.directions}}
+				{{if obj.directions == '0'}}
+					上行
+				{{else if obj.directions == '1'}}
+					下行
+				{{/if}}
 			</td>
 			<td>
 				{{obj.stationName}}
@@ -128,14 +132,24 @@
 			<td>
 				{{obj.stationRouteCode}}
 			</td>
-			<td>
-				{{obj.stationMark}}
+			<td>	
+				{{if obj.stationMark == 'B'}}
+					起始站
+				{{else if obj.stationMark == 'Z'}}
+					中途站
+				{{else if obj.stationMark== 'E'}}
+					终点站
+				{{/if}}
 			</td>
 			<td>
 				{{obj.versions}}
 			</td>
 			<td>
-				{{obj.destroy}}
+				{{if obj.destroy == 1}}
+					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
+				{{else if obj.destroy == 0}}
+					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
+				{{/if}}
 			</td>
 			<td>
 				<a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
 <link href="/pages/base/station/css/positions.css" rel="stylesheet" type="text/css" />
 <!-- 地图容器 -->
-<div id="bmap_basic"></div>
+<div id="positionBmap_basic"></div>
 <!-- 操作工具容器disabled -->
 <div class="leftUtils">