潘钊 / bsth_control · Commits

Commit 7c044cb7b9674478ff5689c65848d676653a393f

Authored by lizhuojun
1 parent b43febb0
build: skipped

线雕更新

Inline Side-by-side
Showing 4 changed files with 18 additions and 6 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
  View file @7c044cb
... ... @@ -12,6 +12,7 @@ import com.bsth.data.pilot80.PilotReport;
12 12 import com.bsth.data.safe_driv.SafeDriv;
13 13 import com.bsth.data.safe_driv.SafeDrivCenter;
14 14 import com.bsth.data.schedule.DayOfSchedule;
  15 +import com.bsth.entity.Line;
15 16 import com.bsth.entity.LineVersions;
16 17 import com.bsth.entity.directive.D80;
17 18 import com.bsth.entity.realcontrol.ScheduleRealInfo;
... ... @@ -252,14 +253,19 @@ public class GpsServiceImpl implements GpsService {
252 253 for(Map<String, Object> rs : dataList){
253 254 int index=dataList.indexOf(rs);
254 255 if (index< dataList.size()-1&&!map_get_str( rs,"LINE_ID").equals(map_get_str( dataList.get(index+1),"LINE_ID"))){
  256 +
  257 + Line cLine =lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID")));
  258 + Line nextLine =lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID")));
  259 + if (cLine!=null&&nextLine!=null){
255 260 Map<String,Object> LSmap=new HashMap<>();
256   - String name=lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID"))).getName();
257   - String NextName=lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID"))).getName();
  261 + String name=cLine.getName();
  262 + String NextName=nextLine.getName();
258 263 LSmap.put("abnormalType","linesSwitch");
259 264 LSmap.put("line_line",name+"-->"+NextName);
260 265 LSmap.put("st",map_get_long(rs, "TS"));
261 266 LSmap.put("et",index== dataList.size()-1?map_get_long(rs, "TS"):map_get_long( dataList.get(index+1), "TS"));
262 267 lineSwitch.add(LSmap);
  268 + }
263 269 }
264 270 serviceState = map_get_long(rs, "SERVICE_STATE");
265 271 if(getGpsValid(serviceState) == 1){
... ...
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @7c044cb
... ... @@ -566,6 +566,12 @@ dl.relevance-active.intimity dd.tl-qrlb{
566 566 color: #f8e9cd;
567 567 }
568 568  
  569 +dl.relevance-active dd.tl-wfyd,
  570 +dl.relevance-active.intimity dd.tl-wfyd{
  571 + background: linear-gradient(to right, rgb( 246,193,10), rgb(226, 226, 168), #8baabf) !important;
  572 + color: #f8e9cd;
  573 +}
  574 +
569 575 dl.relevance-active dd.tl-wd,
570 576 dl.relevance-active.intimity dd.tl-wd{
571 577 background: linear-gradient(to right, #ffff00, rgb(226, 226, 168), rgb(139, 170, 191)) !important;
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
  View file @7c044cb
... ... @@ -39,6 +39,7 @@
39 39 <span class="tl-xxfc">消息发出</span>
40 40 <span class="tl-xxsd">消息收到</span>
41 41 <span class="tl-xxrd">消息阅读</span>
  42 + <span class="tl-wfyd">无发有到</span>
42 43 </div>
43 44 </div>
44 45 </script>
... ...
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
  View file @7c044cb
... ... @@ -186,7 +186,7 @@ var gb_schedule_table = (function () {
186 186 };
187 187 //无发有到时间
188 188 var wfydcolor=function (sch) {
189   - if (sch.qdzArrDatesj!=''&&sch.qdzArrDatesj!=null&&sch.fcsjActual==null) {
  189 + if (sch.fcsjActual==null&&sch.zdsjActual!=null&&sch.zdsjActual!=''&&sch.status!=-1) {//sch.qdzArrDatesj!=''&&sch.qdzArrDatesj!=null&&
190 190 sch.status=4;
191 191 }
192 192 }
... ... @@ -274,7 +274,6 @@ var gb_schedule_table = (function () {
274 274 * @param lineCode
275 275 */
276 276 var reLoadAndRefresh = function (lineCode) {
277   - debugger
278 277 $.get('/realSchedule/lines', {
279 278 lines: lineCode + ','
280 279 }, function (rs) {
... ... @@ -387,8 +386,8 @@ var gb_schedule_table = (function () {
387 386 else
388 387 $(dds[8]).html('');
389 388 if (sch.lpChange==1) {
390   - var d8html=$(dds[8]).html();
391   - $(dds[8]).html(d8html+'<span class="uk-badge uk-badge-success out">换</span>');
  389 + var d8html=$(dds[5]).html();
  390 + $(dds[5]).html(d8html+'<span class="uk-badge uk-badge-success out">换</span>');
392 391 }
393 392  
394 393 //信号状态标记
... ...