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