Commit efbd3894d089abf491a375e8ee917ecb5141580f
1 parent
185d3f6a
李强
Showing
3 changed files
with
52 additions
and
31 deletions
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
| ... | ... | @@ -241,42 +241,45 @@ $('#add_station_template_mobal').on('AddStationTempMobal.show', function(e,map,a |
| 241 | 241 | // 如果线路信息不为空 |
| 242 | 242 | if(BusLine){ |
| 243 | 243 | |
| 244 | - if(BusLine.zB.length == 0){ | |
| 245 | - | |
| 246 | - // 根据坐标点获取两点之间的折线路段 | |
| 247 | - map.getSectionListPlonly(stationdataList,function(sectiondata) { | |
| 248 | - | |
| 249 | - // 定义路段信息字符串 | |
| 250 | - var sectionJSON = JSON.stringify(sectiondata); | |
| 251 | - | |
| 252 | - // 路段信息JSON字符串 | |
| 253 | - params.sectionJSON = sectionJSON; | |
| 254 | - | |
| 255 | - addSave(params,addLine.id,directionData); | |
| 256 | - | |
| 257 | - }); | |
| 244 | + // 获取公交线几何对象, 仅当结果自动添加到地图上时有效 | |
| 245 | + var Polygon = BusLine.getPolyline(); | |
| 246 | + | |
| 247 | + // 返回多边型的点数组(自1.2新增) | |
| 248 | + var polyGonArray = Polygon.getPath(); | |
| 249 | + | |
| 250 | + var jsonArray = [{sectionName:lineNameV+dirStr,points:polyGonArray}]; | |
| 251 | + | |
| 252 | + // 定义路段信息字符串 | |
| 253 | + var sectionJSON = JSON.stringify(jsonArray); | |
| 254 | + | |
| 255 | + // 路段信息JSON字符串 | |
| 256 | + params.sectionJSON = sectionJSON; | |
| 257 | + | |
| 258 | + addSave(params,addLine.id,directionData); | |
| 259 | + /* if(BusLine.zB.length == 0){ | |
| 258 | 260 | |
| 259 | 261 | |
| 260 | 262 | |
| 261 | 263 | }else { |
| 262 | 264 | |
| 263 | - // 获取公交线几何对象, 仅当结果自动添加到地图上时有效 | |
| 264 | - var Polygon = BusLine.getPolyline(); | |
| 265 | - | |
| 266 | - // 返回多边型的点数组(自1.2新增) | |
| 267 | - var polyGonArray = Polygon.getPath(); | |
| 268 | - | |
| 269 | - var jsonArray = [{sectionName:lineNameV+dirStr,points:polyGonArray}]; | |
| 265 | + } */ | |
| 266 | + }else { | |
| 267 | + | |
| 268 | + | |
| 269 | + // 根据坐标点获取两点之间的折线路段 | |
| 270 | + map.getSectionListPlonly(stationdataList,function(sectiondata) { | |
| 270 | 271 | |
| 271 | 272 | // 定义路段信息字符串 |
| 272 | - var sectionJSON = JSON.stringify(jsonArray); | |
| 273 | + var sectionJSON = JSON.stringify(sectiondata); | |
| 273 | 274 | |
| 274 | 275 | // 路段信息JSON字符串 |
| 275 | 276 | params.sectionJSON = sectionJSON; |
| 276 | 277 | |
| 277 | 278 | addSave(params,addLine.id,directionData); |
| 278 | 279 | |
| 279 | - } | |
| 280 | + }); | |
| 281 | + | |
| 282 | + | |
| 280 | 283 | } |
| 281 | 284 | }); |
| 282 | 285 | |
| ... | ... | @@ -319,6 +322,9 @@ $('#add_station_template_mobal').on('AddStationTempMobal.show', function(e,map,a |
| 319 | 322 | |
| 320 | 323 | function addSave(params,lineid,directionData) { |
| 321 | 324 | |
| 325 | + console.log(params); | |
| 326 | + | |
| 327 | + return false; | |
| 322 | 328 | // 保存 |
| 323 | 329 | ajaxd.manualSave(params,function(rd) { |
| 324 | 330 | ... | ... |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
| ... | ... | @@ -251,7 +251,7 @@ var PublicFunctions = function () { |
| 251 | 251 | |
| 252 | 252 | console.log(BusLine); |
| 253 | 253 | |
| 254 | - if(BusLine.zB.length == 0){ | |
| 254 | + /*if(BusLine.zB.length == 0){ | |
| 255 | 255 | |
| 256 | 256 | layer.confirm('系统生成该线路【'+lineNameV+'】时获取站点与路段异常!请联系管理员或者检查网络连接是否异常!', { |
| 257 | 257 | btn : [ '确认' ] |
| ... | ... | @@ -277,7 +277,7 @@ var PublicFunctions = function () { |
| 277 | 277 | return ; |
| 278 | 278 | }); |
| 279 | 279 | |
| 280 | - } | |
| 280 | + }*/ | |
| 281 | 281 | |
| 282 | 282 | // 获取公交线几何对象, 仅当结果自动添加到地图上时有效 |
| 283 | 283 | var Polygon = BusLine.getPolyline(); | ... | ... |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
| ... | ... | @@ -175,11 +175,26 @@ var WorldsBMap = function () { |
| 175 | 175 | |
| 176 | 176 | if(r.message=='ok') { |
| 177 | 177 | |
| 178 | - // 获取距离(单位:米) | |
| 179 | - points[index+1].distance = r.result.taxi.distance; | |
| 178 | + console.log(r); | |
| 179 | + | |
| 180 | + if(r.result.taxi==null) { | |
| 181 | + | |
| 182 | + // 获取距离(单位:米) | |
| 183 | + points[index+1].distance = 0; | |
| 184 | + | |
| 185 | + // 获取时间(单位:秒) | |
| 186 | + points[index+1].duration = 0; | |
| 187 | + | |
| 188 | + }else { | |
| 189 | + | |
| 190 | + // 获取距离(单位:米) | |
| 191 | + points[index+1].distance = r.result.taxi.distance; | |
| 192 | + | |
| 193 | + // 获取时间(单位:秒) | |
| 194 | + points[index+1].duration = r.result.taxi.duration; | |
| 195 | + | |
| 196 | + } | |
| 180 | 197 | |
| 181 | - // 获取时间(单位:秒) | |
| 182 | - points[index+1].duration = r.result.taxi.duration; | |
| 183 | 198 | |
| 184 | 199 | } |
| 185 | 200 | |
| ... | ... | @@ -928,7 +943,7 @@ var WorldsBMap = function () { |
| 928 | 943 | //获取第一个公交列表显示到map上 |
| 929 | 944 | var fstLine = BusListResult.getBusListItem(i); |
| 930 | 945 | |
| 931 | - if(fstLine==undefined){ | |
| 946 | + /*if(fstLine==undefined){ | |
| 932 | 947 | |
| 933 | 948 | layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段!请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){ |
| 934 | 949 | |
| ... | ... | @@ -947,7 +962,7 @@ var WorldsBMap = function () { |
| 947 | 962 | return; |
| 948 | 963 | }); |
| 949 | 964 | |
| 950 | - } | |
| 965 | + }*/ | |
| 951 | 966 | |
| 952 | 967 | busline.getBusLine(fstLine); |
| 953 | 968 | ... | ... |