Commit 9c583641713b0c40d11869db84570f621089d973

Authored by 王通
1 parent 6b58a05a

1.进出场路径规划,起终点用名称不用代码,可能存在同一站名的起点或终点进场

src/main/java/com/bsth/service/impl/InoutCarparkServiceImpl.java
... ... @@ -450,7 +450,7 @@ public class InoutCarparkServiceImpl extends BaseServiceImpl<LsInoutSectionRoute
450 450 map.put("end", scheduleRealInfo.getZdzCode());
451 451 map.put("bsectionVector", new ObjectMapper().writeValueAsString(bsectionVector));
452 452  
453   - lsInoutSectionRouteRepository.destroy(scheduleRealInfo.getXlBm(), versions, scheduleRealInfo.getQdzCode(), scheduleRealInfo.getZdzCode());
  453 + lsInoutSectionRouteRepository.destroy(scheduleRealInfo.getXlBm(), versions, scheduleRealInfo.getQdzName(), scheduleRealInfo.getZdzName());
454 454 sectionSave(map);
455 455 }
456 456 }
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
... ... @@ -59,18 +59,18 @@ var PublicFunctions = function () {
59 59 startOrEndPoint: function(points, carpark) {
60 60 var harr = new Array, i = 0;
61 61 for (i = 0;i < points.length;i++) {
62   - harr.push('<option value="', points[i].stationCode, '_station">', points[i].stationName, '</option>');
  62 + harr.push('<option value="', points[i].stationName, '_station">', points[i].stationName, '</option>');
63 63 points[i].bdPoint = points[i].station.bJwpoints;
64 64 points[i].bdPoints = points[i].station.bdPolygon;
65 65 points[i].shapesType = points[i].station.shapesType;
66 66 points[i].radius = points[i].station.radius;
67   - mapData[points[i].stationCode + '_station'] = points[i];
  67 + mapData[points[i].stationName + '_station'] = points[i];
68 68 }
69   - harr.push('<option value="', carpark.parkCode, '_park">', carpark.parkName, '</option>');
  69 + harr.push('<option value="', carpark.parkName, '_park">', carpark.parkName, '</option>');
70 70 carpark.bdPoint = carpark.bCenterPoint;
71 71 carpark.bdPoints = carpark.bParkPoint;
72 72 carpark.stationName = carpark.parkName;
73   - mapData[carpark.parkCode + '_park'] = carpark;
  73 + mapData[carpark.parkName + '_park'] = carpark;
74 74  
75 75 return harr.join('');
76 76 },
... ...
src/main/resources/static/pages/base/stationroute/list_template.html
... ... @@ -55,8 +55,8 @@
55 55 $(function () {
56 56 // 异步请求获取表格数据
57 57 var params = {};
58   - params.qdzCode_eq = $('#startPoint').val().split('_')[0];
59   - params.zdzCode_eq = $('#endPoint').val().split('_')[0];
  58 + params.qdzName_eq = $('#startPoint').val().split('_')[0];
  59 + params.zdzName_eq = $('#endPoint').val().split('_')[0];
60 60 params.xlBm_eq = LineObj.getLineObj().id;
61 61 $.ajax({
62 62 url: "/real_control_v2/assets/imgs/time.gif",
... ...