线雕更新

lizhuojun
1 parent b43febb0
Showing 4 changed files with 18 additions and 6 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -12,6 +12,7 @@ import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -252,14 +253,19 @@ public class GpsServiceImpl implements GpsService {
         for(Map<String, Object> rs : dataList){
             int index=dataList.indexOf(rs);
             if (index< dataList.size()-1&&!map_get_str( rs,"LINE_ID").equals(map_get_str( dataList.get(index+1),"LINE_ID"))){
+
+                Line cLine =lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID")));
+                Line nextLine =lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID")));
+                if (cLine!=null&&nextLine!=null){
                 Map<String,Object> LSmap=new HashMap<>();
-                String name=lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID"))).getName();
-                String NextName=lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID"))).getName();
+                String name=cLine.getName();
+                String NextName=nextLine.getName();
                 LSmap.put("abnormalType","linesSwitch");
                 LSmap.put("line_line",name+"-->"+NextName);
                 LSmap.put("st",map_get_long(rs, "TS"));
                 LSmap.put("et",index== dataList.size()-1?map_get_long(rs, "TS"):map_get_long( dataList.get(index+1), "TS"));
                 lineSwitch.add(LSmap);
+                }
             }
             serviceState = map_get_long(rs, "SERVICE_STATE");
             if(getGpsValid(serviceState) == 1){
@@ -566,6 +566,12 @@ dl.relevance-active.intimity dd.tl-qrlb{
     color: #f8e9cd;
 }
+dl.relevance-active dd.tl-wfyd,
+dl.relevance-active.intimity dd.tl-wfyd{
+    background: linear-gradient(to right, rgb( 246,193,10), rgb(226, 226, 168), #8baabf) !important;
+    color: #f8e9cd;
+}
+
 dl.relevance-active dd.tl-wd,
 dl.relevance-active.intimity dd.tl-wd{
     background: linear-gradient(to right, #ffff00, rgb(226, 226, 168), rgb(139, 170, 191)) !important;
@@ -39,6 +39,7 @@
                 <span class="tl-xxfc">消息发出</span>
                 <span class="tl-xxsd">消息收到</span>
                 <span class="tl-xxrd">消息阅读</span>
+                <span class="tl-wfyd">无发有到</span>
             </div>
         </div>
     </script>
@@ -186,7 +186,7 @@ var gb_schedule_table = (function () {
     };
     //无发有到时间
     var wfydcolor=function (sch) {
-        if (sch.qdzArrDatesj!=''&&sch.qdzArrDatesj!=null&&sch.fcsjActual==null) {
+        if (sch.fcsjActual==null&&sch.zdsjActual!=null&&sch.zdsjActual!=''&&sch.status!=-1) {//sch.qdzArrDatesj!=''&&sch.qdzArrDatesj!=null&&
             sch.status=4;
         }
     }
@@ -274,7 +274,6 @@ var gb_schedule_table = (function () {
      * @param lineCode
      */
     var reLoadAndRefresh = function (lineCode) {
-        debugger
         $.get('/realSchedule/lines', {
             lines: lineCode + ','
         }, function (rs) {
@@ -387,8 +386,8 @@ var gb_schedule_table = (function () {
         else
             $(dds[8]).html('');
         if (sch.lpChange==1) {
-            var d8html=$(dds[8]).html();
-            $(dds[8]).html(d8html+'<span class="uk-badge uk-badge-success out">换</span>');
+            var d8html=$(dds[5]).html();
+            $(dds[5]).html(d8html+'<span class="uk-badge uk-badge-success out">换</span>');
         }
         //信号状态标记