Commit de9ed3c993494e8170d9d71ef6bbe221523cfcf7
1 parent
f7946b7b
1.
Showing
4 changed files
with
7 additions
and
10 deletions
src/main/resources/static/index.html
| @@ -681,5 +681,9 @@ | @@ -681,5 +681,9 @@ | ||
| 681 | <!-- RSA加密 --> | 681 | <!-- RSA加密 --> |
| 682 | <script src="/assets/plugins/jsencrypt.min.js"></script> | 682 | <script src="/assets/plugins/jsencrypt.min.js"></script> |
| 683 | <script src="/assets/js/eventproxy.js"></script> | 683 | <script src="/assets/js/eventproxy.js"></script> |
| 684 | +<!-- 线路路由信息操作 --> | ||
| 685 | +<script src="/pages/base/stationroute/js/routes-operation.js"></script> | ||
| 686 | +<script src="/pages/base/stationroute/js/routes-service.js"></script> | ||
| 687 | +<script src="/assets/js/CoordinateConverter.js"></script> | ||
| 684 | </body> | 688 | </body> |
| 685 | </html> | 689 | </html> |
| 686 | \ No newline at end of file | 690 | \ No newline at end of file |
src/main/resources/static/pages/base/stationroute/js/routes-operation.js
| @@ -2162,7 +2162,7 @@ var RoutesOperation = (function () { | @@ -2162,7 +2162,7 @@ var RoutesOperation = (function () { | ||
| 2162 | $('#inout_carpark_tree').show(); | 2162 | $('#inout_carpark_tree').show(); |
| 2163 | $('#InoutCarparktreeMobal .table-toolbar').show(); | 2163 | $('#InoutCarparktreeMobal .table-toolbar').show(); |
| 2164 | 2164 | ||
| 2165 | - RoutesService.getRouteByStartEnd(id, version, start[0], end[0], (result1) => { | 2165 | + RoutesService.getRouteByStartEnd(id, version, start[0], end[0], function (result1) { |
| 2166 | var routes = result1.data.routes, rootNode; | 2166 | var routes = result1.data.routes, rootNode; |
| 2167 | operation.clearMarkAndOverlays(); | 2167 | operation.clearMarkAndOverlays(); |
| 2168 | var startPoint = name2Point[start.join('_')], endPoint = name2Point[end.join('_')], point, points; | 2168 | var startPoint = name2Point[start.join('_')], endPoint = name2Point[end.join('_')], point, points; |
| @@ -2825,5 +2825,3 @@ var RoutesOperation = (function () { | @@ -2825,5 +2825,3 @@ var RoutesOperation = (function () { | ||
| 2825 | 2825 | ||
| 2826 | return operation; | 2826 | return operation; |
| 2827 | })() | 2827 | })() |
| 2828 | - | ||
| 2829 | -proxy.emit('routes-operation-loaded'); |
src/main/resources/static/pages/base/stationroute/js/routes-service.js
| @@ -414,6 +414,4 @@ var RoutesService = (function(){ | @@ -414,6 +414,4 @@ var RoutesService = (function(){ | ||
| 414 | }; | 414 | }; |
| 415 | 415 | ||
| 416 | return service; | 416 | return service; |
| 417 | -})(); | ||
| 418 | - | ||
| 419 | -proxy.emit('routes-service-loaded'); | ||
| 420 | \ No newline at end of file | 417 | \ No newline at end of file |
| 418 | +})(); | ||
| 421 | \ No newline at end of file | 419 | \ No newline at end of file |
src/main/resources/static/pages/base/stationroute/list.html
| @@ -408,9 +408,6 @@ | @@ -408,9 +408,6 @@ | ||
| 408 | </div> | 408 | </div> |
| 409 | </div> | 409 | </div> |
| 410 | </div> | 410 | </div> |
| 411 | -<script src="/pages/base/stationroute/js/routes-operation.js"></script> | ||
| 412 | -<script src="/pages/base/stationroute/js/routes-service.js"></script> | ||
| 413 | - | ||
| 414 | 411 | ||
| 415 | <script id="add_draw_polyline-temp" type="text/html"> | 412 | <script id="add_draw_polyline-temp" type="text/html"> |
| 416 | <div class="add_road_search_point_wrap "> | 413 | <div class="add_road_search_point_wrap "> |
| @@ -491,7 +488,7 @@ | @@ -491,7 +488,7 @@ | ||
| 491 | {{/if}} | 488 | {{/if}} |
| 492 | </script> | 489 | </script> |
| 493 | <script type="text/javascript"> | 490 | <script type="text/javascript"> |
| 494 | - var proxy = EventProxy.create('routes-operation-loaded', 'routes-service-loaded', function() { | 491 | + $(document).ready(function () { |
| 495 | RoutesOperation.initPage(); | 492 | RoutesOperation.initPage(); |
| 496 | RoutesOperation.initMap(); | 493 | RoutesOperation.initMap(); |
| 497 | RoutesOperation.initStationDrawingManager(); | 494 | RoutesOperation.initStationDrawingManager(); |