潘钊 / bsth_control · Commits

Commit d7b3c90e1f35a103b94fb2910ea2b8c91e269576

Authored by youxiw2000
1 parent 079d77bc

update!

Inline Side-by-side
Showing 13 changed files with 65 additions and 45 deletions
src/main/resources/static/pages/base/stationroute/add.html
  View file @d7b3c90
... ... @@ -334,7 +334,7 @@ $('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,stao
334 334 var id =Line.id;
335 335 var dir = params.directions
336 336 // 刷行左边树
337   - fun.resjtreeDate(id,dir);
  337 + fun.resjtreeDate(id,dir,$("#versions").val());
338 338 closeMobleSetClean();
339 339 // 隐藏moble
340 340 hideMoble();
... ... @@ -369,9 +369,11 @@ $('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,stao
369 369 /** 设置新增站点集合对象为空 */
370 370 staobj.setAddStation({});
371 371 var add_direction_v = $('#stationdirSelect').val();
372   - ajaxd.getSectionRouteInfo(Line.id,add_direction_v,function(data) {
373   - fun.linePanlThree(Line.id,data,add_direction_v);
374   - });
  372 + var version = $("#versions").val();
  373 + PublicFunctions.resjtreeDate(Line.id,add_direction_v,version);
  374 + //ajaxd.getSectionRouteInfo(Line.id,add_direction_v,version,function(data) {
  375 + // fun.linePanlThree(Line.id,data,add_direction_v,version);
  376 + //});
375 377 fun.editMapStatusRemove();
376 378 }
377 379 function hideMoble() {
... ...
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
  View file @d7b3c90
... ... @@ -283,13 +283,17 @@ $('#add_station_template_mobal').on('AddStationTempMobal.show', function(e,map,a
283 283 }
284 284 // 清除地图覆盖物
285 285 map.clearMarkAndOverlays();
  286 + var version = $("#versions").val();
286 287 // 刷新树
287   - fun.resjtreeDate(lineid,directionData);
  288 + fun.resjtreeDate(lineid,directionData,version);
  289 +
  290 +
  291 + //PublicFunctions.resjtreeDate(lineid,directionData,version);
288 292 // 查询上行路段信息
289   - ajaxd.getSectionRouteInfo(lineid,directionData,function(data) {
290   - // 在地图上画出线路走向
291   - fun.linePanlThree(lineid,data,directionData);
292   - });
  293 + //ajaxd.getSectionRouteInfo(lineid,directionData,version,function(data) {
  294 + // // 在地图上画出线路走向
  295 + // fun.linePanlThree(lineid,data,directionData,version);
  296 + //});
293 297 });
294 298 }
295 299 });
... ...
src/main/resources/static/pages/base/stationroute/batch_update_industryCode.html
  View file @d7b3c90
... ... @@ -184,12 +184,14 @@ $('#batch_update_industryCode_mobal').on('batch_update_industryCodeMobal.show',
184 184 if(data.status=='SUCCESS') {
185 185 map.clearMarkAndOverlays();
186 186 // 刷新左边树
187   - pf.resjtreeDate(lineId,dir);
  187 + pf.resjtreeDate(lineId,dir,$("#versions").val());
188 188 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
189   - gd.getSectionRouteInfo(lineId,dir,function(data) {
  189 + var version = $("#versions").val();
  190 +
  191 + // gd.getSectionRouteInfo(lineId,dir,version,function(data) {
190 192 /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
191   - pf.linePanlThree(lineId,data,dir);
192   - });
  193 + // pf.linePanlThree(lineId,data,dir,version);
  194 + //});
193 195 // 弹出添加成功提示消息
194 196 layer.msg('修改成功...');
195 197 }else {
... ...
src/main/resources/static/pages/base/stationroute/deletesection.html
  View file @d7b3c90
... ... @@ -153,12 +153,14 @@ $(&#39;#delete_section_mobal&#39;).on(&#39;deleteSectionMobal.show&#39;,function(e, ajaxd, line,
153 153 }
154 154 initSearch();
155 155 // 刷新左边树
156   - fun.resjtreeDate(line.id,delBatch.dir);
  156 + fun.resjtreeDate(line.id,delBatch.dir,$("#versions").val());
  157 +
  158 + //var version = $("#versions").val();
157 159 /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
158   - ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
  160 + //ajaxd.getSectionRouteInfo(line.id,delBatch.dir,version,function(data) {
159 161 /** 在地图上画出线路走向 @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
160   - fun.linePanlThree(line.id,data,delBatch.dir);
161   - });
  162 + // fun.linePanlThree(line.id,data,delBatch.dir,version);
  163 + //});
162 164 });
163 165 } else {
164 166 layer.msg('请选择要删除的路段！！！');
... ...
src/main/resources/static/pages/base/stationroute/deletestation.html
  View file @d7b3c90
... ... @@ -154,12 +154,13 @@ $(&#39;#delete_station_mobal&#39;).on(&#39;deleteStationMobal.show&#39;,function(e, ajaxd, line,
154 154 }
155 155 initSearch();
156 156 // 刷新左边树
157   - fun.resjtreeDate(line.id,delBatch.dir);
  157 + fun.resjtreeDate(line.id,delBatch.dir,$("#versions").val());
158 158 /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
159   - ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
  159 + var version = $("#versions").val();
  160 + //ajaxd.getSectionRouteInfo(line.id,delBatch.dir,version,function(data) {
160 161 /** 在地图上画出线路走向 @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
161   - fun.linePanlThree(line.id,data,delBatch.dir);
162   - });
  162 + // fun.linePanlThree(line.id,data,delBatch.dir,version);
  163 + //});
163 164 });
164 165 } else {
165 166 layer.msg('请选择要删除的站点！！！');
... ...
src/main/resources/static/pages/base/stationroute/doublename_road.html
  View file @d7b3c90
... ... @@ -81,11 +81,12 @@
81 81 function closeMobleSetClean() {
82 82 // 清除地图覆盖物
83 83 // map_.clearMarkAndOverlays();
84   - fun.resjtreeDate(lineId,dir);
  84 + fun.resjtreeDate(lineId,dir,$("#versions").val());
85 85 fun.editAChangeCssRemoveDisabled();
86   - ajaxd.getSectionRouteInfo(lineId,dir,function(data) {
87   - fun.linePanlThree(lineId,data,dir);
88   - });
  86 + // var version = $("#versions").val();
  87 + //ajaxd.getSectionRouteInfo(lineId,dir,version,function(data) {
  88 + // fun.linePanlThree(lineId,data,dir,version);
  89 + //});
89 90 }
90 91 // 编辑表单元素
91 92 var form = $('#edit_section__form');
... ... @@ -141,7 +142,7 @@
141 142 $('#doublename_road_mobal').modal('hide');
142 143 var dir = params.directions;
143 144 // 刷行左边树
144   - // fun.resjtreeDate(lineId,dir);
  145 + fun.resjtreeDate(lineId,dir,$("#versions").val());
145 146 closeMobleSetClean();
146 147 });
147 148 });
... ...
src/main/resources/static/pages/base/stationroute/edit.html
  View file @d7b3c90
... ... @@ -193,22 +193,26 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
193 193 });
194 194 $('#statusInput').val(addLine.status);
195 195 function closeMobleSetClean() {
  196 + debugger;
196 197 // 清除地图覆盖物
197 198 map_.clearMarkAndOverlays();
198   -
199   - var version = station_.getEitdStation().stationRouteVersions;
  199 + var version = $("#versions").val();
200 200 /** 设置新增站点集合对象为空 */
201 201 station_.setEitdStation({});
202 202  
203 203 var add_direction_v = $('#stationdirSelect').val();
204 204 fun.resjtreeDate(addLine.id,add_direction_v,version);
205 205 fun.editAChangeCssRemoveDisabled();
206   - ajaxd.getSectionRouteInfo(addLine.id,add_direction_v,function(data) {
207   - fun.linePanlThree(addLine.id,data,add_direction_v);
208   - });
  206 +
  207 + console.log(map_.getStationArray());
  208 +
  209 + //ajaxd.getSectionRouteInfo(addLine.id,add_direction_v,version,function(data) {
  210 + // fun.linePanlThree(addLine.id,data,add_direction_v,version);
  211 + //});
209 212 fun.editMapStatusRemove();
210 213 setTimeout(function () {
211 214 var stationArray = map_.getStationArray();
  215 + console.log(map_.getStationArray());
212 216 map_.openStationInfoWin(stationArray[editStationParmasObj.stationRouteId]);
213 217 },1000);
214 218 }
... ... @@ -276,8 +280,9 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
276 280 $('#edit_station_mobal').modal('hide');
277 281 var id = addLine.id;
278 282 var dir = params.directions
  283 +
279 284 // 刷行左边树
280   - // fun.resjtreeDate(id,dir);
  285 + fun.resjtreeDate(id,dir,$("#versions").val());
281 286 closeMobleSetClean();
282 287 });
283 288 }
... ...
src/main/resources/static/pages/base/stationroute/js/drawingManager.js
  View file @d7b3c90
... ... @@ -51,16 +51,16 @@ var DrawingManagerObj = function () {
51 51  
52 52 var addStation = AddStationObj.getAddStation();
53 53  
54   - debugger;
55   - GetAjaxData.getSectionRouteInfo(addLine.id,addStation.dir,function(data) {
  54 + var version = $("#versions").val();
  55 +
  56 + GetAjaxData.getSectionRouteInfo(addLine.id,addStation.dir,version,function(data) {
56 57  
57   - PublicFunctions.linePanlThree(addLine.id,data,addStation.dir);
  58 + PublicFunctions.linePanlThree(addLine.id,data,addStation.dir,version);
58 59  
59 60 /** 设置新增站点集合对象为空 */
60 61 AddStationObj.setAddStation({});
61 62  
62 63 EditStationObj.setEitdStation({});
63   -
64 64 });
65 65  
66 66 return false;
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
  View file @d7b3c90
... ... @@ -169,7 +169,7 @@ var GetAjaxData = function(){
169 169  
170 170 // 查询路段信息
171 171 getSectionRouteInfo : function(lineId,direction,version,callback) {
172   -
  172 + debugger;
173 173 if(!callback){
174 174 callback = version;
175 175 version = $("#versions").val();
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
  View file @d7b3c90
... ... @@ -339,7 +339,7 @@ $(function(){
339 339 }
340 340 if(map.size>0){
341 341 $('.portlet-title .match_station').addClass('hidden');
342   - PublicFunctions.resjtreeDate(lineId,0);
  342 + PublicFunctions.resjtreeDate(lineId,0,$("#versions").val());
343 343 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
344 344 // GetAjaxData.getSectionRouteInfo(lineId,0,function(data) {
345 345 // /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
  View file @d7b3c90
... ... @@ -259,7 +259,7 @@ var PublicFunctions = function () {
259 259 layer.msg('保存失败！');
260 260 }
261 261 // 刷新树
262   - PublicFunctions.resjtreeDate(addLine.id,directionData);
  262 + PublicFunctions.resjtreeDate(addLine.id,directionData,$("#versions").val());
263 263 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
264 264 // GetAjaxData.getSectionRouteInfo(addLine.id,directionData,function(data) {
265 265 // /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @d7b3c90
... ... @@ -479,6 +479,7 @@ window.WorldsBMap = function () {
479 479 if (datas) {
480 480 // if (polyline_center && datas) {
481 481 // 编辑路段数据
  482 + debugger;
482 483 sectionArray = [];
483 484 for (var d = 0; d < datas.length; d++) {
484 485 var data = datas[d];
... ... @@ -906,7 +907,7 @@ window.WorldsBMap = function () {
906 907  
907 908 Bmap.clearMarkAndOverlays();
908 909 // 刷新左边树
909   - PublicFunctions.resjtreeDate(lineId,dir);
  910 + PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
910 911 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
911 912 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data1) {
912 913 // /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
... ... @@ -1031,7 +1032,7 @@ window.WorldsBMap = function () {
1031 1032 $('.main_left_panel_m_layer').hide();
1032 1033 $(btn).parents('.buffer_edit_body').parent().remove();
1033 1034 PublicFunctions.editMapStatusRemove();
1034   - PublicFunctions.resjtreeDate(lineId,dir);
  1035 + PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
1035 1036 PublicFunctions.editAChangeCssRemoveDisabled();
1036 1037 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
1037 1038 // PublicFunctions.linePanlThree(lineId,data,dir);
... ... @@ -1121,7 +1122,7 @@ window.WorldsBMap = function () {
1121 1122 $('.main_left_panel_m_layer').hide();
1122 1123 $(btn).parents('.buffer_edit_body').parent().remove();
1123 1124 PublicFunctions.editMapStatusRemove();
1124   - PublicFunctions.resjtreeDate(lineId,dir);
  1125 + PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
1125 1126 PublicFunctions.editAChangeCssRemoveDisabled();
1126 1127 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
1127 1128 // PublicFunctions.linePanlThree(lineId,data,dir);
... ... @@ -1158,7 +1159,8 @@ window.WorldsBMap = function () {
1158 1159 layer.msg('撤销失败!');
1159 1160 }
1160 1161 // 刷新左边树
1161   - PublicFunctions.resjtreeDate(lineId,dir);
  1162 + var version = $("#verions").val();
  1163 + PublicFunctions.resjtreeDate(lineId,dir,version);
1162 1164 /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
1163 1165 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
1164 1166 // /** 在地图上画出线路走向 @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
... ... @@ -1182,7 +1184,8 @@ window.WorldsBMap = function () {
1182 1184 layer.msg('撤销失败!');
1183 1185 }
1184 1186 // 刷新左边树
1185   - PublicFunctions.resjtreeDate(lineId,dir);
  1187 + var version = $("#verions").val();
  1188 + PublicFunctions.resjtreeDate(lineId,dir,version);
1186 1189 /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
1187 1190 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
1188 1191 // /** 在地图上画出线路走向 @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
... ...
src/main/resources/static/pages/base/stationroute/tzzj.html
  View file @d7b3c90
... ... @@ -116,7 +116,7 @@ $(&#39;#tzzj_mobal&#39;).on(&#39;tzzjMobal.show&#39;, function(e,map,gd,dir,lineid,pf,rd){
116 116 layer.msg('修改成功...');
117 117 map.clearMarkAndOverlays();
118 118 // 刷新左边树
119   - pf.resjtreeDate(lineid,dir);
  119 + pf.resjtreeDate(lineid,dir,$("#versions").val());
120 120 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
121 121 //gd.getSectionRouteInfo(lineid,dir,function(data) {
122 122 // /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
... ...