Commit 7c2cf928403f314afa1d238f09a9a84c477c8402
1 parent
022f99d9
update
Showing
2 changed files
with
1 additions
and
30 deletions
src/main/java/com/bsth/repository/StationRouteRepository.java
| @@ -369,7 +369,7 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int | @@ -369,7 +369,7 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int | ||
| 369 | " s.create_date AS stationRouteCreateDate," + | 369 | " s.create_date AS stationRouteCreateDate," + |
| 370 | " s.update_by AS stationRouteUpdateBy," + | 370 | " s.update_by AS stationRouteUpdateBy," + |
| 371 | " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " + | 371 | " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " + |
| 372 | - " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true) | 372 | + " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true) |
| 373 | List<Object[]> getStationRouteList(Integer lineId, Integer dir); | 373 | List<Object[]> getStationRouteList(Integer lineId, Integer dir); |
| 374 | 374 | ||
| 375 | List<StationRoute> findByLine(Line line); | 375 | List<StationRoute> findByLine(Line line); |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
| @@ -428,35 +428,6 @@ var PublicFunctions = function () { | @@ -428,35 +428,6 @@ var PublicFunctions = function () { | ||
| 428 | $('#versionsInput').val(Section.versions); | 428 | $('#versionsInput').val(Section.versions); |
| 429 | }, | 429 | }, |
| 430 | 430 | ||
| 431 | - //lineId,data,direction | ||
| 432 | - treeSectionClick: function(lineId,data,direction){ | ||
| 433 | - /** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */ | ||
| 434 | - WorldsBMap.clearMarkAndOverlays(); | ||
| 435 | - // 编辑路段数据 | ||
| 436 | - for(var d= 0; d<data.length;d++){ | ||
| 437 | - // 地图折线坐标点集合 | ||
| 438 | - var polylineArray = []; | ||
| 439 | - // 获取路段折线坐标字符串 | ||
| 440 | - var sectionBsectionVectorStr = data[d].sectionBsectionVector; | ||
| 441 | - if(sectionBsectionVectorStr==null) { | ||
| 442 | - continue; | ||
| 443 | - } | ||
| 444 | - // 切割段折线坐标字符串 | ||
| 445 | - var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1); | ||
| 446 | - // 分割折线坐标字符串 | ||
| 447 | - var lineArray = tempStr.split(','); | ||
| 448 | - for(var i = 0;i<lineArray.length;i++) { | ||
| 449 | - polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1])); | ||
| 450 | - } | ||
| 451 | - var index = parseInt(polylineArray.length/2); | ||
| 452 | - var center = polylineArray[index]; | ||
| 453 | - /** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */ | ||
| 454 | - WorldsBMap.drawingUpline(polylineArray,center); | ||
| 455 | - /** 在地图上画点 @param：<point_center：中心坐标点> */ | ||
| 456 | - WorldsBMap.drawingUpStationPoint(data[d], d+1); | ||
| 457 | - } | ||
| 458 | - }, | ||
| 459 | - | ||
| 460 | /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */ | 431 | /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */ |
| 461 | linePanlThree : function(lineId,data,direction) { | 432 | linePanlThree : function(lineId,data,direction) { |
| 462 | /** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */ | 433 | /** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */ |