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

徐烜
2 parents 5f7c99a8 ee217951
Showing 4 changed files with 29 additions and 6 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/resources/static/real_control_v2/css/ct_table.css
src/main/resources/static/real_control_v2/css/line_schedule.css
@@ -494,6 +494,9 @@ public class DayOfSchedule implements CommandLineRunner {
         if (config != null)
             outConfig = config.getOutConfig();
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -506,7 +509,8 @@ public class DayOfSchedule implements CommandLineRunner {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out"))
+            if (outConfig == 2 && temp.getBcType().equals("out")
+                    && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
             if (flag) {
@@ -529,6 +533,9 @@ public class DayOfSchedule implements CommandLineRunner {
         if (config != null)
             outConfig = config.getOutConfig();
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -541,7 +548,8 @@ public class DayOfSchedule implements CommandLineRunner {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out"))
+            if (outConfig == 2 && temp.getBcType().equals("out")
+                    && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
             if (flag && temp.getXlDir().equals(sch.getXlDir())) {
@@ -47,6 +47,9 @@ public class LineConfig {
 	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
+	/** 出站既出场 对应的停车场 */
+	private String twinsPark;
+
 	/** 短语模板 , 号分隔多个 */
 	private String phraseTemps;
@@ -208,4 +211,12 @@ public class LineConfig {
 	public void setDownOutDiff(int downOutDiff) {
 		this.downOutDiff = downOutDiff;
 	}
+
+	public String getTwinsPark() {
+		return twinsPark;
+	}
+
+	public void setTwinsPark(String twinsPark) {
+		this.twinsPark = twinsPark;
+	}
 }
@@ -33,6 +33,7 @@
 .ct_table>.ct_table_body {
     width: 100%;
     border-bottom: 1px solid #dedede;
+    color: #000;
 }
 .ct_table dl {
@@ -96,7 +96,7 @@
 }
 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
-    width: calc(2% + 86px);
+    width: calc(2% + 66px);
 }
 .line-schedule-table dl dt:nth-of-type(4), .line-schedule-table dl dd:nth-of-type(4) {
@@ -122,7 +122,7 @@
 }
 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
-    width: 50px;
+    width: 70px;
     border-right: 0;
 }
@@ -238,6 +238,10 @@
     height: 36px;
 }
+.schedule-body .ct_table dl:nth-child(even){
+    background: rgba(249, 249, 249, 0.31);
+}
+
 span.fcsj-diff {
     color: gray;
     margin-left: 3px;
@@ -528,8 +532,7 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 }
 dl.relevance-active dd:nth-child(n+2) {
-    background: #f1efef !important;
-    color: #333;
+    background: #c1e2f9 !important;
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {