潘钊 / bsth_control · Commits

Commit f7687e65889f9cf94ba56c4b2e8141e602629082

Authored by 徐烜
2 parents 5f7c99a8 ee217951
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 4 changed files with 29 additions and 6 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @f7687e6
... ... @@ -494,6 +494,9 @@ public class DayOfSchedule implements CommandLineRunner {
494 494 if (config != null)
495 495 outConfig = config.getOutConfig();
496 496  
  497 + //限定出站既出场的停车场
  498 + String park = config.getTwinsPark();
  499 + boolean limitPark = StringUtils.isNotEmpty(park);
497 500 boolean flag = false;
498 501 ScheduleRealInfo next = null;
499 502 for (ScheduleRealInfo temp : list) {
... ... @@ -506,7 +509,8 @@ public class DayOfSchedule implements CommandLineRunner {
506 509 continue;
507 510  
508 511 //出站既出场，忽略出场班次
509   - if (outConfig == 2 && temp.getBcType().equals("out"))
  512 + if (outConfig == 2 && temp.getBcType().equals("out")
  513 + && (!limitPark || park.equals(temp.getQdzCode())))
510 514 continue;
511 515  
512 516 if (flag) {
... ... @@ -529,6 +533,9 @@ public class DayOfSchedule implements CommandLineRunner {
529 533 if (config != null)
530 534 outConfig = config.getOutConfig();
531 535  
  536 + //限定出站既出场的停车场
  537 + String park = config.getTwinsPark();
  538 + boolean limitPark = StringUtils.isNotEmpty(park);
532 539 boolean flag = false;
533 540 ScheduleRealInfo next = null;
534 541 for (ScheduleRealInfo temp : list) {
... ... @@ -541,7 +548,8 @@ public class DayOfSchedule implements CommandLineRunner {
541 548 continue;
542 549  
543 550 //出站既出场，忽略出场班次
544   - if (outConfig == 2 && temp.getBcType().equals("out"))
  551 + if (outConfig == 2 && temp.getBcType().equals("out")
  552 + && (!limitPark || park.equals(temp.getQdzCode())))
545 553 continue;
546 554  
547 555 if (flag && temp.getXlDir().equals(sch.getXlDir())) {
... ...
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
  View file @f7687e6
... ... @@ -47,6 +47,9 @@ public class LineConfig {
47 47 /** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
48 48 private int outConfig;
49 49  
  50 + /** 出站既出场 对应的停车场 */
  51 + private String twinsPark;
  52 +
50 53 /** 短语模板 , 号分隔多个 */
51 54 private String phraseTemps;
52 55  
... ... @@ -208,4 +211,12 @@ public class LineConfig {
208 211 public void setDownOutDiff(int downOutDiff) {
209 212 this.downOutDiff = downOutDiff;
210 213 }
  214 +
  215 + public String getTwinsPark() {
  216 + return twinsPark;
  217 + }
  218 +
  219 + public void setTwinsPark(String twinsPark) {
  220 + this.twinsPark = twinsPark;
  221 + }
211 222 }
... ...
src/main/resources/static/real_control_v2/css/ct_table.css
  View file @f7687e6
... ... @@ -33,6 +33,7 @@
33 33 .ct_table>.ct_table_body {
34 34 width: 100%;
35 35 border-bottom: 1px solid #dedede;
  36 + color: #000;
36 37 }
37 38  
38 39 .ct_table dl {
... ...
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @f7687e6
... ... @@ -96,7 +96,7 @@
96 96 }
97 97  
98 98 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
99   - width: calc(2% + 86px);
  99 + width: calc(2% + 66px);
100 100 }
101 101  
102 102 .line-schedule-table dl dt:nth-of-type(4), .line-schedule-table dl dd:nth-of-type(4) {
... ... @@ -122,7 +122,7 @@
122 122 }
123 123  
124 124 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
125   - width: 50px;
  125 + width: 70px;
126 126 border-right: 0;
127 127 }
128 128  
... ... @@ -238,6 +238,10 @@
238 238 height: 36px;
239 239 }
240 240  
  241 +.schedule-body .ct_table dl:nth-child(even){
  242 + background: rgba(249, 249, 249, 0.31);
  243 +}
  244 +
241 245 span.fcsj-diff {
242 246 color: gray;
243 247 margin-left: 3px;
... ... @@ -528,8 +532,7 @@ div.drop-rail[data-type="car"]:before {
528 532 }
529 533  
530 534 dl.relevance-active dd:nth-child(n+2) {
531   - background: #f1efef !important;
532   - color: #333;
  535 + background: #c1e2f9 !important;
533 536 }
534 537  
535 538 dl.relevance-active.intimity dd:nth-child(n+2) {
... ...