添加冲突检查状态 图形标识

src/jmapNew/config/skinCode/xian_01.js

@@ -145,6 +145,7 @@ class SkinCode extends defaultStyle {
                 defaultColor: '#FFFFFF',						// 信号灯字体默认色
                 blockColor: '#FFFFFF',							// 信号灯字体锁定颜色
                 checkColor: '#00FF00',							// 信号字体
+                conflictColor:'#FF0000', // 冲突进路始端信号机颜色
                 nameBorderShow: true							// 信号机名字边框显示
             },
             lamp: {

src/jmapNew/map.js

@@ -568,11 +568,13 @@ class Jlmap {
                 routeStartSignalData[item.code].forEach((elem, index)=> {
                     if (index) {
                         status.atsControl = status.atsControl && elem.atsControl;
+                        status.checkConflict = status.checkConflict || elem.checkConflict;
                         status.fleetMode = status.fleetMode || elem.fleetMode;
                         status.ciControl = status.ciControl || elem.ciControl;
                         status.lock = status.lock || elem.lock;
                     } else {
                         status.atsControl = elem.atsControl;
+                        status.checkConflict = elem.checkConflict;
                         status.fleetMode = elem.fleetMode;
                         status.ciControl = elem.ciControl;
                         status.lock = elem.lock;

src/jmapNew/shape/graph/Signal/index.js

@@ -986,6 +986,11 @@ class Signal extends Group {
                     !model.atsControl && this.setArtificialRouteClose(); /** 进路交人工控或自动控 */
                 }
             }
+            // 冲突检查状态
+            if (this.style.Signal.text.conflictColor && model.checkConflict) {
+                this.sigName.setColor(this.style.Signal.text.conflictColor);
+            }
+
             // 设置点灯类型 必须在最后设置不能放前面 logicLight  0 物理点灯 1 逻辑点灯
             if (model.logicLight) {
                 this.logicalLight(); // 设置逻辑点灯