Commit 40601a9f8aeb34c7bd9ec620d5134a511ec1a6ca
Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Showing
2 changed files
with
4 additions
and
4 deletions
src/main/resources/static/pages/base/line/list.html
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <div class="page-title"> | 5 | <div class="page-title"> |
| 6 | <h1>线路信息</h1> | 6 | <h1>线路信息</h1> |
| 7 | </div> | 7 | </div> |
| 8 | - | 8 | +</div> |
| 9 | <!-- 片段标题 END --> | 9 | <!-- 片段标题 END --> |
| 10 | 10 | ||
| 11 | <!-- 线路信息导航栏组件 START --> | 11 | <!-- 线路信息导航栏组件 START --> |
| @@ -154,7 +154,6 @@ | @@ -154,7 +154,6 @@ | ||
| 154 | </div> | 154 | </div> |
| 155 | </div> | 155 | </div> |
| 156 | </div> | 156 | </div> |
| 157 | -</div> | ||
| 158 | <!-- | 157 | <!-- |
| 159 | 158 | ||
| 160 | <td style="vertical-align: middle;"> | 159 | <td style="vertical-align: middle;"> |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
| @@ -277,6 +277,7 @@ var PublicFunctions = function () { | @@ -277,6 +277,7 @@ var PublicFunctions = function () { | ||
| 277 | 277 | ||
| 278 | /** @param directionV_ :方向 */ | 278 | /** @param directionV_ :方向 */ |
| 279 | stationRevoke : function(directionV_) { | 279 | stationRevoke : function(directionV_) { |
| 280 | + debugger | ||
| 280 | // 获取树选中节点对象 | 281 | // 获取树选中节点对象 |
| 281 | var obj = PublicFunctions.getCurrSelNode(directionV_); | 282 | var obj = PublicFunctions.getCurrSelNode(directionV_); |
| 282 | // 是否选中,选中节点是否为站点 | 283 | // 是否选中,选中节点是否为站点 |
| @@ -298,9 +299,9 @@ var PublicFunctions = function () { | @@ -298,9 +299,9 @@ var PublicFunctions = function () { | ||
| 298 | // 关闭弹出框 | 299 | // 关闭弹出框 |
| 299 | layer.close(index); | 300 | layer.close(index); |
| 300 | if(result.status=='SUCCESS'){ | 301 | if(result.status=='SUCCESS'){ |
| 301 | - layer.msg('撤销上行站点【'+obj[0].text+'】成功!'); | 302 | + layer.msg('撤销'+(directionV_==0?"上行":"下行")+'站点【'+obj[0].text+'】成功!'); |
| 302 | }else{ | 303 | }else{ |
| 303 | - layer.msg('撤销上行站点【'+obj[0].text+'】失败!'); | 304 | + layer.msg('撤销'+(directionV_==0?"上行":"下行")+'站点【'+obj[0].text+'】失败!'); |
| 304 | } | 305 | } |
| 305 | WorldsBMap.clearMarkAndOverlays(); | 306 | WorldsBMap.clearMarkAndOverlays(); |
| 306 | var Line = LineObj.getLineObj(); | 307 | var Line = LineObj.getLineObj(); |