update...

潘钊
1 parent 76e17e01
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/static/real_control_v2/css/main.css
@@ -947,7 +947,7 @@ public class DayOfSchedule {
         try {
             GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
             if(gps != null && gps.isOnline()){
-                if(!gps.getLineId().equals(sch.getXlBm())){
+                if(StringUtils.isNotEmpty(gps.getLineId()) && !gps.getLineId().equals(sch.getXlBm())){
                     //下发线路切换指令
                     DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
                     logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
@@ -1243,7 +1243,7 @@ ul.left_tabs_lg li{
 }
  
 .uk-tooltip{
-    z-index: 29999999;
+    z-index: 29999999 !important;
 }
  
 .device_config_table.ct_table dl dd,