Commit 34d5e365e7db59a60d71d7dfbe7154554a1280c7
1 parent
96097ffc
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
# Conflicts: # src/main/resources/static/pages/base/timesmodel/add.html # src/main/resources/static/pages/base/timesmodel/fragments/addbc.html # src/main/resources/static/pages/base/timesmodel/fragments/deletelp.html # src/main/resources/static/pages/base/timesmodel/fragments/editbc.html # src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js # src/main/resources/static/pages/base/timesmodel/js/dateTimeTool.js # src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js # src/main/resources/static/pages/base/timesmodel/js/gantt.js # src/main/resources/static/pages/base/timesmodel/js/systemTools.js # src/main/resources/static/pages/base/timesmodel/js/v1/AdjustTrip.js # src/main/resources/static/pages/base/timesmodel/js/v1/bcFun.js # src/main/resources/static/pages/base/timesmodel/js/v1/lpFun.js # src/main/resources/static/pages/base/timesmodel/js/v1/scheduleInitialize.js
Showing
1 changed file
with
1 additions
and
2 deletions
src/main/resources/static/pages/base/line/js/line-list-table.js
| ... | ... | @@ -201,6 +201,7 @@ |
| 201 | 201 | } |
| 202 | 202 | // 异步请求获取表格数据 |
| 203 | 203 | $.get('/line',params,function(result){ |
| 204 | + debugger; | |
| 204 | 205 | // 添加序号 |
| 205 | 206 | result.content.page = page; |
| 206 | 207 | $.each(result.content, function(i, data) { |
| ... | ... | @@ -339,8 +340,6 @@ |
| 339 | 340 | return ; |
| 340 | 341 | }else { |
| 341 | 342 | layer.open({ |
| 342 | - id:1, | |
| 343 | - type: 1, | |
| 344 | 343 | title: "线路文件版本号", |
| 345 | 344 | // skin:'layui-layer-rim', |
| 346 | 345 | area:['450px', 'auto'], | ... | ... |