Commit ef0e235459bdaf6cb71146ab25fe4c4b0fed8741
1 parent
cb5d5fa9
线路文件上传弹出框修改
Showing
2 changed files
with
14 additions
and
4 deletions
src/main/java/com/bsth/controller/StationController.java
| @@ -2,6 +2,8 @@ package com.bsth.controller; | @@ -2,6 +2,8 @@ package com.bsth.controller; | ||
| 2 | 2 | ||
| 3 | import java.util.Map; | 3 | import java.util.Map; |
| 4 | 4 | ||
| 5 | +import org.slf4j.Logger; | ||
| 6 | +import org.slf4j.LoggerFactory; | ||
| 5 | import org.springframework.beans.factory.annotation.Autowired; | 7 | import org.springframework.beans.factory.annotation.Autowired; |
| 6 | import org.springframework.web.bind.annotation.RequestMapping; | 8 | import org.springframework.web.bind.annotation.RequestMapping; |
| 7 | import org.springframework.web.bind.annotation.RequestMethod; | 9 | import org.springframework.web.bind.annotation.RequestMethod; |
| @@ -34,6 +36,9 @@ public class StationController extends BaseController<Station, Integer> { | @@ -34,6 +36,9 @@ public class StationController extends BaseController<Station, Integer> { | ||
| 34 | 36 | ||
| 35 | @Autowired | 37 | @Autowired |
| 36 | private StationService service; | 38 | private StationService service; |
| 39 | + | ||
| 40 | + /** 日志记录器 */ | ||
| 41 | + private static final Logger LOGGER = LoggerFactory.getLogger(StationController.class); | ||
| 37 | 42 | ||
| 38 | /** | 43 | /** |
| 39 | * @Description :TODO(根据坐标点匹配数据库中的站点) | 44 | * @Description :TODO(根据坐标点匹配数据库中的站点) |
| @@ -153,10 +158,13 @@ public class StationController extends BaseController<Station, Integer> { | @@ -153,10 +158,13 @@ public class StationController extends BaseController<Station, Integer> { | ||
| 153 | */ | 158 | */ |
| 154 | @RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET) | 159 | @RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET) |
| 155 | public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) { | 160 | public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) { |
| 161 | + System.out.println(stationCount+" _ "+ sectionCount ); | ||
| 156 | for(int i = 0; i < stationCount; i++) { | 162 | for(int i = 0; i < stationCount; i++) { |
| 163 | + System.out.println(stationCount); | ||
| 157 | GetUIDAndCode.getStationId(); | 164 | GetUIDAndCode.getStationId(); |
| 158 | } | 165 | } |
| 159 | for(int i = 0; i < sectionCount; i++) { | 166 | for(int i = 0; i < sectionCount; i++) { |
| 167 | + System.out.println(sectionCount); | ||
| 160 | GetUIDAndCode.getSectionId(); | 168 | GetUIDAndCode.getSectionId(); |
| 161 | } | 169 | } |
| 162 | return 1; | 170 | return 1; |
src/main/resources/static/pages/base/line/js/line-list-table.js
| @@ -358,18 +358,20 @@ | @@ -358,18 +358,20 @@ | ||
| 358 | lineName = arrChk.val(); | 358 | lineName = arrChk.val(); |
| 359 | // 请求参数 | 359 | // 请求参数 |
| 360 | var params = {lineId:id, fileVersions:fileVersions}; | 360 | var params = {lineId:id, fileVersions:fileVersions}; |
| 361 | + // 关闭弹出框 | ||
| 362 | + layer.close(index); | ||
| 361 | // 弹出正在加载层 | 363 | // 弹出正在加载层 |
| 362 | - var index = layer.load(0); | 364 | + var index2 = layer.load(0); |
| 363 | /** 生成线路行单 @pararm:<params:请求参数> */ | 365 | /** 生成线路行单 @pararm:<params:请求参数> */ |
| 364 | $post('/stationroute/usingSingle',params,function(data) { | 366 | $post('/stationroute/usingSingle',params,function(data) { |
| 365 | // 关闭弹出框 | 367 | // 关闭弹出框 |
| 366 | - layer.close(index); | 368 | + layer.close(index2); |
| 367 | if(data.status=='SUCCESS') { | 369 | if(data.status=='SUCCESS') { |
| 368 | // 弹出添加成功提示消息 | 370 | // 弹出添加成功提示消息 |
| 369 | - layer.msg('生成线路【'+ lineName +'】路单文件成功!'); | 371 | + layer.msg('生成线路【'+ lineName +'】线路文件成功!'); |
| 370 | }else if(data.status=='ERROR'){ | 372 | }else if(data.status=='ERROR'){ |
| 371 | // 弹出添加成功提示消息 | 373 | // 弹出添加成功提示消息 |
| 372 | - layer.msg('生成线路【'+ lineName +'】路单文件失败!'); | 374 | + layer.msg('生成线路【'+ lineName +'】线路文件失败!'); |
| 373 | }else if(data.status=='NOTDATA') { | 375 | }else if(data.status=='NOTDATA') { |
| 374 | // 弹出添加成功提示消息 | 376 | // 弹出添加成功提示消息 |
| 375 | layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!'); | 377 | layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!'); |