Commit 74dcd914f3b165174dcb84ad087e02bde76c107b
1 parent
57dc87b8
update...
Showing
12 changed files
with
510 additions
and
72 deletions
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
| 1 | package com.bsth.controller.geo_data; | 1 | package com.bsth.controller.geo_data; |
| 2 | 2 | ||
| 3 | +import com.bsth.service.geo_data.GeoDataService; | ||
| 4 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 3 | import org.springframework.web.bind.annotation.RequestMapping; | 5 | import org.springframework.web.bind.annotation.RequestMapping; |
| 6 | +import org.springframework.web.bind.annotation.RequestParam; | ||
| 4 | import org.springframework.web.bind.annotation.RestController; | 7 | import org.springframework.web.bind.annotation.RestController; |
| 5 | 8 | ||
| 9 | +import java.util.Map; | ||
| 10 | + | ||
| 6 | /** | 11 | /** |
| 7 | * Created by panzhao on 2017/12/7. | 12 | * Created by panzhao on 2017/12/7. |
| 8 | */ | 13 | */ |
| @@ -10,5 +15,17 @@ import org.springframework.web.bind.annotation.RestController; | @@ -10,5 +15,17 @@ import org.springframework.web.bind.annotation.RestController; | ||
| 10 | @RequestMapping("/_geo_data") | 15 | @RequestMapping("/_geo_data") |
| 11 | public class GeoDataController { | 16 | public class GeoDataController { |
| 12 | 17 | ||
| 13 | - | 18 | + @Autowired |
| 19 | + GeoDataService geoDataService; | ||
| 20 | + | ||
| 21 | + @RequestMapping("findGeoStations") | ||
| 22 | + public Map<String, Object> findGeoStations(@RequestParam String lineCode){ | ||
| 23 | + return geoDataService.findGeoStations(lineCode); | ||
| 24 | + } | ||
| 25 | + | ||
| 26 | + | ||
| 27 | + @RequestMapping("findGeoRoad") | ||
| 28 | + public Map<String, Object> findGeoRoad(@RequestParam String lineCode){ | ||
| 29 | + return geoDataService.findGeoRoad(lineCode); | ||
| 30 | + } | ||
| 14 | } | 31 | } |
src/main/java/com/bsth/entity/geo_data/GeoRoad.java
0 → 100644
| 1 | +package com.bsth.entity.geo_data; | ||
| 2 | + | ||
| 3 | +/** | ||
| 4 | + * Created by panzhao on 2017/12/8. | ||
| 5 | + */ | ||
| 6 | +public class GeoRoad { | ||
| 7 | + | ||
| 8 | + private int id; | ||
| 9 | + | ||
| 10 | + private Integer sectionrouteCode; | ||
| 11 | + | ||
| 12 | + private Integer directions; | ||
| 13 | + | ||
| 14 | + private String lineCode; | ||
| 15 | + | ||
| 16 | + private String sectionCode; | ||
| 17 | + | ||
| 18 | + private Integer versions; | ||
| 19 | + | ||
| 20 | + private String sectionName; | ||
| 21 | + | ||
| 22 | + private String crosesRoad; | ||
| 23 | + | ||
| 24 | + private String gsectionVector; | ||
| 25 | + | ||
| 26 | + public int getId() { | ||
| 27 | + return id; | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | + public void setId(int id) { | ||
| 31 | + this.id = id; | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + public Integer getSectionrouteCode() { | ||
| 35 | + return sectionrouteCode; | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + public void setSectionrouteCode(Integer sectionrouteCode) { | ||
| 39 | + this.sectionrouteCode = sectionrouteCode; | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + public Integer getDirections() { | ||
| 43 | + return directions; | ||
| 44 | + } | ||
| 45 | + | ||
| 46 | + public void setDirections(Integer directions) { | ||
| 47 | + this.directions = directions; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + public String getLineCode() { | ||
| 51 | + return lineCode; | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | + public void setLineCode(String lineCode) { | ||
| 55 | + this.lineCode = lineCode; | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + public String getSectionCode() { | ||
| 59 | + return sectionCode; | ||
| 60 | + } | ||
| 61 | + | ||
| 62 | + public void setSectionCode(String sectionCode) { | ||
| 63 | + this.sectionCode = sectionCode; | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + public Integer getVersions() { | ||
| 67 | + return versions; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + public void setVersions(Integer versions) { | ||
| 71 | + this.versions = versions; | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + public String getSectionName() { | ||
| 75 | + return sectionName; | ||
| 76 | + } | ||
| 77 | + | ||
| 78 | + public void setSectionName(String sectionName) { | ||
| 79 | + this.sectionName = sectionName; | ||
| 80 | + } | ||
| 81 | + | ||
| 82 | + public String getCrosesRoad() { | ||
| 83 | + return crosesRoad; | ||
| 84 | + } | ||
| 85 | + | ||
| 86 | + public void setCrosesRoad(String crosesRoad) { | ||
| 87 | + this.crosesRoad = crosesRoad; | ||
| 88 | + } | ||
| 89 | + | ||
| 90 | + public String getGsectionVector() { | ||
| 91 | + return gsectionVector; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + public void setGsectionVector(String gsectionVector) { | ||
| 95 | + this.gsectionVector = gsectionVector; | ||
| 96 | + } | ||
| 97 | +} |
src/main/java/com/bsth/entity/geo_data/GeoStation.java
| @@ -7,4 +7,131 @@ public class GeoStation { | @@ -7,4 +7,131 @@ public class GeoStation { | ||
| 7 | 7 | ||
| 8 | private int id; | 8 | private int id; |
| 9 | 9 | ||
| 10 | + private String stationName; | ||
| 11 | + | ||
| 12 | + private String stationRouteCode; | ||
| 13 | + | ||
| 14 | + private String lineCode; | ||
| 15 | + | ||
| 16 | + private Integer directions; | ||
| 17 | + | ||
| 18 | + private String stationCode; | ||
| 19 | + | ||
| 20 | + private String stationMark; | ||
| 21 | + | ||
| 22 | + private Integer version; | ||
| 23 | + | ||
| 24 | + private Float gLonx; | ||
| 25 | + | ||
| 26 | + private Float gLaty; | ||
| 27 | + | ||
| 28 | + private String gPolygonGrid; | ||
| 29 | + | ||
| 30 | + private Integer radius; | ||
| 31 | + | ||
| 32 | + private String shapesType; | ||
| 33 | + | ||
| 34 | + public int getId() { | ||
| 35 | + return id; | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + public void setId(int id) { | ||
| 39 | + this.id = id; | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + public String getStationName() { | ||
| 43 | + return stationName; | ||
| 44 | + } | ||
| 45 | + | ||
| 46 | + public void setStationName(String stationName) { | ||
| 47 | + this.stationName = stationName; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + public String getStationRouteCode() { | ||
| 51 | + return stationRouteCode; | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | + public void setStationRouteCode(String stationRouteCode) { | ||
| 55 | + this.stationRouteCode = stationRouteCode; | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + public String getLineCode() { | ||
| 59 | + return lineCode; | ||
| 60 | + } | ||
| 61 | + | ||
| 62 | + public void setLineCode(String lineCode) { | ||
| 63 | + this.lineCode = lineCode; | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + public Integer getDirections() { | ||
| 67 | + return directions; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + public void setDirections(Integer directions) { | ||
| 71 | + this.directions = directions; | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + public String getStationCode() { | ||
| 75 | + return stationCode; | ||
| 76 | + } | ||
| 77 | + | ||
| 78 | + public void setStationCode(String stationCode) { | ||
| 79 | + this.stationCode = stationCode; | ||
| 80 | + } | ||
| 81 | + | ||
| 82 | + public String getStationMark() { | ||
| 83 | + return stationMark; | ||
| 84 | + } | ||
| 85 | + | ||
| 86 | + public void setStationMark(String stationMark) { | ||
| 87 | + this.stationMark = stationMark; | ||
| 88 | + } | ||
| 89 | + | ||
| 90 | + public Integer getVersion() { | ||
| 91 | + return version; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + public void setVersion(Integer version) { | ||
| 95 | + this.version = version; | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + public Float getgLonx() { | ||
| 99 | + return gLonx; | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | + public void setgLonx(Float gLonx) { | ||
| 103 | + this.gLonx = gLonx; | ||
| 104 | + } | ||
| 105 | + | ||
| 106 | + public Float getgLaty() { | ||
| 107 | + return gLaty; | ||
| 108 | + } | ||
| 109 | + | ||
| 110 | + public void setgLaty(Float gLaty) { | ||
| 111 | + this.gLaty = gLaty; | ||
| 112 | + } | ||
| 113 | + | ||
| 114 | + public String getgPolygonGrid() { | ||
| 115 | + return gPolygonGrid; | ||
| 116 | + } | ||
| 117 | + | ||
| 118 | + public void setgPolygonGrid(String gPolygonGrid) { | ||
| 119 | + this.gPolygonGrid = gPolygonGrid; | ||
| 120 | + } | ||
| 121 | + | ||
| 122 | + public Integer getRadius() { | ||
| 123 | + return radius; | ||
| 124 | + } | ||
| 125 | + | ||
| 126 | + public void setRadius(Integer radius) { | ||
| 127 | + this.radius = radius; | ||
| 128 | + } | ||
| 129 | + | ||
| 130 | + public String getShapesType() { | ||
| 131 | + return shapesType; | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + public void setShapesType(String shapesType) { | ||
| 135 | + this.shapesType = shapesType; | ||
| 136 | + } | ||
| 10 | } | 137 | } |
src/main/java/com/bsth/service/geo_data/GeoDataService.java
| 1 | package com.bsth.service.geo_data; | 1 | package com.bsth.service.geo_data; |
| 2 | 2 | ||
| 3 | +import java.util.Map; | ||
| 4 | + | ||
| 3 | /** | 5 | /** |
| 4 | * Created by panzhao on 2017/12/7. | 6 | * Created by panzhao on 2017/12/7. |
| 5 | */ | 7 | */ |
| 6 | public interface GeoDataService { | 8 | public interface GeoDataService { |
| 7 | 9 | ||
| 8 | 10 | ||
| 11 | + Map<String, Object> findGeoStations(String lineCode); | ||
| 12 | + | ||
| 13 | + | ||
| 14 | + Map<String, Object> findGeoRoad(String lineCode); | ||
| 9 | } | 15 | } |
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
0 → 100644
| 1 | +package com.bsth.service.geo_data.impl; | ||
| 2 | + | ||
| 3 | +import com.bsth.common.ResponseCode; | ||
| 4 | +import com.bsth.entity.geo_data.GeoRoad; | ||
| 5 | +import com.bsth.entity.geo_data.GeoStation; | ||
| 6 | +import com.bsth.service.geo_data.GeoDataService; | ||
| 7 | +import org.slf4j.Logger; | ||
| 8 | +import org.slf4j.LoggerFactory; | ||
| 9 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 10 | +import org.springframework.jdbc.core.BeanPropertyRowMapper; | ||
| 11 | +import org.springframework.jdbc.core.JdbcTemplate; | ||
| 12 | +import org.springframework.stereotype.Service; | ||
| 13 | + | ||
| 14 | +import java.util.HashMap; | ||
| 15 | +import java.util.List; | ||
| 16 | +import java.util.Map; | ||
| 17 | + | ||
| 18 | +/** | ||
| 19 | + * Created by panzhao on 2017/12/8. | ||
| 20 | + */ | ||
| 21 | +@Service | ||
| 22 | +public class GeoDataServiceImpl implements GeoDataService { | ||
| 23 | + | ||
| 24 | + @Autowired | ||
| 25 | + JdbcTemplate jdbcTemplate; | ||
| 26 | + | ||
| 27 | + Logger logger = LoggerFactory.getLogger(this.getClass()); | ||
| 28 | + | ||
| 29 | + @Override | ||
| 30 | + public Map<String, Object> findGeoStations(String lineCode) { | ||
| 31 | + | ||
| 32 | + Map<String, Object> map = new HashMap(); | ||
| 33 | + try{ | ||
| 34 | + String sql = "select t1.*,t2.g_lonx,g_laty,ST_AsText(g_polygon_grid) as g_polygon_grid,radius,shapes_type from (select id,station_name,station_route_code,line_code,station_code,station_mark,versions,directions from bsth_c_ls_stationroute where line="+lineCode+" and destroy=0 and versions in (select DISTINCT versions from bsth_c_stationroute where line="+lineCode+" and destroy=0)) t1 LEFT JOIN bsth_c_station t2 on t1.station_code=t2.station_cod"; | ||
| 35 | + | ||
| 36 | + | ||
| 37 | + List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class)); | ||
| 38 | + | ||
| 39 | + map.put("status", ResponseCode.SUCCESS); | ||
| 40 | + map.put("list", list); | ||
| 41 | + }catch (Exception e){ | ||
| 42 | + logger.error("", e); | ||
| 43 | + map.put("status", ResponseCode.ERROR); | ||
| 44 | + map.put("msg", "服务器出现异常"); | ||
| 45 | + } | ||
| 46 | + return map; | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + @Override | ||
| 50 | + public Map<String, Object> findGeoRoad(String lineCode) { | ||
| 51 | + Map<String, Object> map = new HashMap(); | ||
| 52 | + try{ | ||
| 53 | + String sql = "select t1.*,t2.section_name,t2.croses_road,ST_AsText(t2.gsection_vector) as gsection_vector from (select id,sectionroute_code,directions,line_code,section_code,versions from bsth_c_ls_sectionroute where line="+lineCode+" and destroy=0 and versions in (select DISTINCT versions from bsth_c_sectionroute where line="+lineCode+" and destroy=0)) t1 LEFT JOIN bsth_c_section t2 on t1.section_code=t2.section_code"; | ||
| 54 | + | ||
| 55 | + | ||
| 56 | + List<GeoRoad> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoRoad.class)); | ||
| 57 | + | ||
| 58 | + map.put("status", ResponseCode.SUCCESS); | ||
| 59 | + map.put("list", list); | ||
| 60 | + }catch (Exception e){ | ||
| 61 | + logger.error("", e); | ||
| 62 | + map.put("status", ResponseCode.ERROR); | ||
| 63 | + map.put("msg", "服务器出现异常"); | ||
| 64 | + } | ||
| 65 | + return map; | ||
| 66 | + } | ||
| 67 | +} |
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
| @@ -113,6 +113,7 @@ div#map_wrap{ | @@ -113,6 +113,7 @@ div#map_wrap{ | ||
| 113 | } | 113 | } |
| 114 | ._route_info_wrap>ul.uk-tab{ | 114 | ._route_info_wrap>ul.uk-tab{ |
| 115 | padding-left: 10px; | 115 | padding-left: 10px; |
| 116 | + margin-bottom: 0; | ||
| 116 | } | 117 | } |
| 117 | .rt_show_version_txt{ | 118 | .rt_show_version_txt{ |
| 118 | position: absolute; | 119 | position: absolute; |
| @@ -144,7 +145,7 @@ div#map_wrap{ | @@ -144,7 +145,7 @@ div#map_wrap{ | ||
| 144 | text-overflow: ellipsis; | 145 | text-overflow: ellipsis; |
| 145 | white-space: nowrap; | 146 | white-space: nowrap; |
| 146 | display: inline-block; | 147 | display: inline-block; |
| 147 | - width: calc(100% - 50px); | 148 | + width: calc(100% - 53px); |
| 148 | } | 149 | } |
| 149 | .ct_route_badge{ | 150 | .ct_route_badge{ |
| 150 | font-size: 11px; | 151 | font-size: 11px; |
| @@ -156,7 +157,6 @@ div#map_wrap{ | @@ -156,7 +157,6 @@ div#map_wrap{ | ||
| 156 | padding: 0 4px; | 157 | padding: 0 4px; |
| 157 | margin-right: 3px; | 158 | margin-right: 3px; |
| 158 | min-width: 18px; | 159 | min-width: 18px; |
| 159 | - margin-left: 22px; | ||
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | .ct_route_badge.start{ | 162 | .ct_route_badge.start{ |
| @@ -166,18 +166,20 @@ div#map_wrap{ | @@ -166,18 +166,20 @@ div#map_wrap{ | ||
| 166 | margin-left: 0px; | 166 | margin-left: 0px; |
| 167 | } | 167 | } |
| 168 | .road_route{ | 168 | .road_route{ |
| 169 | - padding-left: 25px; | 169 | + padding-left: 30px; |
| 170 | width: calc(100% - 25px); | 170 | width: calc(100% - 25px); |
| 171 | font-size: 14px; | 171 | font-size: 14px; |
| 172 | color: #242424; | 172 | color: #242424; |
| 173 | border-top: 1px solid #d5d5d5; | 173 | border-top: 1px solid #d5d5d5; |
| 174 | - padding-top: 10px; | 174 | + padding-top: 0; |
| 175 | } | 175 | } |
| 176 | ._route_info_wrap>ul.uk-switcher{ | 176 | ._route_info_wrap>ul.uk-switcher{ |
| 177 | overflow: auto; | 177 | overflow: auto; |
| 178 | height: calc(100% - 62px); | 178 | height: calc(100% - 62px); |
| 179 | margin-bottom: 0; | 179 | margin-bottom: 0; |
| 180 | position: relative; | 180 | position: relative; |
| 181 | + padding-top: 20px; | ||
| 182 | + margin-top: 0 !important; | ||
| 181 | } | 183 | } |
| 182 | 184 | ||
| 183 | ._route_info_wrap ul.uk-list li:nth-child(n+2) { | 185 | ._route_info_wrap ul.uk-list li:nth-child(n+2) { |
| @@ -187,4 +189,34 @@ div#map_wrap{ | @@ -187,4 +189,34 @@ div#map_wrap{ | ||
| 187 | position: absolute; | 189 | position: absolute; |
| 188 | bottom: 15px; | 190 | bottom: 15px; |
| 189 | right: 15px; | 191 | right: 15px; |
| 192 | +} | ||
| 193 | +.ct_route_badge_wrap{ | ||
| 194 | + display: inline-block; | ||
| 195 | + width: 48px; | ||
| 196 | + text-align: right; | ||
| 197 | + vertical-align: top; | ||
| 198 | +} | ||
| 199 | + | ||
| 200 | +.road_route>ul li a{ | ||
| 201 | + color: #242424; | ||
| 202 | +} | ||
| 203 | + | ||
| 204 | +.road_route>ul{ | ||
| 205 | + border-left: 1px solid #cbcbcb; | ||
| 206 | + padding-left: 10px; | ||
| 207 | + padding-top: 10px; | ||
| 208 | +} | ||
| 209 | + | ||
| 210 | +span.sub_name { | ||
| 211 | + font-size: 12px; | ||
| 212 | + color: #777676; | ||
| 213 | + margin-left: 5px; | ||
| 214 | +} | ||
| 215 | + | ||
| 216 | +.road_route>ul>li{ | ||
| 217 | + width: calc(100% - 10px); | ||
| 218 | + overflow: hidden; | ||
| 219 | + text-overflow: ellipsis; | ||
| 220 | + white-space: nowrap; | ||
| 221 | + display: inline-block; | ||
| 190 | } | 222 | } |
| 191 | \ No newline at end of file | 223 | \ No newline at end of file |
src/main/resources/static/pages/base/geo_data_edit/fragments/f_road_route.html
0 → 100644
| 1 | +<div> | ||
| 2 | + <script id="geo_d_e_road_route-temp" type="text/html"> | ||
| 3 | + <ul class="uk-list"> | ||
| 4 | + {{each list as subArr i}} | ||
| 5 | + <li> | ||
| 6 | + <a>{{subArr[0].sectionName}}<span class="sub_name">{{subArr[0].crosesRoad}}</span></a> | ||
| 7 | + | ||
| 8 | + {{if subArr.length > 1}} | ||
| 9 | + {{each subArr as obj j}} | ||
| 10 | + <ul class="uk-list"> | ||
| 11 | + {{if j > 0}} | ||
| 12 | + <li><a>{{obj.sectionName}}<span class="sub_name">{{obj.crosesRoad}}</span></a></li> | ||
| 13 | + {{/if}} | ||
| 14 | + </ul> | ||
| 15 | + {{/each}} | ||
| 16 | + {{/if}} | ||
| 17 | + </li> | ||
| 18 | + {{/each}} | ||
| 19 | + </ul> | ||
| 20 | + </script> | ||
| 21 | +</div> | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file |
src/main/resources/static/pages/base/geo_data_edit/fragments/f_station_route.html
0 → 100644
| 1 | +<div> | ||
| 2 | + <script id="geo_d_e_station_route-temp" type="text/html"> | ||
| 3 | + <ul class="uk-list"> | ||
| 4 | + {{each list as s i}} | ||
| 5 | + <li> | ||
| 6 | + <div class="ct_route_badge_wrap"> | ||
| 7 | + <span class="uk-badge ct_route_badge {{if s.stationMark=='B'}}start{{else if s.stationMark=='E'}}end{{/if}}"> | ||
| 8 | + {{if s.stationMark=='B'}}起点站{{else if s.stationMark=='E'}}终点站{{else}}{{i + 1}}{{/if}}</span> | ||
| 9 | + </div> | ||
| 10 | + <a>{{s.stationName}}</a> | ||
| 11 | + </li> | ||
| 12 | + {{/each}} | ||
| 13 | + </ul> | ||
| 14 | + </script> | ||
| 15 | +</div> | ||
| 0 | \ No newline at end of file | 16 | \ No newline at end of file |
src/main/resources/static/pages/base/geo_data_edit/js/map.js
| @@ -19,8 +19,13 @@ var gb_ct_map = function () { | @@ -19,8 +19,13 @@ var gb_ct_map = function () { | ||
| 19 | map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13); | 19 | map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13); |
| 20 | map.enableScrollWheelZoom(); | 20 | map.enableScrollWheelZoom(); |
| 21 | 21 | ||
| 22 | - | 22 | + |
| 23 | + var _render = function () { | ||
| 24 | + | ||
| 25 | + }; | ||
| 23 | 26 | ||
| 24 | res_load_ep.emitLater('load_map'); | 27 | res_load_ep.emitLater('load_map'); |
| 25 | - return {}; | 28 | + return { |
| 29 | + _render: _render | ||
| 30 | + }; | ||
| 26 | }(); | 31 | }(); |
| 27 | \ No newline at end of file | 32 | \ No newline at end of file |
src/main/resources/static/pages/base/geo_data_edit/js/road_route.js
0 → 100644
| 1 | +<!-- 路段路由 --> | ||
| 2 | +var gb_road_route = function () { | ||
| 3 | + | ||
| 4 | + var temps; | ||
| 5 | + var road_maps; | ||
| 6 | + //绘制线路路由 | ||
| 7 | + var init = function () { | ||
| 8 | + var lineCode = storage.getItem("geo_data_edit_line_code"); | ||
| 9 | + | ||
| 10 | + var ep = EventProxy.create("data", "temp", function (data, temp) { | ||
| 11 | + road_maps = data; | ||
| 12 | + temps = temp; | ||
| 13 | + console.log('roads', road_maps); | ||
| 14 | + | ||
| 15 | + //按顺序,名称分组 | ||
| 16 | + var ups = _group(road_maps[0]); | ||
| 17 | + var downs = _group(road_maps[1]); | ||
| 18 | + console.log('upsupsups', ups, 'downsdownsdowns', downs); | ||
| 19 | + //渲染 | ||
| 20 | + var upHtmlStr = temps['geo_d_e_road_route-temp']({list: ups}); | ||
| 21 | + $('.up_down_route_list>li:first>.road_route').html(upHtmlStr); | ||
| 22 | + var downHtmlStr = temps['geo_d_e_road_route-temp']({list: downs}); | ||
| 23 | + $('.up_down_route_list>li:last>.road_route').html(downHtmlStr); | ||
| 24 | + }); | ||
| 25 | + | ||
| 26 | + //加载数据 | ||
| 27 | + gb_common.$get('/_geo_data/findGeoRoad', {lineCode: lineCode}, function (rs) { | ||
| 28 | + rs.list.sort(function (a, b) { | ||
| 29 | + return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode); | ||
| 30 | + }); | ||
| 31 | + ep.emit('data', gb_common.groupBy(rs.list, 'directions')); | ||
| 32 | + }); | ||
| 33 | + | ||
| 34 | + //加载模板片段 | ||
| 35 | + $.get('/pages/base/geo_data_edit/fragments/f_road_route.html', function (dom) { | ||
| 36 | + ep.emit('temp', gb_common.compileTempByDom(dom, { | ||
| 37 | + compress: true | ||
| 38 | + })); | ||
| 39 | + }); | ||
| 40 | + }; | ||
| 41 | + | ||
| 42 | + var _group = function (list) { | ||
| 43 | + var rs = [], tempArr=[]; | ||
| 44 | + | ||
| 45 | + var name; | ||
| 46 | + for(var i=0,obj;obj=list[i++];){ | ||
| 47 | + if(name && name!=obj.sectionName){ | ||
| 48 | + rs.push(tempArr); | ||
| 49 | + tempArr=[]; | ||
| 50 | + } | ||
| 51 | + tempArr.push(obj); | ||
| 52 | + name = obj.sectionName | ||
| 53 | + } | ||
| 54 | + return rs; | ||
| 55 | + }; | ||
| 56 | + | ||
| 57 | + res_load_ep.emitLater('load_road_route'); | ||
| 58 | + return {init: init}; | ||
| 59 | +}(); | ||
| 0 | \ No newline at end of file | 60 | \ No newline at end of file |
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
| 1 | <!-- 站点路由 --> | 1 | <!-- 站点路由 --> |
| 2 | var gb_station_route = function () { | 2 | var gb_station_route = function () { |
| 3 | 3 | ||
| 4 | + var temps; | ||
| 5 | + var station_maps; | ||
| 6 | + //绘制线路路由 | ||
| 7 | + var init = function () { | ||
| 8 | + var lineCode = storage.getItem("geo_data_edit_line_code"); | ||
| 9 | + | ||
| 10 | + var ep = EventProxy.create("data", "temp", function (data, temp) { | ||
| 11 | + station_maps = data; | ||
| 12 | + temps = temp; | ||
| 13 | + console.log('station', station_maps); | ||
| 14 | + //渲染页面 | ||
| 15 | + var upHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[0]}); | ||
| 16 | + $('.up_down_route_list>li:first>.station_route').html(upHtmlStr); | ||
| 17 | + var downHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[1]}); | ||
| 18 | + $('.up_down_route_list>li:last>.station_route').html(downHtmlStr); | ||
| 19 | + }); | ||
| 20 | + | ||
| 21 | + //加载数据 | ||
| 22 | + gb_common.$get('/_geo_data/findGeoStations', {lineCode: lineCode}, function (rs) { | ||
| 23 | + rs.list.sort(function (a, b) { | ||
| 24 | + return parseInt(a.stationRouteCode) - parseInt(b.stationRouteCode); | ||
| 25 | + }); | ||
| 26 | + ep.emit('data', gb_common.groupBy(rs.list, 'directions')); | ||
| 27 | + }); | ||
| 28 | + | ||
| 29 | + //加载模板片段 | ||
| 30 | + $.get('/pages/base/geo_data_edit/fragments/f_station_route.html', function (dom) { | ||
| 31 | + ep.emit('temp', gb_common.compileTempByDom(dom, { | ||
| 32 | + compress: true | ||
| 33 | + })); | ||
| 34 | + }); | ||
| 35 | + }; | ||
| 36 | + | ||
| 4 | res_load_ep.emitLater('load_station_route'); | 37 | res_load_ep.emitLater('load_station_route'); |
| 5 | - return {}; | 38 | + return { |
| 39 | + init: init | ||
| 40 | + }; | ||
| 6 | }(); | 41 | }(); |
| 7 | \ No newline at end of file | 42 | \ No newline at end of file |
src/main/resources/static/pages/base/geo_data_edit/main.html
| @@ -54,70 +54,15 @@ | @@ -54,70 +54,15 @@ | ||
| 54 | </span> | 54 | </span> |
| 55 | </ul> | 55 | </ul> |
| 56 | 56 | ||
| 57 | - <ul class="uk-switcher uk-margin"> | 57 | + <ul class="uk-switcher uk-margin up_down_route_list"> |
| 58 | <li> | 58 | <li> |
| 59 | - <div class="station_route"> | ||
| 60 | - <ul class="uk-list"> | ||
| 61 | - <li><span class="uk-badge ct_route_badge start">起点站</span><a>陆家嘴</a></li> | ||
| 62 | - <li><span class="uk-badge ct_route_badge">2</span><a>陆家嘴环路丰和路</a></li> | ||
| 63 | - <li><span class="uk-badge ct_route_badge">3</span><a>浦东南路浦东大道</a></li> | ||
| 64 | - <li><span class="uk-badge ct_route_badge">4</span><a>浦东南路商城路</a></li> | ||
| 65 | - <li><span class="uk-badge ct_route_badge">5</span><a>浦东南路潍坊路</a></li> | ||
| 66 | - <li><span class="uk-badge ct_route_badge">6</span><a>浦东南路浦电路</a></li> | ||
| 67 | - <li><span class="uk-badge ct_route_badge">7</span><a>浦东南路宁阳路</a></li> | ||
| 68 | - <li><span class="uk-badge ct_route_badge">8</span><a>浦东南路浦建路</a></li> | ||
| 69 | - <li><span class="uk-badge ct_route_badge">9</span><a>浦东南路浦三路</a></li> | ||
| 70 | - <li><span class="uk-badge ct_route_badge">10</span><a>浦东南路高科西路(上海长途东站)</a></li> | ||
| 71 | - <li><span class="uk-badge ct_route_badge">11</span><a>浦东南路洪山路</a></li> | ||
| 72 | - <li><span class="uk-badge ct_route_badge">12</span><a>浦东南路上南路</a></li> | ||
| 73 | - <li><span class="uk-badge ct_route_badge">13</span><a>耀华路历城路</a></li> | ||
| 74 | - <li><span class="uk-badge ct_route_badge">14</span><a>耀华路长清路</a></li> | ||
| 75 | - <li><span class="uk-badge ct_route_badge">15</span><a>耀华路济阳路</a></li> | ||
| 76 | - <li><span class="uk-badge ct_route_badge end">终点站</span><a>通耀路耀龙路</a></li> | ||
| 77 | - </ul> | ||
| 78 | - </div> | ||
| 79 | - <div class="road_route"> | ||
| 80 | - <ul class="uk-list"> | ||
| 81 | - <li> | ||
| 82 | - (新浜)共青路 | ||
| 83 | - <ul class="uk-list"> | ||
| 84 | - <li>(新浜)共青路</li> | ||
| 85 | - <li>(新浜)共青路</li> | ||
| 86 | - <li>(新浜)共青路</li> | ||
| 87 | - <li>(新浜)共青路</li> | ||
| 88 | - </ul> | ||
| 89 | - </li> | ||
| 90 | - <li> | ||
| 91 | - (方松)三新路 | ||
| 92 | - <ul class="uk-list"> | ||
| 93 | - <li>(方松)三新路</li> | ||
| 94 | - <li>(方松)三新路</li> | ||
| 95 | - <li>(方松)三新路</li> | ||
| 96 | - <li>(方松)三新路</li> | ||
| 97 | - </ul> | ||
| 98 | - </li> | ||
| 99 | - <li> | ||
| 100 | - (松江)中山东路 | ||
| 101 | - <ul class="uk-list"> | ||
| 102 | - <li>(松江)中山东路</li> | ||
| 103 | - <li>(松江)中山东路</li> | ||
| 104 | - <li>(松江)中山东路</li> | ||
| 105 | - <li>(松江)中山东路</li> | ||
| 106 | - </ul> | ||
| 107 | - </li> | ||
| 108 | - <li> | ||
| 109 | - (松江)中山东路 | ||
| 110 | - <ul class="uk-list"> | ||
| 111 | - <li>(松江)中山东路</li> | ||
| 112 | - <li>(松江)中山东路</li> | ||
| 113 | - <li>(松江)中山东路</li> | ||
| 114 | - <li>(松江)中山东路</li> | ||
| 115 | - </ul> | ||
| 116 | - </li> | ||
| 117 | - </ul> | ||
| 118 | - </div> | 59 | + <div class="station_route"></div> |
| 60 | + <div class="road_route"></div> | ||
| 61 | + </li> | ||
| 62 | + <li> | ||
| 63 | + <div class="station_route"></div> | ||
| 64 | + <div class="road_route"></div> | ||
| 119 | </li> | 65 | </li> |
| 120 | - <li></li> | ||
| 121 | </ul> | 66 | </ul> |
| 122 | <div class="pos_tb_icon"> | 67 | <div class="pos_tb_icon"> |
| 123 | <a uk-icon="icon: chevron-down;"></a> | 68 | <a uk-icon="icon: chevron-down;"></a> |
| @@ -153,9 +98,15 @@ | @@ -153,9 +98,15 @@ | ||
| 153 | <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script> | 98 | <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script> |
| 154 | <!-- qtip --> | 99 | <!-- qtip --> |
| 155 | <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script> | 100 | <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script> |
| 156 | - | 101 | +<!-- common js --> |
| 102 | +<script src="/real_control_v2/js/common.js"></script> | ||
| 157 | 103 | ||
| 158 | <script> | 104 | <script> |
| 105 | + //___________________________________ | ||
| 106 | + var storage = window.localStorage; | ||
| 107 | + storage.setItem("geo_data_edit_line_code" , "12040"); | ||
| 108 | + //___________________________________ | ||
| 109 | + | ||
| 159 | top.document.title = "绘制线路"; | 110 | top.document.title = "绘制线路"; |
| 160 | // 关闭左侧栏 | 111 | // 关闭左侧栏 |
| 161 | if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();} | 112 | if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();} |
| @@ -166,10 +117,15 @@ | @@ -166,10 +117,15 @@ | ||
| 166 | 117 | ||
| 167 | 118 | ||
| 168 | //文件加载 | 119 | //文件加载 |
| 169 | - var res_load_ep = EventProxy.create('load_common_data', 'load_station_route' | 120 | + var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route' |
| 170 | , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () { | 121 | , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () { |
| 171 | 122 | ||
| 172 | UIkit.notification('加载完成!!'); | 123 | UIkit.notification('加载完成!!'); |
| 124 | + | ||
| 125 | + //站点路由 | ||
| 126 | + gb_station_route.init(); | ||
| 127 | + //路段路由 | ||
| 128 | + gb_road_route.init(); | ||
| 173 | }); | 129 | }); |
| 174 | 130 | ||
| 175 | //滚动条 | 131 | //滚动条 |
| @@ -184,6 +140,7 @@ | @@ -184,6 +140,7 @@ | ||
| 184 | <!--- js --> | 140 | <!--- js --> |
| 185 | <script src="/pages/base/geo_data_edit/js/common_data.js" ></script> | 141 | <script src="/pages/base/geo_data_edit/js/common_data.js" ></script> |
| 186 | <script src="/pages/base/geo_data_edit/js/station_route.js" ></script> | 142 | <script src="/pages/base/geo_data_edit/js/station_route.js" ></script> |
| 143 | +<script src="/pages/base/geo_data_edit/js/road_route.js" ></script> | ||
| 187 | <script src="/pages/base/geo_data_edit/js/version_manage.js" ></script> | 144 | <script src="/pages/base/geo_data_edit/js/version_manage.js" ></script> |
| 188 | <script src="/pages/base/geo_data_edit/js/history_edit_logs.js" ></script> | 145 | <script src="/pages/base/geo_data_edit/js/history_edit_logs.js" ></script> |
| 189 | <script src="/pages/base/geo_data_edit/js/map.js" ></script> | 146 | <script src="/pages/base/geo_data_edit/js/map.js" ></script> |