Commit 8cc146af1723347de710b679c39d5b83f48a96b4
1 parent
dc0c4d85
update...
Showing
2 changed files
with
54 additions
and
6 deletions
src/main/resources/static/real_control_v2/css/main.css
| 1 | +input::-webkit-outer-spin-button, | ||
| 2 | +input::-webkit-inner-spin-button{ | ||
| 3 | + display: none; | ||
| 4 | +} | ||
| 5 | + | ||
| 6 | +input::-webkit-calendar-picker-indicator { | ||
| 7 | + display: none; | ||
| 8 | +} | ||
| 9 | + | ||
| 10 | +input::-webkit-datetime-edit { padding: 1px; } | ||
| 1 | 11 | ||
| 2 | .ps-container > .ps-scrollbar-y-rail{ | 12 | .ps-container > .ps-scrollbar-y-rail{ |
| 3 | z-index: 1 !important; | 13 | z-index: 1 !important; |
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
| @@ -32,14 +32,14 @@ | @@ -32,14 +32,14 @@ | ||
| 32 | <div class="uk-form-row"> | 32 | <div class="uk-form-row"> |
| 33 | <label class="uk-form-label">开始时间</label> | 33 | <label class="uk-form-label">开始时间</label> |
| 34 | <div class="uk-form-controls"> | 34 | <div class="uk-form-controls"> |
| 35 | - <input name="sDate" type="date" required/> | 35 | + <input name="sDate" type="date" style="width: 100%;" required/> |
| 36 | </div> | 36 | </div> |
| 37 | </div> | 37 | </div> |
| 38 | </div> | 38 | </div> |
| 39 | <div class="uk-width-1-3" style="padding-left: 15px;"> | 39 | <div class="uk-width-1-3" style="padding-left: 15px;"> |
| 40 | <div class="uk-form-row"> | 40 | <div class="uk-form-row"> |
| 41 | <div class="uk-form-controls" style="margin-left: 0;"> | 41 | <div class="uk-form-controls" style="margin-left: 0;"> |
| 42 | - <input name="sTime" type="time" required/> | 42 | + <input name="sTime" type="time" style="width: calc(100% - 28px);" required/> |
| 43 | </div> | 43 | </div> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| @@ -49,14 +49,14 @@ | @@ -49,14 +49,14 @@ | ||
| 49 | <div class="uk-form-row"> | 49 | <div class="uk-form-row"> |
| 50 | <label class="uk-form-label">结束时间</label> | 50 | <label class="uk-form-label">结束时间</label> |
| 51 | <div class="uk-form-controls"> | 51 | <div class="uk-form-controls"> |
| 52 | - <input name="eDate" type="date" required/> | 52 | + <input name="eDate" type="date" style="width: 100%;" required/> |
| 53 | </div> | 53 | </div> |
| 54 | </div> | 54 | </div> |
| 55 | </div> | 55 | </div> |
| 56 | <div class="uk-width-1-3" style="padding-left: 15px;"> | 56 | <div class="uk-width-1-3" style="padding-left: 15px;"> |
| 57 | <div class="uk-form-row"> | 57 | <div class="uk-form-row"> |
| 58 | <div class="uk-form-controls" style="margin-left: 0;"> | 58 | <div class="uk-form-controls" style="margin-left: 0;"> |
| 59 | - <input name="eTime" type="time" required/> | 59 | + <input name="eTime" type="time" style="width: calc(100% - 28px);" required/> |
| 60 | </div> | 60 | </div> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| @@ -183,6 +183,16 @@ | @@ -183,6 +183,16 @@ | ||
| 183 | <span class="ct_btn text-panel"> | 183 | <span class="ct_btn text-panel"> |
| 184 | <span>共约 <span class="sum_mileage"></span> 公里,<span class="count_point"></span> 个GPS点</span><br> | 184 | <span>共约 <span class="sum_mileage"></span> 公里,<span class="count_point"></span> 个GPS点</span><br> |
| 185 | <a class="export-excel"><i class="uk-icon-file-excel-o"></i> 导出轨迹</a> | 185 | <a class="export-excel"><i class="uk-icon-file-excel-o"></i> 导出轨迹</a> |
| 186 | + | ||
| 187 | + <label> | ||
| 188 | + <div class="uk-button-dropdown" data-uk-dropdown> | ||
| 189 | + <a style="color: grey;margin-left: 12px;font-size: 12px;">线路底图 <i class="uk-icon-angle-down"></i></a> | ||
| 190 | + <div class="uk-dropdown uk-dropdown-scrollable" style="max-height: 300px;"> | ||
| 191 | + <ul class="uk-nav uk-nav-dropdown line_route_list"> | ||
| 192 | + </ul> | ||
| 193 | + </div> | ||
| 194 | + </div> | ||
| 195 | + </label> | ||
| 186 | </span> | 196 | </span> |
| 187 | </div> | 197 | </div> |
| 188 | <div class="ct-progress-bar" > | 198 | <div class="ct-progress-bar" > |
| @@ -294,6 +304,20 @@ | @@ -294,6 +304,20 @@ | ||
| 294 | $.get('/basic/cars', function (rs) { | 304 | $.get('/basic/cars', function (rs) { |
| 295 | gb_common.carAutocomplete($('.autocomplete-nbbm', modal), rs); | 305 | gb_common.carAutocomplete($('.autocomplete-nbbm', modal), rs); |
| 296 | }); | 306 | }); |
| 307 | + | ||
| 308 | + //初始化线路底图下拉 | ||
| 309 | + var opts=''; | ||
| 310 | + $.each(gb_data_basic.activeLines, function () { | ||
| 311 | + opts+='<li data-code="'+this.lineCode+'" data-dir="0"><a>'+this.name+'上行</a></li><li data-code="'+this.lineCode+'" data-dir="1"><a>'+this.name+'下行</a></li>'; | ||
| 312 | + }); | ||
| 313 | + $('.line_route_list', modal).html(opts); | ||
| 314 | + }); | ||
| 315 | + | ||
| 316 | + //切换线路底图 | ||
| 317 | + $(modal).on('click', '.line_route_list li', function () { | ||
| 318 | + var code = $(this).data('code'); | ||
| 319 | + var updown = $(this).data('dir'); | ||
| 320 | + mapObj.changeLine(code, updown); | ||
| 297 | }); | 321 | }); |
| 298 | 322 | ||
| 299 | /** | 323 | /** |
| @@ -730,7 +754,7 @@ | @@ -730,7 +754,7 @@ | ||
| 730 | //中心点和缩放级别 | 754 | //中心点和缩放级别 |
| 731 | map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16); | 755 | map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16); |
| 732 | map.enableScrollWheelZoom(); | 756 | map.enableScrollWheelZoom(); |
| 733 | - } | 757 | + }; |
| 734 | 758 | ||
| 735 | var storage = window.localStorage; | 759 | var storage = window.localStorage; |
| 736 | var routes;//路段 | 760 | var routes;//路段 |
| @@ -985,6 +1009,19 @@ | @@ -985,6 +1009,19 @@ | ||
| 985 | if(!markerIsVisible) | 1009 | if(!markerIsVisible) |
| 986 | map.panTo(gpsMarker.getPosition()); | 1010 | map.panTo(gpsMarker.getPosition()); |
| 987 | }; | 1011 | }; |
| 1012 | + | ||
| 1013 | + /** | ||
| 1014 | + * 切换线路底图 | ||
| 1015 | + */ | ||
| 1016 | + var changeLine = function (lineCode, updown) { | ||
| 1017 | + //reset(); | ||
| 1018 | + //从地图模块获取站点数据 | ||
| 1019 | + stations = gb_map_spatial_data.getStationArray(lineCode); | ||
| 1020 | + //从localStorage 获取路段 | ||
| 1021 | + routes = JSON.parse(storage.getItem(lineCode + '_route')); | ||
| 1022 | + routes = [routes.up_bd, routes.down_bd]; | ||
| 1023 | + switchPolyline(lineCode, updown); | ||
| 1024 | + }; | ||
| 988 | return { | 1025 | return { |
| 989 | initData: initData, | 1026 | initData: initData, |
| 990 | updateCar: updateCar, | 1027 | updateCar: updateCar, |
| @@ -992,7 +1029,8 @@ | @@ -992,7 +1029,8 @@ | ||
| 992 | updateTrailLine: updateTrailLine, | 1029 | updateTrailLine: updateTrailLine, |
| 993 | refreshOverlay: switchPolyline, | 1030 | refreshOverlay: switchPolyline, |
| 994 | toCenterByBounds: toCenterByBounds, | 1031 | toCenterByBounds: toCenterByBounds, |
| 995 | - reset: reset | 1032 | + reset: reset, |
| 1033 | + changeLine: changeLine | ||
| 996 | } | 1034 | } |
| 997 | })(); | 1035 | })(); |
| 998 | 1036 |