Commit a71c3e6c8f80e8cade34f8c8af0463815d5c6c14
1 parent
1294cdc5
update...
Showing
3 changed files
with
11 additions
and
3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -203,6 +203,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -203,6 +203,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 203 | return rs; | 203 | return rs; |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | + if(!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(nbbm))){ | ||
| 207 | + rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + nbbm + "】的车辆"); | ||
| 208 | + return rs; | ||
| 209 | + } | ||
| 210 | + | ||
| 206 | Personnel spy = null; | 211 | Personnel spy = null; |
| 207 | if(StringUtils.isNotEmpty(sGh)){ | 212 | if(StringUtils.isNotEmpty(sGh)){ |
| 208 | spy = BasicData.perMap.get(gsbm + "-" + sGh); | 213 | spy = BasicData.perMap.get(gsbm + "-" + sGh); |
| @@ -232,7 +237,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -232,7 +237,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 232 | } | 237 | } |
| 233 | 238 | ||
| 234 | if(!(gsbm + "_" + fgsbm).equals(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm))){ | 239 | if(!(gsbm + "_" + fgsbm).equals(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm))){ |
| 235 | - msg = ("【" + nbbm + "】" + "是" + sch.getFgsName() + "的车辆！"); | 240 | + |
| 241 | + String clFgsName = BasicData.businessFgsCodeNameMap.get(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm)); | ||
| 242 | + | ||
| 243 | + msg = ("【" + nbbm + "】" + "是" + clFgsName + "的车辆！"); | ||
| 236 | rs.put("msg", msg); | 244 | rs.put("msg", msg); |
| 237 | rs.put("checkStatus", -1); | 245 | rs.put("checkStatus", -1); |
| 238 | return rs; | 246 | return rs; |
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
| @@ -317,12 +317,12 @@ | @@ -317,12 +317,12 @@ | ||
| 317 | * 渲染场既是站dom | 317 | * 渲染场既是站dom |
| 318 | */ | 318 | */ |
| 319 | function renderPSDom() { | 319 | function renderPSDom() { |
| 320 | - $('.c_2_s_list', $panel).html(''); | ||
| 321 | var pArray = conf.twinsParks.split(','), | 320 | var pArray = conf.twinsParks.split(','), |
| 322 | cArray = conf.twinsStations.split(','); | 321 | cArray = conf.twinsStations.split(','); |
| 323 | var htmlStr = '', | 322 | var htmlStr = '', |
| 324 | $panel = $('.park-and-station-wrap', wrap); | 323 | $panel = $('.park-and-station-wrap', wrap); |
| 325 | 324 | ||
| 325 | + $('.c_2_s_list', $panel).html(''); | ||
| 326 | if(conf['outConfig']!=2){ | 326 | if(conf['outConfig']!=2){ |
| 327 | $panel.hide().find('.c_2_s_list').empty(); | 327 | $panel.hide().find('.c_2_s_list').empty(); |
| 328 | return; | 328 | return; |
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
| @@ -836,7 +836,7 @@ var gb_schedule_table = (function () { | @@ -836,7 +836,7 @@ var gb_schedule_table = (function () { | ||
| 836 | if(wrap.length==0) | 836 | if(wrap.length==0) |
| 837 | continue; | 837 | continue; |
| 838 | 838 | ||
| 839 | - $('.schedule-wrap span.warn_multi_station', wrap) | 839 | + $(".schedule-wrap span.warn_multi_station[data-updown="+(k.split('_')[1])+"]", wrap) |
| 840 | .html('班次站点编码与实际不符！！！').show(); | 840 | .html('班次站点编码与实际不符！！！').show(); |
| 841 | } | 841 | } |
| 842 | 842 |