joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-07-22 16:36:18 +08:00
parent 6e45e2c168
commit ede14de20b
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/config/skinCode/xian_01.js
View File

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

2
src/jmapNew/map.js
View File

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

5
src/jmapNew/shape/graph/Signal/index.js
View File

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