update!

youxiw2000
1 parent 079d77bc
Showing 13 changed files with 65 additions and 45 deletions
src/main/resources/static/pages/base/stationroute/add.html
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/base/stationroute/batch_update_industryCode.html
src/main/resources/static/pages/base/stationroute/deletesection.html
src/main/resources/static/pages/base/stationroute/deletestation.html
src/main/resources/static/pages/base/stationroute/doublename_road.html
src/main/resources/static/pages/base/stationroute/edit.html
src/main/resources/static/pages/base/stationroute/js/drawingManager.js
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
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/js/stationroute-list-map.js
src/main/resources/static/pages/base/stationroute/tzzj.html
@@ -334,7 +334,7 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 				var id =Line.id;
 				var dir = params.directions
 				// 刷行左边树
-				fun.resjtreeDate(id,dir);
+				fun.resjtreeDate(id,dir,$("#versions").val());
 				closeMobleSetClean();
 				// 隐藏moble
 				hideMoble();
@@ -369,9 +369,11 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 		/** 设置新增站点集合对象为空 */
 		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);
-		});
+		var version = $("#versions").val();
+		PublicFunctions.resjtreeDate(Line.id,add_direction_v,version);
+		//ajaxd.getSectionRouteInfo(Line.id,add_direction_v,version,function(data) {
+		//	fun.linePanlThree(Line.id,data,add_direction_v,version);
+		//});
 		fun.editMapStatusRemove();
 	}
 	function hideMoble() {
@@ -283,13 +283,17 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 			}
 			// 清除地图覆盖物
 			map.clearMarkAndOverlays();
+			var version = $("#versions").val();
 			// 刷新树
-			fun.resjtreeDate(lineid,directionData);
+			fun.resjtreeDate(lineid,directionData,version);
+			
+
+			//PublicFunctions.resjtreeDate(lineid,directionData,version);
 			// 查询上行路段信息
-			ajaxd.getSectionRouteInfo(lineid,directionData,function(data) {
-				// 在地图上画出线路走向
-				fun.linePanlThree(lineid,data,directionData);
-			});
+			//ajaxd.getSectionRouteInfo(lineid,directionData,version,function(data) {
+			//	// 在地图上画出线路走向
+			//	fun.linePanlThree(lineid,data,directionData,version);
+			//});
 		});
 	}
 });
@@ -184,12 +184,14 @@ $(&#39;#batch_update_industryCode_mobal&#39;).on(&#39;batch_update_industryCodeMobal.show&#39;, 
 				if(data.status=='SUCCESS') {
                     map.clearMarkAndOverlays();
                     // 刷新左边树
-                    pf.resjtreeDate(lineId,dir);
+                    pf.resjtreeDate(lineId,dir,$("#versions").val());
                     /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-                    gd.getSectionRouteInfo(lineId,dir,function(data) {
+                    var version = $("#versions").val();
+                    
+                   // gd.getSectionRouteInfo(lineId,dir,version,function(data) {
                         /** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
-                        pf.linePanlThree(lineId,data,dir);
-                    });
+                    //    pf.linePanlThree(lineId,data,dir,version);
+                    //});
 					// 弹出添加成功提示消息
 					layer.msg('修改成功...');
 				}else {
@@ -153,12 +153,14 @@ $(&#39;#delete_section_mobal&#39;).on(&#39;deleteSectionMobal.show&#39;,function(e, ajaxd, line,
                 }
                 initSearch();
                 // 刷新左边树
-                fun.resjtreeDate(line.id,delBatch.dir);
+                fun.resjtreeDate(line.id,delBatch.dir,$("#versions").val());
+                
+                //var version = $("#versions").val();
                 /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
-                ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
+                //ajaxd.getSectionRouteInfo(line.id,delBatch.dir,version,function(data) {
                     /** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
-                    fun.linePanlThree(line.id,data,delBatch.dir);
-                });
+                //    fun.linePanlThree(line.id,data,delBatch.dir,version);
+                //});
             });
 		} else {
 			layer.msg('请选择要删除的路段！！！');
@@ -154,12 +154,13 @@ $(&#39;#delete_station_mobal&#39;).on(&#39;deleteStationMobal.show&#39;,function(e, ajaxd, line,
 				}
 				initSearch();
 				// 刷新左边树
-				fun.resjtreeDate(line.id,delBatch.dir);
+				fun.resjtreeDate(line.id,delBatch.dir,$("#versions").val());
 				/** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
-				ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
+				var version = $("#versions").val();
+				//ajaxd.getSectionRouteInfo(line.id,delBatch.dir,version,function(data) {
 				/** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
-					fun.linePanlThree(line.id,data,delBatch.dir);
-				});
+				//	fun.linePanlThree(line.id,data,delBatch.dir,version);
+				//});
 			});
 		} else {
 			layer.msg('请选择要删除的站点！！！');
@@ -81,11 +81,12 @@
         function closeMobleSetClean() {
             // 清除地图覆盖物
             // map_.clearMarkAndOverlays();
-            fun.resjtreeDate(lineId,dir);
+            fun.resjtreeDate(lineId,dir,$("#versions").val());
             fun.editAChangeCssRemoveDisabled();
-            ajaxd.getSectionRouteInfo(lineId,dir,function(data) {
-                fun.linePanlThree(lineId,data,dir);
-            });
+           // var version = $("#versions").val();
+            //ajaxd.getSectionRouteInfo(lineId,dir,version,function(data) {
+            //    fun.linePanlThree(lineId,data,dir,version);
+            //});
         }
         // 编辑表单元素
         var form = $('#edit_section__form');
@@ -141,7 +142,7 @@
                         $('#doublename_road_mobal').modal('hide');
                         var dir = params.directions;
                         // 刷行左边树
-                        // fun.resjtreeDate(lineId,dir);
+                        fun.resjtreeDate(lineId,dir,$("#versions").val());
                         closeMobleSetClean();
                     });
                 });
@@ -193,22 +193,26 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	});
 	$('#statusInput').val(addLine.status);
 	function closeMobleSetClean() {
+		debugger;
 		// 清除地图覆盖物
 		map_.clearMarkAndOverlays();
-		
-		var version = station_.getEitdStation().stationRouteVersions;
+		var version = $("#versions").val();
 		/** 设置新增站点集合对象为空 */
 		station_.setEitdStation({});
 		var add_direction_v = $('#stationdirSelect').val();
 		fun.resjtreeDate(addLine.id,add_direction_v,version);
 		fun.editAChangeCssRemoveDisabled();
-		ajaxd.getSectionRouteInfo(addLine.id,add_direction_v,function(data) {
-			fun.linePanlThree(addLine.id,data,add_direction_v);
-		});
+		
+		console.log(map_.getStationArray());
+		
+		//ajaxd.getSectionRouteInfo(addLine.id,add_direction_v,version,function(data) {
+		//	fun.linePanlThree(addLine.id,data,add_direction_v,version);
+		//});
         fun.editMapStatusRemove();
         setTimeout(function () {
         	var stationArray = map_.getStationArray();
+    		console.log(map_.getStationArray());
             map_.openStationInfoWin(stationArray[editStationParmasObj.stationRouteId]);
         },1000);
     }
@@ -276,8 +280,9 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 				$('#edit_station_mobal').modal('hide');
 				var id = addLine.id;
 				var dir = params.directions
+				
 				// 刷行左边树
-				// fun.resjtreeDate(id,dir);
+				fun.resjtreeDate(id,dir,$("#versions").val());
 				closeMobleSetClean();
 			});
 		}
@@ -51,16 +51,16 @@ var DrawingManagerObj = function () {
 						var addStation = AddStationObj.getAddStation();
-						debugger;
-						GetAjaxData.getSectionRouteInfo(addLine.id,addStation.dir,function(data) {
+						var version = $("#versions").val();
+						
+						GetAjaxData.getSectionRouteInfo(addLine.id,addStation.dir,version,function(data) {
-							PublicFunctions.linePanlThree(addLine.id,data,addStation.dir);
+							PublicFunctions.linePanlThree(addLine.id,data,addStation.dir,version);
 							/** 设置新增站点集合对象为空 */
 							AddStationObj.setAddStation({});
 							EditStationObj.setEitdStation({});
-							
 						});
 						return false;
@@ -169,7 +169,7 @@ var GetAjaxData = function(){
 		// 查询路段信息
 		getSectionRouteInfo : function(lineId,direction,version,callback) {
-			
+			debugger;
 			if(!callback){
 				callback = version;
 				version = $("#versions").val();
@@ -339,7 +339,7 @@ $(function(){
 						}
 						if(map.size>0){
                             $('.portlet-title .match_station').addClass('hidden');
-                            PublicFunctions.resjtreeDate(lineId,0);
+                            PublicFunctions.resjtreeDate(lineId,0,$("#versions").val());
                             /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
 //                            GetAjaxData.getSectionRouteInfo(lineId,0,function(data) {
 //                                /** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
@@ -259,7 +259,7 @@ var PublicFunctions = function () {
 											layer.msg('保存失败！');
 										}
 										// 刷新树
-										PublicFunctions.resjtreeDate(addLine.id,directionData);
+										PublicFunctions.resjtreeDate(addLine.id,directionData,$("#versions").val());
 										/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
 //										GetAjaxData.getSectionRouteInfo(addLine.id,directionData,function(data) {
 //											/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
@@ -479,6 +479,7 @@ window.WorldsBMap = function () {
             if (datas) {
             // if (polyline_center && datas) {
                 // 编辑路段数据
+            	debugger;
                 sectionArray = [];
                 for (var d = 0; d < datas.length; d++) {
                     var data = datas[d];
@@ -906,7 +907,7 @@ window.WorldsBMap = function () {
             Bmap.clearMarkAndOverlays();
             // 刷新左边树
-            PublicFunctions.resjtreeDate(lineId,dir);
+            PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
             /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
 //            GetAjaxData.getSectionRouteInfo(lineId,dir,function(data1) {
 //                /** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
@@ -1031,7 +1032,7 @@ window.WorldsBMap = function () {
                                 $('.main_left_panel_m_layer').hide();
                                 $(btn).parents('.buffer_edit_body').parent().remove();
                                 PublicFunctions.editMapStatusRemove();
-                                PublicFunctions.resjtreeDate(lineId,dir);
+                                PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
                                 PublicFunctions.editAChangeCssRemoveDisabled();
 //                                GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
 //                                    PublicFunctions.linePanlThree(lineId,data,dir);
@@ -1121,7 +1122,7 @@ window.WorldsBMap = function () {
                                 $('.main_left_panel_m_layer').hide();
                                 $(btn).parents('.buffer_edit_body').parent().remove();
                                 PublicFunctions.editMapStatusRemove();
-                                PublicFunctions.resjtreeDate(lineId,dir);
+                                PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
                                 PublicFunctions.editAChangeCssRemoveDisabled();
 //                                GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
 //                                    PublicFunctions.linePanlThree(lineId,data,dir);
@@ -1158,7 +1159,8 @@ window.WorldsBMap = function () {
                         layer.msg('撤销失败!');
                     }
                     // 刷新左边树
-                    PublicFunctions.resjtreeDate(lineId,dir);
+                    var version = $("#verions").val();
+                    PublicFunctions.resjtreeDate(lineId,dir,version);
                     /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
 //                    GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
 //                        /** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
@@ -1182,7 +1184,8 @@ window.WorldsBMap = function () {
                         layer.msg('撤销失败!');
                     }
                     // 刷新左边树
-                    PublicFunctions.resjtreeDate(lineId,dir);
+                    var version = $("#verions").val();
+                    PublicFunctions.resjtreeDate(lineId,dir,version);
                     /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
 //                    GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
 //                        /** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
@@ -116,7 +116,7 @@ $(&#39;#tzzj_mobal&#39;).on(&#39;tzzjMobal.show&#39;, function(e,map,gd,dir,lineid,pf,rd){
 					layer.msg('修改成功...');
 					map.clearMarkAndOverlays();
 					// 刷新左边树
-					pf.resjtreeDate(lineid,dir);
+					pf.resjtreeDate(lineid,dir,$("#versions").val());
 					/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
 					//gd.getSectionRouteInfo(lineid,dir,function(data) {
 					//	/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */