update...

潘钊
1 parent 1294cdc5
Showing 3 changed files with 11 additions and 3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -203,6 +203,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 return rs;
             }
  
+            if(!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(nbbm))){
+                rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + nbbm + "】的车辆");
+                return rs;
+            }
+
             Personnel spy = null;
             if(StringUtils.isNotEmpty(sGh)){
                 spy = BasicData.perMap.get(gsbm + "-" + sGh);
@@ -232,7 +237,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
  
             if(!(gsbm + "_" + fgsbm).equals(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm))){
-                msg = ("【" + nbbm + "】" + "是" + sch.getFgsName() + "的车辆！");
+
+                String clFgsName = BasicData.businessFgsCodeNameMap.get(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm));
+
+                msg = ("【" + nbbm + "】" + "是" + clFgsName + "的车辆！");
                 rs.put("msg", msg);
                 rs.put("checkStatus", -1);
                 return rs;
@@ -317,12 +317,12 @@
              * 渲染场既是站dom
              */
             function renderPSDom() {
-                $('.c_2_s_list', $panel).html('');
                 var pArray = conf.twinsParks.split(','),
                         cArray = conf.twinsStations.split(',');
                 var htmlStr = '',
                         $panel = $('.park-and-station-wrap', wrap);
  
+                $('.c_2_s_list', $panel).html('');
                 if(conf['outConfig']!=2){
                     $panel.hide().find('.c_2_s_list').empty();
                     return;
@@ -836,7 +836,7 @@ var gb_schedule_table = (function () {
             if(wrap.length==0)
                 continue;
  
-            $('.schedule-wrap span.warn_multi_station', wrap)
+            $(".schedule-wrap span.warn_multi_station[data-updown="+(k.split('_')[1])+"]", wrap)
                 .html('班次站点编码与实际不符！！！').show();
         }