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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
lVAL 2021-01-15 16:09:35 +08:00
commit c06bad3005
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -175,6 +175,7 @@ class SkinCode extends defaultStyle {
mainSignalVerColor: '#00FF00', // 主信号控制级 灯柱竖柱颜色 level 3
closeSignalVerColor: '#FF1F10', // 关闭信号 灯柱竖柱颜色 level 1
guideSignalVerColor: '#FFFF00', // 引导信号控制级 灯柱竖柱颜色 level 2
autoRouteVerColor: '#9DFF6E', // 联锁自动进路颜色
standardVerticalShape: '8', // 灯柱 竖杆 8边型
standardLength: 12, // 高柱长度
standardHeight: 5, // 灯柱高度
@ -188,11 +189,10 @@ class SkinCode extends defaultStyle {
isAlignCenter: true, // 信号字体对其方式
fontSize: 11, // 信号机名称字体大小
fontWeight: 'bold', // 信号机名称字体粗细
defaultColor: '#00CE00', // 信号灯字体默认色
blockColor: '#ffffff', // 信号灯字体锁定颜色
checkColor: '#00FF00', // 信号字体
ArtificialRouteColor: '#FFFFFF', // ATS关自排 设定颜色
AutoRouteColor: '#D8D800', // 联锁自动进路颜色
defaultColor: '#0F0', // 信号灯字体默认色
blockColor: '#0F0', // 信号灯字体锁定颜色
checkColor: '#0F0', // 信号字体
ArtificialRouteColor: '#F00', // ATS关自排 设定颜色
nameBorderShow: false // 信号机名字边框显示
},
lamp: {

13
src/jmapNew/shape/Signal/ESigPost.js
View File

@ -75,11 +75,16 @@ class ESigPost extends Group {
this.add(this.ver);
this.add(this.hor);
}
getVer() {
return this.ver;
setVerColor(color) {
if (color) {
this.ver && this.ver.setStyle({ stroke: color });
this.ver && this.ver.setStyle({ fill: color });
}
}
getHor() {
return this.hor;
setHorColor(color) {
if (color) {
this.hor && this.hor.setStyle({ stroke: color });
}
}
setColor(color) {
if (color) {

31
src/jmapNew/shape/Signal/index.js
View File

@ -375,10 +375,7 @@ class Signal extends Group {
this.lamps[1] && this.lamps[1].setColor(this.style.backgroundColor);
this.lamps[2] && this.lamps[2].setColor(this.style.backgroundColor);
}
if (this.style.Signal.post.closeHorColor) {
const hor = this.sigPost.getHor();
hor.setStyle({ stroke: this.style.Signal.post.closeHorColor });
}
this.sigPost.setHorColor(this.style.Signal.post.closeHorColor);
}
}
@ -411,10 +408,7 @@ class Signal extends Group {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
}
}
if (this.style.Signal.post.openHorColor) {
const hor = this.sigPost.getHor();
hor.setStyle({ stroke: this.style.Signal.post.openHorColor });
}
this.sigPost.setHorColor(this.style.Signal.post.openHorColor);
}
}
@ -464,8 +458,7 @@ class Signal extends Group {
this.lamps[0].setStyle({ fill: this.style.Signal.lamp.yellowColor, stroke: this.style.Signal.lamp.redColor, lineWidth: 2.5 });
} else if (this.style.Signal.lamps.guidName === 'post') {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor);
const hor = this.sigPost.getHor();
hor.setStyle({ stroke: this.style.Signal.post.guideHorColor });
this.sigPost.setHorColor(this.style.Signal.post.guideHorColor);
}
}
@ -488,10 +481,7 @@ class Signal extends Group {
}
}
reblock() {
if (this.style.Signal.post.reblockHorColor) {
const hor = this.sigPost.getHor();
hor.setStyle({ stroke: this.style.Signal.post.reblockHorColor });
}
this.sigPost.setHorColor(this.style.Signal.post.reblockHorColor);
}
// 功能封锁
functionBlock() {
@ -560,7 +550,7 @@ class Signal extends Group {
this.sigRoute.show();
this.sigRoute.setStyle({ fill: this.style.Signal.auto.manualControl });
}
if (this.style.Signal.lamp.guidName === 'doubleAndBase') {
if (this.style.Signal.text.ArtificialRouteColor) {
this.sigName.setColor(this.style.Signal.text.ArtificialRouteColor);
}
if (this.style.Signal.auto.lampstandard) {
@ -585,6 +575,8 @@ class Signal extends Group {
}
if (this.style.Signal.post.autoRouteColor) {
this.sigPost.setColor(this.style.Signal.post.autoRouteColor);
} else if (this.style.Signal.post.autoRouteVerColor) {
this.sigPost.setVerColor(this.style.Signal.post.setVerColor);
}
}
@ -760,13 +752,12 @@ class Signal extends Group {
});
}
}
const ver = this.sigPost.getVer();
if ( model.level === 3 && this.style.Signal.post.mainSignalVerColor) {
ver.setStyle({ stroke: this.style.Signal.post.mainSignalVerColor, fill: this.style.Signal.post.mainSignalVerColor });
if ( model.level === 3) {
this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor);
} else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor) {
ver.setStyle({ stroke: this.style.Signal.post.closeSignalVerColor, fill: this.style.Signal.post.closeSignalVerColor });
this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor);
} else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor) {
ver.setStyle({ stroke: this.style.Signal.post.guideSignalVerColor, fill: this.style.Signal.post.guideSignalVerColor });
this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor);
}
// 信号机故障
model.fault && this.fault();