Commit e86d48a5d663d37ee8e7216785580ec9789e415c
1 parent
100a7c1f
线路编辑页面优化
Showing
4 changed files
with
246 additions
and
232 deletions
src/main/resources/static/pages/base/stationroute/add_select.html
| ... | ... | @@ -141,7 +141,7 @@ $('#add_select_mobal').on('AddSelectMobal.show', function(e,map_,drw,ajaxd_,stat |
| 141 | 141 | map_.localSearchFromAdreesToPoint(stationName,function(Points) { |
| 142 | 142 | if(Points) { |
| 143 | 143 | /** 设置新增站点集合对象站点中心点百度坐标属性值 @param:<bJwpoints:中心点百度坐标) */ |
| 144 | - stationObj.setAddStationBJwpoints(Points); | |
| 144 | + stationObj.setAddStationJwpoints(Points); | |
| 145 | 145 | /** 设置新增站点集合对象范围图形类型属性值 @param:<shapesType:范围图形类型) */ |
| 146 | 146 | stationObj.setAddStationShapesType('r'); |
| 147 | 147 | /** 设置新增站点集合对象圆形半径属性值 @param:<radius:圆形半径) */ | ... | ... |
src/main/resources/static/pages/base/stationroute/css/bmap_base.css
| ... | ... | @@ -31,8 +31,8 @@ html,body{ |
| 31 | 31 | .search_panel{ |
| 32 | 32 | position: absolute; |
| 33 | 33 | z-index: 99; |
| 34 | - height: 42px; | |
| 35 | - top: 40px; | |
| 34 | + height: 41px; | |
| 35 | + top: 30px; | |
| 36 | 36 | left: 500px; |
| 37 | 37 | background: #fff1f0; |
| 38 | 38 | padding: 0px; |
| ... | ... | @@ -41,12 +41,12 @@ html,body{ |
| 41 | 41 | |
| 42 | 42 | .search_input_panel { |
| 43 | 43 | display: inline; |
| 44 | - height: 42px; | |
| 44 | + height: 41px; | |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | .search_input_panel .search_input { |
| 48 | 48 | width: 200px; |
| 49 | - height: 42px; | |
| 49 | + height: 41px; | |
| 50 | 50 | padding:0 20px 0 10px; |
| 51 | 51 | float:left; |
| 52 | 52 | border:none; |
| ... | ... | @@ -54,21 +54,21 @@ html,body{ |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | .search_input_panel .clear { |
| 57 | - right: 42px; | |
| 57 | + right: 40px; | |
| 58 | 58 | position: absolute; |
| 59 | 59 | top: 15px; |
| 60 | 60 | width: 20px; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | .search_button_panel{ |
| 64 | - height: 42px; | |
| 64 | + height: 41px; | |
| 65 | 65 | display: inline; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | .search_button { |
| 69 | - width: 42px; | |
| 70 | - height: 42px; | |
| 71 | - background: #fff; | |
| 69 | + width: 38px; | |
| 70 | + height: 41px; | |
| 71 | + background: #fff1f0; | |
| 72 | 72 | border:none; |
| 73 | 73 | top: 0; |
| 74 | 74 | outline: 0px; |
| ... | ... | @@ -91,7 +91,16 @@ html,body{ |
| 91 | 91 | height: auto; |
| 92 | 92 | background:transparent; |
| 93 | 93 | border:0px solid; |
| 94 | - border-radius: 6px !important;box-shadow: 5px 5px 5px rgba(90, 90, 90, 0.48); | |
| 94 | + /*border-radius: 6px !important;*/ | |
| 95 | + box-shadow: 5px 5px 5px rgba(90, 90, 90, 0.48); | |
| 96 | + | |
| 97 | +} | |
| 98 | + | |
| 99 | +.protlet-box .portlet-title { | |
| 100 | + background-color:#fff1f0; | |
| 101 | + font-weight: 600; | |
| 102 | + color: #000 !important; | |
| 103 | + padding: 0 0 0 15px; | |
| 95 | 104 | } |
| 96 | 105 | |
| 97 | 106 | .help-block{ |
| ... | ... | @@ -103,6 +112,7 @@ html,body{ |
| 103 | 112 | background: #ff8355; |
| 104 | 113 | color: #fff; |
| 105 | 114 | font-size: 12px; |
| 115 | + margin: 0 5px 0 0; | |
| 106 | 116 | border: 1px solid transparent; |
| 107 | 117 | } |
| 108 | 118 | ... | ... |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
| ... | ... | @@ -259,9 +259,9 @@ window.WorldsBMap = function () { |
| 259 | 259 | (shapes=="r" ? ("<span class='help-block' >半径  :" + objStation.stationRadius + "</span>") : " ")+ |
| 260 | 260 | '<span class="help-block" >版本号  :' + objStation.stationRouteVersions + '</span>' + |
| 261 | 261 | '<div>' + |
| 262 | - '<button class="info_win_btn" id="editStation" onclick="WorldsBMap.editStation(' + objStation.stationRouteId+','+objStation.stationRoutedirections + ')">修改站点</button>' + | |
| 263 | - '<button class="info_win_btn" id="addBetweenStationRoad" onclick="WorldsBMap.addBetweenStationRoad(' + objStation.stationRouteId + ')">添加站点间路段</button>' + | |
| 262 | + '<button class="info_win_btn" id="editStation" onclick="WorldsBMap.editStation(' + objStation.stationRouteId+','+objStation.stationRoutedirections + ')">修改</button>' + | |
| 264 | 263 | '<button class="info_win_btn" onclick="WorldsBMap.destroyStation('+ objStation.stationRouteId + ','+objStation.stationRouteLine+','+objStation.stationRoutedirections+')">撤销</button>' + |
| 264 | + '<button class="info_win_btn" id="addBetweenStationRoad" onclick="WorldsBMap.addBetweenStationRoad(' + objStation.stationRouteId + ')">添加站点间路段</button>' + | |
| 265 | 265 | '</div>'; |
| 266 | 266 | |
| 267 | 267 | // 创建信息窗口 |
| ... | ... | @@ -1035,17 +1035,17 @@ window.WorldsBMap = function () { |
| 1035 | 1035 | } |
| 1036 | 1036 | }); |
| 1037 | 1037 | }); |
| 1038 | - } else if(sectionName){ | |
| 1038 | + } else if(!sectionName){ | |
| 1039 | 1039 | layer.msg('请填写路段名字!'); |
| 1040 | - } else if(bsectionVector){ | |
| 1041 | - layer.msg('请填先绘制路段!'); | |
| 1040 | + } else if(!bsectionVector){ | |
| 1041 | + layer.msg('请先绘制路段!'); | |
| 1042 | 1042 | } |
| 1043 | 1043 | setTimeout(function () { |
| 1044 | 1044 | $("#addSectionSbmintBtn").removeClass("disabled"); |
| 1045 | 1045 | },1000); |
| 1046 | 1046 | }); |
| 1047 | 1047 | }, |
| 1048 | - // 添加在路段之后 | |
| 1048 | + // 添加第一个路段 | |
| 1049 | 1049 | addSectionAfter : function(sectionRoudId) { |
| 1050 | 1050 | //order = after before; |
| 1051 | 1051 | var beforeSection; |
| ... | ... | @@ -1085,8 +1085,9 @@ window.WorldsBMap = function () { |
| 1085 | 1085 | var btn = this; |
| 1086 | 1086 | $('#addSectionSbmintBtn').addClass("disabled"); |
| 1087 | 1087 | var sectionName = $('#sectionNameInput').val(); |
| 1088 | + var bsectionVector = $('#bsectionVectorInput').val(); | |
| 1088 | 1089 | var params = {}; |
| 1089 | - if(sectionName) { | |
| 1090 | + if(sectionName && bsectionVector) { | |
| 1090 | 1091 | WorldsBMap.exitDrawStatus(); |
| 1091 | 1092 | GetAjaxData.getSectionCode(function(sectionCode) { |
| 1092 | 1093 | var lineId = beforeSection.sectionRouteLine |
| ... | ... | @@ -1097,7 +1098,7 @@ window.WorldsBMap = function () { |
| 1097 | 1098 | params.sectionName = sectionName; |
| 1098 | 1099 | params.roadCoding = ''; |
| 1099 | 1100 | params.dbType = 'b'; |
| 1100 | - params.bsectionVector = $('#bsectionVectorInput').val(); | |
| 1101 | + params.bsectionVector = bsectionVector; | |
| 1101 | 1102 | params.sectionrouteCode = beforeSection.sectionRouteCode+"_0"; |
| 1102 | 1103 | params.sectionTime = 0; |
| 1103 | 1104 | params.sectionDistance = 60; |
| ... | ... | @@ -1122,9 +1123,10 @@ window.WorldsBMap = function () { |
| 1122 | 1123 | } |
| 1123 | 1124 | }); |
| 1124 | 1125 | }); |
| 1125 | - } else { | |
| 1126 | - layer.msg('请填写路段名字'); | |
| 1127 | - } | |
| 1126 | + } else if(!sectionName){ | |
| 1127 | + layer.msg('请填写路段名字!'); | |
| 1128 | + } else if(!bsectionVector) | |
| 1129 | + layer.msg('请先绘制路段!'); | |
| 1128 | 1130 | setTimeout(function () { |
| 1129 | 1131 | $("#addSectionSbmintBtn").removeClass("disabled"); |
| 1130 | 1132 | },1000); |
| ... | ... | @@ -1199,8 +1201,8 @@ window.WorldsBMap = function () { |
| 1199 | 1201 | '<span class="help-block" >版本号  :' + section.versions + '</span>' + |
| 1200 | 1202 | '<div >' + |
| 1201 | 1203 | '<button class="info_win_btn" id="editStation" onclick="WorldsBMap.editSection(' + section.sectionrouteId + ')">修改</button>' + |
| 1202 | - '<button class="info_win_btn" id="addSectionAfter" onclick="WorldsBMap.addSectionAfter('+section.sectionrouteId+')">添加(之后)</button>' + | |
| 1203 | 1204 | '<button class="info_win_btn" id="addBetweenStationRoad" onclick="WorldsBMap.destroySection('+ section.sectionrouteId + ','+section.sectionrouteLine+','+section.sectionrouteDirections+')">撤销</button>' + |
| 1205 | + '<button class="info_win_btn" id="addSectionAfter" onclick="WorldsBMap.addSectionAfter('+section.sectionrouteId+')">添加路段(之后)</button>' + | |
| 1204 | 1206 | '</div>'; |
| 1205 | 1207 | |
| 1206 | 1208 | // 创建信息窗口 |
| ... | ... | @@ -1275,12 +1277,14 @@ window.WorldsBMap = function () { |
| 1275 | 1277 | }, |
| 1276 | 1278 | exitDrawStatus : function () { |
| 1277 | 1279 | if (drawingManager) { |
| 1280 | + $('#bsectionVectorInput').val(""); | |
| 1278 | 1281 | WorldsBMap.clearOtherOverlay(); |
| 1279 | 1282 | drawingManager.close(); |
| 1280 | 1283 | } |
| 1281 | 1284 | }, |
| 1282 | 1285 | openDrawStatus : function () { |
| 1283 | 1286 | if (drawingManager) { |
| 1287 | + $('#bsectionVectorInput').val(""); | |
| 1284 | 1288 | WorldsBMap.clearOtherOverlay(); |
| 1285 | 1289 | drawingManager.open(); |
| 1286 | 1290 | } | ... | ... |
src/main/resources/static/pages/base/stationroute/list.html
| ... | ... | @@ -20,16 +20,16 @@ |
| 20 | 20 | <div id="searchResultPanel" style="border:1px solid #C0C0C0;width:150px;height:auto; display:none;z-index: 199;"></div> |
| 21 | 21 | <!-- 路径规划路段 --> |
| 22 | 22 | <input class="hand" id="routePlanning" /> |
| 23 | - <div class="portlet box protlet-box"> | |
| 24 | - <div class="protlet-box-layer"></div> | |
| 25 | - <!-- 左边标题栏 --> | |
| 26 | - <div class="portlet-title" style="background-color:#12527f;"> | |
| 23 | + <div class="portlet box protlet-box"> | |
| 24 | + <div class="protlet-box-layer"></div> | |
| 25 | + <!-- 左边标题栏 --> | |
| 26 | + <div class="portlet-title"> | |
| 27 | 27 | <div class="caption"> |
| 28 | 28 | <!-- 途径站点 --> |
| 29 | 29 | </div> |
| 30 | - <div class="tools"> | |
| 30 | + <!--<div class="tools"> | |
| 31 | 31 | <a href="javascript:;" class="collapse" data-original-title="" title=""> </a> |
| 32 | - </div> | |
| 32 | + </div>--> | |
| 33 | 33 | </div> |
| 34 | 34 | <!-- 左边栏 --> |
| 35 | 35 | <div class="portlet-body" id="scrllmouseEvent" style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 520px;"> |
| ... | ... | @@ -40,220 +40,220 @@ |
| 40 | 40 | <li class="active"> |
| 41 | 41 | <a href="#stationUp" data-toggle="tab" id="upLine" aria-expanded="true"> 上行 </a> |
| 42 | 42 | </li> |
| 43 | - <li class=""> | |
| 44 | - <a href="#stationDown" data-toggle="tab" id="downLine" aria-expanded="false"> 下行 </a> | |
| 45 | - </li> | |
| 46 | - </ul> | |
| 47 | - </div> | |
| 48 | - <div class="col-md-9 col-sm-9 col-xs-9"> | |
| 49 | - <div class="tab-content"> | |
| 50 | - <!-- 左边栏上行 --> | |
| 51 | - <div class="tab-pane active in" id="stationUp" data-direction="0"> | |
| 52 | - <div class="portlet-body" id="uptreeMobal" style="display: none"> | |
| 53 | - <div class="table-toolbar"> | |
| 54 | - <div class="row"> | |
| 55 | - <div class="col-md-6" style="float: right;"> | |
| 56 | - <div class="btn-group" style="float: right;"> | |
| 57 | - <div class="actions module_tools"> | |
| 58 | - <div class="btn-group"> | |
| 59 | - <!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具 | |
| 60 | - <i class="fa fa-angle-down"></i> | |
| 61 | - </a> --> | |
| 62 | - <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 63 | - <i class="fa fa-share"></i> | |
| 64 | - <span>上行操作</span> | |
| 65 | - <i class="fa fa-angle-down"></i> | |
| 66 | - </a> | |
| 67 | - <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 68 | - <li> | |
| 69 | - <a href="javascript:;" id="addUpStation"><i class="fa fa-plus"></i> 添加站点</a> | |
| 70 | - </li> | |
| 71 | - <!--<li class="divider"> </li>--> | |
| 72 | - <!--<li> | |
| 73 | - <a href="javascript:;" id="editUpStation"><i class="fa fa-pencil"></i> 修改站点</a> | |
| 74 | - </li>--> | |
| 75 | - <li class="divider"> </li> | |
| 76 | - <li> | |
| 77 | - <a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i> 撤销站点</a> | |
| 78 | - </li> | |
| 43 | + <li class=""> | |
| 44 | + <a href="#stationDown" data-toggle="tab" id="downLine" aria-expanded="false"> 下行 </a> | |
| 45 | + </li> | |
| 46 | + </ul> | |
| 47 | + </div> | |
| 48 | + <div class="col-md-9 col-sm-9 col-xs-9"> | |
| 49 | + <div class="tab-content"> | |
| 50 | + <!-- 左边栏上行 --> | |
| 51 | + <div class="tab-pane active in" id="stationUp" data-direction="0"> | |
| 52 | + <div class="portlet-body" id="uptreeMobal" style="display: none"> | |
| 53 | + <div class="table-toolbar"> | |
| 54 | + <div class="row"> | |
| 55 | + <div class="col-md-6" style="float: right;"> | |
| 56 | + <div class="btn-group" style="float: right;"> | |
| 57 | + <div class="actions module_tools"> | |
| 58 | + <div class="btn-group"> | |
| 59 | + <!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具 | |
| 60 | + <i class="fa fa-angle-down"></i> | |
| 61 | + </a> --> | |
| 62 | + <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 63 | + <i class="fa fa-share"></i> | |
| 64 | + <span>上行操作</span> | |
| 65 | + <i class="fa fa-angle-down"></i> | |
| 66 | + </a> | |
| 67 | + <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 68 | + <li> | |
| 69 | + <a href="javascript:;" id="addUpStation"><i class="fa fa-plus"></i> 添加站点</a> | |
| 70 | + </li> | |
| 79 | 71 | <li class="divider"> </li> |
| 80 | - <!--<li> | |
| 81 | - <a href="javascript:;" id="addUpSection"><i class="fa fa-plus"></i> 添加路段</a> | |
| 82 | - </li> | |
| 83 | - <li class="divider"> </li>--> | |
| 84 | - <li> | |
| 85 | - <a href="javascript:;" id="batchUpDelete"><i class="fa fa-trash-o"></i> 批量撤销</a> | |
| 86 | - </li> | |
| 87 | - <li class="divider"> </li> | |
| 88 | - <li> | |
| 89 | - <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i> 切换上下行</a> | |
| 90 | - </li> | |
| 91 | - <li class="divider"> </li> | |
| 92 | - <li> | |
| 93 | - <a href="javascript:;" id="wrenchUpDis"><i class="fa fa-wrench"></i> 设置上行站距</a> | |
| 94 | - </li> | |
| 95 | - <li class="divider"> </li> | |
| 96 | - <li> | |
| 97 | - <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i> 引用下行路段</a> | |
| 98 | - </li> | |
| 72 | + <!--<li> | |
| 73 | + <a href="javascript:;" id="editUpStation"><i class="fa fa-pencil"></i> 修改站点</a> | |
| 74 | + </li> | |
| 75 | + <li class="divider"> </li> | |
| 76 | + <li> | |
| 77 | + <a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i> 撤销站点</a> | |
| 78 | + </li> | |
| 79 | + <li class="divider"> </li> | |
| 80 | + <li> | |
| 81 | + <a href="javascript:;" id="addUpSection"><i class="fa fa-plus"></i> 添加路段</a> | |
| 82 | + </li> | |
| 83 | + <li class="divider"> </li>--> | |
| 84 | + <li> | |
| 85 | + <a href="javascript:;" id="batchUpDelete"><i class="fa fa-trash-o"></i> 批量撤销</a> | |
| 86 | + </li> | |
| 87 | + <li class="divider"> </li> | |
| 88 | + <li> | |
| 89 | + <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i> 切换上下行</a> | |
| 90 | + </li> | |
| 91 | + <li class="divider"> </li> | |
| 92 | + <li> | |
| 93 | + <a href="javascript:;" id="wrenchUpDis"><i class="fa fa-wrench"></i> 设置上行站距</a> | |
| 94 | + </li> | |
| 95 | + <li class="divider"> </li> | |
| 96 | + <li> | |
| 97 | + <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i> 引用下行路段</a> | |
| 98 | + </li> | |
| 99 | 99 | <!-- <li class="divider"> </li> |
| 100 | 100 | <!-- <li> |
| 101 | 101 | <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i> 编辑走向</a> |
| 102 | 102 | </li> --> |
| 103 | - <!-- <li> | |
| 104 | - <a href="javascript:;" id="createUsingSingle"><i class="fa fa-edit"></i> 生成行单</a> | |
| 105 | - </li> --> | |
| 106 | - </ul> | |
| 107 | - </div> | |
| 108 | - </div> | |
| 109 | - </div> | |
| 110 | - </div> | |
| 111 | - </div> | |
| 112 | - </div> | |
| 113 | - <!-- 树 --> | |
| 114 | - <div class="portlet-body" > | |
| 103 | + <!-- <li> | |
| 104 | + <a href="javascript:;" id="createUsingSingle"><i class="fa fa-edit"></i> 生成行单</a> | |
| 105 | + </li> --> | |
| 106 | + </ul> | |
| 107 | + </div> | |
| 108 | + </div> | |
| 109 | + </div> | |
| 110 | + </div> | |
| 111 | + </div> | |
| 112 | + </div> | |
| 113 | + <!-- 树 --> | |
| 114 | + <div class="portlet-body" > | |
| 115 | 115 | <div id="station_Up_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div> |
| 116 | 116 | </div> |
| 117 | - </div> | |
| 118 | - <!-- 无上行站点添加方式 --> | |
| 119 | - <div id="upToolsMobal" class="portlet-body" style="display:none"> | |
| 120 | - <div class="row"> | |
| 121 | - <div class="col-md-6" style="float: right;"> | |
| 122 | - <div class="btn-group" style="float: right;"> | |
| 123 | - <div class="actions"> | |
| 124 | - <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 125 | - <i class="fa fa-share"></i> | |
| 126 | - <span>上行规划选择</span> | |
| 127 | - <i class="fa fa-angle-down"></i> | |
| 128 | - </a> | |
| 129 | - <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 130 | - <li> | |
| 131 | - <a class="upManual" href="javascript:;" data-direction="0" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a> | |
| 132 | - </li> | |
| 133 | - <li class="divider"> </li> | |
| 134 | - <li> | |
| 135 | - <a class="upSystem" href="javascript:;" data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a> | |
| 136 | - </li> | |
| 137 | - </ul> | |
| 138 | - </div> | |
| 139 | - </div> | |
| 140 | - </div> | |
| 141 | - </div> | |
| 142 | - <div class="row" style="margin-top: 10px;"> | |
| 143 | - <div class="col-md-12"> | |
| 144 | - <!-- 提示 --> | |
| 117 | + </div> | |
| 118 | + <!-- 无上行站点添加方式 --> | |
| 119 | + <div id="upToolsMobal" class="portlet-body" style="display:none"> | |
| 120 | + <div class="row"> | |
| 121 | + <div class="col-md-6" style="float: right;"> | |
| 122 | + <div class="btn-group" style="float: right;"> | |
| 123 | + <div class="actions"> | |
| 124 | + <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 125 | + <i class="fa fa-share"></i> | |
| 126 | + <span>上行规划选择</span> | |
| 127 | + <i class="fa fa-angle-down"></i> | |
| 128 | + </a> | |
| 129 | + <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 130 | + <li> | |
| 131 | + <a class="upManual" href="javascript:;" data-direction="0" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a> | |
| 132 | + </li> | |
| 133 | + <li class="divider"> </li> | |
| 134 | + <li> | |
| 135 | + <a class="upSystem" href="javascript:;" data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a> | |
| 136 | + </li> | |
| 137 | + </ul> | |
| 138 | + </div> | |
| 139 | + </div> | |
| 140 | + </div> | |
| 141 | + </div> | |
| 142 | + <div class="row" style="margin-top: 10px;"> | |
| 143 | + <div class="col-md-12"> | |
| 144 | + <!-- 提示 --> | |
| 145 | 145 | <div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;"> |
| 146 | - <strong>系统未初始化该线路上行站点!</strong> 请从上方【上行规划选择】里选择任意一种方式规划该线路上行站点. | |
| 147 | - </div> | |
| 148 | - </div> | |
| 149 | - </div> | |
| 150 | - </div> | |
| 151 | - | |
| 152 | - </div> | |
| 153 | - | |
| 154 | - <!-- 下行 --> | |
| 155 | - <div class="tab-pane fade" id="stationDown" data-direction="1"> | |
| 156 | - <div class="portlet-body" id="DowntreeMobal" style="display: none"> | |
| 157 | - <div class="table-toolbar"> | |
| 158 | - <div class="row"> | |
| 159 | - <div class="col-md-6" style="float: right;"> | |
| 160 | - <div class="btn-group" style="float: right;"> | |
| 161 | - <div class="actions module_tools"> | |
| 162 | - <div class="btn-group"> | |
| 163 | - <!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具 | |
| 164 | - <i class="fa fa-angle-down"></i> | |
| 165 | - </a> --> | |
| 166 | - <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 167 | - <i class="fa fa-share"></i> | |
| 168 | - <span>下行操作</span> | |
| 169 | - <i class="fa fa-angle-down"></i> | |
| 170 | - </a> | |
| 171 | - <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 172 | - <li> | |
| 173 | - <a href="javascript:;" id="addDownStation"><i class="fa fa-plus"></i> 添加站点</a> | |
| 174 | - </li> | |
| 175 | - <!--<li class="divider"> </li>--> | |
| 176 | - <!--<li> | |
| 177 | - <a href="javascript:;" id="editDownStation"><i class="fa fa-pencil"></i> 修改站点</a> | |
| 178 | - </li>--> | |
| 179 | - <li class="divider"> </li> | |
| 180 | - <li> | |
| 181 | - <a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i> 撤销站点</a> | |
| 182 | - </li> | |
| 146 | + <strong>系统未初始化该线路上行站点!</strong> 请从上方【上行规划选择】里选择任意一种方式规划该线路上行站点. | |
| 147 | + </div> | |
| 148 | + </div> | |
| 149 | + </div> | |
| 150 | + </div> | |
| 151 | + | |
| 152 | + </div> | |
| 153 | + | |
| 154 | + <!-- 下行 --> | |
| 155 | + <div class="tab-pane fade" id="stationDown" data-direction="1"> | |
| 156 | + <div class="portlet-body" id="DowntreeMobal" style="display: none"> | |
| 157 | + <div class="table-toolbar"> | |
| 158 | + <div class="row"> | |
| 159 | + <div class="col-md-6" style="float: right;"> | |
| 160 | + <div class="btn-group" style="float: right;"> | |
| 161 | + <div class="actions module_tools"> | |
| 162 | + <div class="btn-group"> | |
| 163 | + <!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具 | |
| 164 | + <i class="fa fa-angle-down"></i> | |
| 165 | + </a> --> | |
| 166 | + <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 167 | + <i class="fa fa-share"></i> | |
| 168 | + <span>下行操作</span> | |
| 169 | + <i class="fa fa-angle-down"></i> | |
| 170 | + </a> | |
| 171 | + <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 172 | + <li> | |
| 173 | + <a href="javascript:;" id="addDownStation"><i class="fa fa-plus"></i> 添加站点</a> | |
| 174 | + </li> | |
| 183 | 175 | <li class="divider"> </li> |
| 184 | 176 | <!--<li> |
| 177 | + <a href="javascript:;" id="editDownStation"><i class="fa fa-pencil"></i> 修改站点</a> | |
| 178 | + </li> | |
| 179 | + <li class="divider"> </li> | |
| 180 | + <li> | |
| 181 | + <a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i> 撤销站点</a> | |
| 182 | + </li> | |
| 183 | + <li class="divider"> </li> | |
| 184 | + <li> | |
| 185 | 185 | <a href="javascript:;" id="addDownSection"><i class="fa fa-plus"></i> 添加路段</a> |
| 186 | 186 | </li> |
| 187 | 187 | <li class="divider"> </li>--> |
| 188 | - <li> | |
| 189 | - <a href="javascript:;" id="batchDownDelete"><i class="fa fa-trash-o"></i> 批量撤销</a> | |
| 190 | - </li> | |
| 191 | - <li class="divider"> </li> | |
| 192 | - <li> | |
| 193 | - <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i> 切换上下行</a> | |
| 194 | - </li> | |
| 195 | - <li class="divider"> </li> | |
| 196 | - <li> | |
| 197 | - <a href="javascript:;" id="wrenchDownDis"><i class="fa fa-wrench"></i> 设置下行站距</a> | |
| 198 | - </li> | |
| 199 | - <li class="divider"> </li> | |
| 200 | - <li> | |
| 201 | - <a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i> 引用上行路段</a> | |
| 202 | - </li> | |
| 203 | - <!-- <li> | |
| 204 | - <a href="javascript:;" id="editDownlineTrend"><i class="fa fa-close"></i> 编辑走向</a> | |
| 205 | - </li> --> | |
| 206 | - </ul> | |
| 207 | - </div> | |
| 208 | - </div> | |
| 209 | - </div> | |
| 210 | - </div> | |
| 211 | - </div> | |
| 212 | - </div> | |
| 213 | - <!-- 树 --> | |
| 214 | - <div class="portlet-body"> | |
| 188 | + <li> | |
| 189 | + <a href="javascript:;" id="batchDownDelete"><i class="fa fa-trash-o"></i> 批量撤销</a> | |
| 190 | + </li> | |
| 191 | + <li class="divider"> </li> | |
| 192 | + <li> | |
| 193 | + <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i> 切换上下行</a> | |
| 194 | + </li> | |
| 195 | + <li class="divider"> </li> | |
| 196 | + <li> | |
| 197 | + <a href="javascript:;" id="wrenchDownDis"><i class="fa fa-wrench"></i> 设置下行站距</a> | |
| 198 | + </li> | |
| 199 | + <li class="divider"> </li> | |
| 200 | + <li> | |
| 201 | + <a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i> 引用上行路段</a> | |
| 202 | + </li> | |
| 203 | + <!-- <li> | |
| 204 | + <a href="javascript:;" id="editDownlineTrend"><i class="fa fa-close"></i> 编辑走向</a> | |
| 205 | + </li> --> | |
| 206 | + </ul> | |
| 207 | + </div> | |
| 208 | + </div> | |
| 209 | + </div> | |
| 210 | + </div> | |
| 211 | + </div> | |
| 212 | + </div> | |
| 213 | + <!-- 树 --> | |
| 214 | + <div class="portlet-body"> | |
| 215 | 215 | <div id="station_Down_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div> |
| 216 | 216 | </div> |
| 217 | - </div> | |
| 218 | - <!-- 无上行站点添加方式 --> | |
| 219 | - <div id="downToolsMobal" class="portlet-body" style="display:none"> | |
| 220 | - <div class="row"> | |
| 221 | - <div class="col-md-6" style="float: right;"> | |
| 222 | - <div class="btn-group" style="float: right;"> | |
| 223 | - <div class="actions"> | |
| 224 | - <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 225 | - <i class="fa fa-share"></i> | |
| 226 | - <span>下行规划选择</span> | |
| 227 | - <i class="fa fa-angle-down"></i> | |
| 228 | - </a> | |
| 229 | - <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 230 | - <li> | |
| 231 | - <a class="downManual" href="javascript:;" data-direction="1" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a> | |
| 232 | - </li> | |
| 233 | - <li class="divider"> </li> | |
| 234 | - <li> | |
| 235 | - <a class="downSystem" href="javascript:;" data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a> | |
| 236 | - </li> | |
| 237 | - </ul> | |
| 238 | - </div> | |
| 239 | - </div> | |
| 240 | - </div> | |
| 241 | - </div> | |
| 242 | - <div class="row" style="margin-top: 10px;"> | |
| 243 | - <div class="col-md-12"> | |
| 244 | - <!-- 提示 --> | |
| 245 | - <div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;"> | |
| 246 | - <strong>系统未初始化该线路下行站点!</strong> 请从上方【下行规划选择】里选择任意一种方式规划该线路下行站点. | |
| 247 | - </div> | |
| 248 | - </div> | |
| 249 | - </div> | |
| 250 | - </div> | |
| 251 | - </div> | |
| 252 | - </div> | |
| 253 | - </div> | |
| 254 | - </div> | |
| 217 | + </div> | |
| 218 | + <!-- 无上行站点添加方式 --> | |
| 219 | + <div id="downToolsMobal" class="portlet-body" style="display:none"> | |
| 220 | + <div class="row"> | |
| 221 | + <div class="col-md-6" style="float: right;"> | |
| 222 | + <div class="btn-group" style="float: right;"> | |
| 223 | + <div class="actions"> | |
| 224 | + <a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false"> | |
| 225 | + <i class="fa fa-share"></i> | |
| 226 | + <span>下行规划选择</span> | |
| 227 | + <i class="fa fa-angle-down"></i> | |
| 228 | + </a> | |
| 229 | + <ul class="dropdown-menu pull-right" style="min-width:100px"> | |
| 230 | + <li> | |
| 231 | + <a class="downManual" href="javascript:;" data-direction="1" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a> | |
| 232 | + </li> | |
| 233 | + <li class="divider"> </li> | |
| 234 | + <li> | |
| 235 | + <a class="downSystem" href="javascript:;" data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a> | |
| 236 | + </li> | |
| 237 | + </ul> | |
| 238 | + </div> | |
| 239 | + </div> | |
| 240 | + </div> | |
| 241 | + </div> | |
| 242 | + <div class="row" style="margin-top: 10px;"> | |
| 243 | + <div class="col-md-12"> | |
| 244 | + <!-- 提示 --> | |
| 245 | + <div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;"> | |
| 246 | + <strong>系统未初始化该线路下行站点!</strong> 请从上方【下行规划选择】里选择任意一种方式规划该线路下行站点. | |
| 247 | + </div> | |
| 248 | + </div> | |
| 249 | + </div> | |
| 250 | + </div> | |
| 251 | + </div> | |
| 252 | + </div> | |
| 253 | + </div> | |
| 254 | + </div> | |
| 255 | + </div> | |
| 255 | 256 | </div> |
| 256 | - </div> | |
| 257 | 257 | </div> |
| 258 | 258 | <!-- 线路类 --> |
| 259 | 259 | <script src="/pages/base/stationroute/js/line.js"></script> |
| ... | ... | @@ -309,7 +309,7 @@ |
| 309 | 309 | </script> |
| 310 | 310 | |
| 311 | 311 | <script type="text/javascript"> |
| 312 | - setTimeout(function () { | |
| 312 | + setTimeout(function () { | |
| 313 | 313 | // 百度地图API功能 |
| 314 | 314 | function G(id) { |
| 315 | 315 | return document.getElementById(id); |
| ... | ... | @@ -359,7 +359,7 @@ |
| 359 | 359 | myMap.addOverlay(new BMap.Marker(pp)); //添加标注 |
| 360 | 360 | } else { |
| 361 | 361 | layer.msg('找不到您输入的位置!') |
| 362 | - } | |
| 362 | + } | |
| 363 | 363 | } |
| 364 | 364 | var local = new BMap.LocalSearch(myMap, { //智能搜索 |
| 365 | 365 | onSearchComplete: myFun |
| ... | ... | @@ -367,9 +367,9 @@ |
| 367 | 367 | local.search(myValue); |
| 368 | 368 | } |
| 369 | 369 | $("#searchInput").on('input propertychange change', function () { |
| 370 | - if($("#searchInput").val() != null && $("#searchInput").val() != "") | |
| 370 | + if($("#searchInput").val() != null && $("#searchInput").val() != "") | |
| 371 | 371 | $('.search_panel .clear').removeClass('hide'); |
| 372 | - else { | |
| 372 | + else { | |
| 373 | 373 | WorldsBMap.clearOtherOverlay(); |
| 374 | 374 | $('.search_panel .clear').addClass('hide'); |
| 375 | 375 | } |
| ... | ... | @@ -377,7 +377,7 @@ |
| 377 | 377 | |
| 378 | 378 | $('.search_panel .clear').on('click',function () { |
| 379 | 379 | WorldsBMap.clearOtherOverlay(); |
| 380 | - $("#searchInput").val(''); | |
| 380 | + $("#searchInput").val(''); | |
| 381 | 381 | $("#searchInput").change(); |
| 382 | 382 | }); |
| 383 | 383 | $('.search_panel .search_button').on('click',function () { | ... | ... |