Commit 08fe0ea4761c48dc651c374370f9c45b7619bd0a
1 parent
276f98ad
update...
Showing
3 changed files
with
9 additions
and
0 deletions
src/main/resources/static/pages/real/js/map.js
| @@ -14,6 +14,9 @@ var gb_real_gps_map = (function () { | @@ -14,6 +14,9 @@ var gb_real_gps_map = (function () { | ||
| 14 | 14 | ||
| 15 | if (stations) | 15 | if (stations) |
| 16 | drawLine(lineCode, upDown, stations); | 16 | drawLine(lineCode, upDown, stations); |
| 17 | + | ||
| 18 | + if (_realGpsArray) | ||
| 19 | + gb_real_gps_map.renderGps(_realGpsArray); | ||
| 17 | } | 20 | } |
| 18 | 21 | ||
| 19 | var drawLine = function (lineCode, upDown, data) { | 22 | var drawLine = function (lineCode, upDown, data) { |
src/main/resources/static/pages/real/js/svg.js
| @@ -118,6 +118,8 @@ var gb_real_gps_svg = (function () { | @@ -118,6 +118,8 @@ var gb_real_gps_svg = (function () { | ||
| 118 | 118 | ||
| 119 | var renderGps = function (rs) { | 119 | var renderGps = function (rs) { |
| 120 | var arr = rs.list; | 120 | var arr = rs.list; |
| 121 | + | ||
| 122 | + _realGpsArray = arr; | ||
| 121 | //排序 | 123 | //排序 |
| 122 | arr.sort(function (a, b) { | 124 | arr.sort(function (a, b) { |
| 123 | if (a.inOut == 2) | 125 | if (a.inOut == 2) |
src/main/resources/static/pages/real/main.html
| @@ -158,6 +158,7 @@ | @@ -158,6 +158,7 @@ | ||
| 158 | <script src="/pages/real/js/map.js"></script> | 158 | <script src="/pages/real/js/map.js"></script> |
| 159 | 159 | ||
| 160 | <script> | 160 | <script> |
| 161 | + var _realGpsArray; | ||
| 161 | (function () { | 162 | (function () { |
| 162 | var wrap = '#real_gps_data_page'; | 163 | var wrap = '#real_gps_data_page'; |
| 163 | 164 | ||
| @@ -251,6 +252,9 @@ | @@ -251,6 +252,9 @@ | ||
| 251 | $('.svg_charts svg').on('click', 'g.gps-wrap>rect', function () { | 252 | $('.svg_charts svg').on('click', 'g.gps-wrap>rect', function () { |
| 252 | var device = $(this).attr('_id').split('_')[1]; | 253 | var device = $(this).attr('_id').split('_')[1]; |
| 253 | 254 | ||
| 255 | + if (!$('.map_wrap', wrap).is(":visible")) | ||
| 256 | + $('[name=mapCheckbox]', wrap).trigger('click'); | ||
| 257 | + | ||
| 254 | gb_real_gps_map.focus(device); | 258 | gb_real_gps_map.focus(device); |
| 255 | }); | 259 | }); |
| 256 | })(); | 260 | })(); |