Commit 900d59391e763788cd7fa47f759510ed1fbfd455
1 parent
91b935c9
1.嘉定图层控制面板需要伸缩的方式
Showing
3 changed files
with
28 additions
and
6 deletions
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
| @@ -172,7 +172,7 @@ input[type=checkbox].disabled{ | @@ -172,7 +172,7 @@ input[type=checkbox].disabled{ | ||
| 172 | .real_bottom_panel{ | 172 | .real_bottom_panel{ |
| 173 | 173 | ||
| 174 | position: absolute !important; | 174 | position: absolute !important; |
| 175 | - height: 192px; | 175 | + height: 384px; |
| 176 | bottom: 2px !important; | 176 | bottom: 2px !important; |
| 177 | background: #fff; | 177 | background: #fff; |
| 178 | box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); | 178 | box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); |
src/main/resources/static/real_control_v2/mapmonitor/js/real.js
| @@ -25,7 +25,7 @@ var mapmonitor_load_ep = EventProxy.create('load_iMap', 'load_baidu', 'load_gaod | @@ -25,7 +25,7 @@ var mapmonitor_load_ep = EventProxy.create('load_iMap', 'load_baidu', 'load_gaod | ||
| 25 | }); | 25 | }); |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | - var maxHeight=384, minHeight=124, threshold=8; | 28 | + /*var maxHeight=384, minHeight=124, threshold=8; |
| 29 | $(".real_bottom_panel").on('mousewheel', function (e) { | 29 | $(".real_bottom_panel").on('mousewheel', function (e) { |
| 30 | var event = e.originalEvent; | 30 | var event = e.originalEvent; |
| 31 | var code = delta = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3; | 31 | var code = delta = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3; |
| @@ -39,10 +39,32 @@ var mapmonitor_load_ep = EventProxy.create('load_iMap', 'load_baidu', 'load_gaod | @@ -39,10 +39,32 @@ var mapmonitor_load_ep = EventProxy.create('load_iMap', 'load_baidu', 'load_gaod | ||
| 39 | $(this).height(h<maxHeight?h:maxHeight); | 39 | $(this).height(h<maxHeight?h:maxHeight); |
| 40 | } | 40 | } |
| 41 | return false; | 41 | return false; |
| 42 | - }); | ||
| 43 | - | ||
| 44 | - $('.real_bottom_panel .telescopic').on('click', function () { | 42 | + });*/ |
| 45 | 43 | ||
| 44 | + var maxHeight = 384, minHeight = 24; | ||
| 45 | + $('.telescopic').on('click', function () { | ||
| 46 | + var height = $('.real_bottom_panel').height(), intervalId; | ||
| 47 | + if (height == minHeight) { | ||
| 48 | + intervalId = setInterval(() => { | ||
| 49 | + if (height < maxHeight) { | ||
| 50 | + height += 8; | ||
| 51 | + $('.real_bottom_panel').height(height); | ||
| 52 | + } else { | ||
| 53 | + $('.telescopic').html('<i class="uk-icon-angle-double-down"></i>'); | ||
| 54 | + clearInterval(intervalId); | ||
| 55 | + } | ||
| 56 | + }, 20); | ||
| 57 | + } else { | ||
| 58 | + intervalId = setInterval(() => { | ||
| 59 | + if (height > minHeight) { | ||
| 60 | + height -= 8; | ||
| 61 | + $('.real_bottom_panel').height(height); | ||
| 62 | + } else { | ||
| 63 | + $('.telescopic').html('<i class="uk-icon-angle-double-up"></i>'); | ||
| 64 | + clearInterval(intervalId); | ||
| 65 | + } | ||
| 66 | + }, 20); | ||
| 67 | + } | ||
| 46 | }); | 68 | }); |
| 47 | }); | 69 | }); |
| 48 | 70 |
src/main/resources/static/real_control_v2/mapmonitor/real.html
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | <!--<div id="handle" class="ui-resizable-handle ui-resizable-n"></div>--> | 30 | <!--<div id="handle" class="ui-resizable-handle ui-resizable-n"></div>--> |
| 31 | <div class="real_br_cont map_config_wrap"></div> | 31 | <div class="real_br_cont map_config_wrap"></div> |
| 32 | <div class="telescopic"> | 32 | <div class="telescopic"> |
| 33 | - <i class="uk-icon-angle-double-up"></i> | 33 | + <i class="uk-icon-angle-double-down"></i> |
| 34 | </div> | 34 | </div> |
| 35 | </div> | 35 | </div> |
| 36 | 36 |