Commit b00c27fb910e095e787043a1b9b97bced2ba92b1
1 parent
5806aff7
Signed-off-by: yrf123456 <463058651@qq.com>
Showing
2 changed files
with
57 additions
and
43 deletions
src/main/resources/static/pages/base/line/css/bmap_base.css
| @@ -14,15 +14,24 @@ html,body{ | @@ -14,15 +14,24 @@ html,body{ | ||
| 14 | 14 | ||
| 15 | .caption { | 15 | .caption { |
| 16 | color: #B7B7B7; | 16 | color: #B7B7B7; |
| 17 | - font-size: 18px; | ||
| 18 | - | 17 | + font-size: 18px; |
| 19 | position: relative; | 18 | position: relative; |
| 20 | - margin: 15px; | ||
| 21 | - | 19 | + margin: 15px; |
| 22 | font-family: 微软; | 20 | font-family: 微软; |
| 23 | } | 21 | } |
| 24 | 22 | ||
| 25 | -.cut-section{ position:absolute; right:40px; top:50px; background:#12527f; width:320px;max-height: 700px;min-height: 300px;} | 23 | +.cut-section{ |
| 24 | + position:absolute; | ||
| 25 | + right:40px; | ||
| 26 | + top:50px; | ||
| 27 | + background:#12527f; | ||
| 28 | + width:320px; | ||
| 29 | + max-height: 700px; | ||
| 30 | + min-height: 300px; | ||
| 31 | + border:0px solid; | ||
| 32 | + border-radius: 10px !important; | ||
| 33 | + box-shadow: 10px 10px 5px #888888; | ||
| 34 | +} | ||
| 26 | 35 | ||
| 27 | .rm3_image { | 36 | .rm3_image { |
| 28 | width: 120px; | 37 | width: 120px; |
| @@ -44,3 +53,38 @@ html,body{ | @@ -44,3 +53,38 @@ html,body{ | ||
| 44 | box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important; | 53 | box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important; |
| 45 | 54 | ||
| 46 | } | 55 | } |
| 56 | + | ||
| 57 | +.defeat-scroll { | ||
| 58 | +width: 98%; | ||
| 59 | +height:380px; | ||
| 60 | +/* overflow:auto; */ | ||
| 61 | +overflow:hidden; | ||
| 62 | +} | ||
| 63 | +.defeat-scroll::-webkit-scrollbar { | ||
| 64 | +width:6px; | ||
| 65 | +height:6px; | ||
| 66 | +} | ||
| 67 | +.defeat-scroll::-webkit-scrollbar-button { | ||
| 68 | +/* background-color:#FF7677; */ | ||
| 69 | +background:rgba(255, 255, 255, 0); | ||
| 70 | +} | ||
| 71 | +.defeat-scroll::-webkit-scrollbar-track { | ||
| 72 | +/* background:#FF66D5; */ | ||
| 73 | +background:rgba(255, 255, 255, 0); | ||
| 74 | +} | ||
| 75 | +.defeat-scroll::-webkit-scrollbar-track-piece { | ||
| 76 | +/* background:#ff0000; */ | ||
| 77 | +background:rgba(255, 255, 255, 0); | ||
| 78 | +} | ||
| 79 | +.defeat-scroll::-webkit-scrollbar-thumb{ | ||
| 80 | +background:rgba(197, 196, 196, 0.81); | ||
| 81 | +border-radius:10px !important; | ||
| 82 | +} | ||
| 83 | +.defeat-scroll::-webkit-scrollbar-corner { | ||
| 84 | +/* background:#82AFFF; */ | ||
| 85 | +background:rgba(255, 255, 255, 0); | ||
| 86 | +} | ||
| 87 | +.defeat-scroll::-webkit-scrollbar-resizer { | ||
| 88 | +/* background:#FF0BEE; */ | ||
| 89 | +background:rgba(255, 255, 255, 0); | ||
| 90 | +} |
src/main/resources/static/pages/base/line/map.html
| @@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
| 2 | <div class="portlet-body"> | 2 | <div class="portlet-body"> |
| 3 | <!-- 地图 --> | 3 | <!-- 地图 --> |
| 4 | <div id="bmap_basic" class="bmaps"></div> | 4 | <div id="bmap_basic" class="bmaps"></div> |
| 5 | - | ||
| 6 | - <div class="cut-section"> | 5 | + <!-- 右边显示栏 --> |
| 6 | + <div class="cut-section" id="scrllmouseEvent_div"> | ||
| 7 | <div class="portlet-title" > | 7 | <div class="portlet-title" > |
| 8 | <div class="caption" > | 8 | <div class="caption" > |
| 9 | 途径站点 | 9 | 途径站点 |
| @@ -31,42 +31,6 @@ | @@ -31,42 +31,6 @@ | ||
| 31 | </div> | 31 | </div> |
| 32 | </div> | 32 | </div> |
| 33 | </div> | 33 | </div> |
| 34 | - | ||
| 35 | - <div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;"> | ||
| 36 | - 左边标题栏 | ||
| 37 | - <div class="portlet-title" style="background-color:#12527f;"> | ||
| 38 | - <div class="caption"> | ||
| 39 | - 途径站点 | ||
| 40 | - </div> | ||
| 41 | - <div class="tools"> | ||
| 42 | - <a href="javascript:;" class="collapse" data-original-title="" title=""> </a> | ||
| 43 | - </div> | ||
| 44 | - </div> | ||
| 45 | - 左边栏 | ||
| 46 | - <div class="portlet-body" id="scrllmouseEvent" style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 300px"> | ||
| 47 | - <div class="row"> | ||
| 48 | - <div class="portlet-body"> | ||
| 49 | - <div class="table-toolbar" style="text-align:center;"> | ||
| 50 | - <button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button> | ||
| 51 | - <button class="btn btn-circle blue hidden" id="cutSection"><i class="fa fa-level-up"></i> 提交路段</button> | ||
| 52 | - <button class="btn btn-circle blue hidden" id="Undo"><i class="fa fa-remove"></i> 撤销切点</button> | ||
| 53 | - </div> | ||
| 54 | - <div class="portlet-body" > | ||
| 55 | - <div class="defeat-scroll" style="height: auto;max-height: 400px;overflow-y:auto;"> | ||
| 56 | - <table class="table table-striped table-bordered table-hover table-checkable " id="section_table"> | ||
| 57 | - <thead> | ||
| 58 | - <tr role="row" class="heading"> | ||
| 59 | - <th >已截取路段</th> | ||
| 60 | - </tr> | ||
| 61 | - </thead> | ||
| 62 | - <tbody ></tbody> | ||
| 63 | - </table> | ||
| 64 | - </div> | ||
| 65 | - </div> | ||
| 66 | - </div> | ||
| 67 | - </div> | ||
| 68 | - </div> | ||
| 69 | - </div> | ||
| 70 | </div> | 34 | </div> |
| 71 | <script type="text/html" id="section_list"> | 35 | <script type="text/html" id="section_list"> |
| 72 | {{each list as obj i }} | 36 | {{each list as obj i }} |
| @@ -199,6 +163,12 @@ $(function(){ | @@ -199,6 +163,12 @@ $(function(){ | ||
| 199 | layer.msg("没有截取路段,不可以删除!!!"); | 163 | layer.msg("没有截取路段,不可以删除!!!"); |
| 200 | } | 164 | } |
| 201 | }); | 165 | }); |
| 166 | + // 滚动轴监听事件 | ||
| 167 | + $('#scrllmouseEvent_div').on('mousemove',function() { | ||
| 168 | + $('.defeat-scroll').css('overflow','auto'); | ||
| 169 | + }).on('mouseleave',function() { | ||
| 170 | + $('.defeat-scroll').css('overflow','hidden'); | ||
| 171 | + }); | ||
| 202 | }); | 172 | }); |
| 203 | </script> | 173 | </script> |
| 204 | <!--编辑路线类 --> | 174 | <!--编辑路线类 --> |