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:
fan 2022-07-21 10:15:12 +08:00
commit f6a5512cfc
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,10 +96,13 @@ class SkinCode extends defaultStyle {
isAlignCenter: false, // 信号字体对其方式
fontSize: 11, // 信号机名称字体大小
fontWeight: 'bold', // 信号机名称字体粗细
defaultColor: '#FFFFFF', // 信号灯字体默认色
defaultColor: 'rgb(192,192,192)', // 信号灯字体默认色
// '#FFFFFF'
blockColor: '#FFFFFF', // 信号灯字体锁定颜色
checkColor: '#00FF00' // 信号保护区段检查颜色
},
remainTimeColor: '#F00',
dtTextNearSignalOffset:{x:35, y:5}, // 人工解锁延时时间坐标靠近信号机名称
lamp: {
bgShow: false, // 是否被选中
guidName: 'singleRY', // 成都三号线引导类型
@ -350,8 +353,9 @@ class SkinCode extends defaultStyle {
fpLockColor:'#f00', // 道岔侧防文字背景颜色
guideMasterLockColor:'#f00', // 道岔引导总锁文字背景颜色
locateColor: '#808080', // 道岔定位颜色 ok
inversionColor: '#808080', // 道岔反位颜色 ok
// #808080
locateColor: 'rgb(192,192,192)', // 道岔定位颜色 ok
inversionColor: 'rgb(192,192,192)', // 道岔反位颜色 ok
monolockLocationColor: '#f00', // 道岔单锁'定位'颜色 (绿色)
monolockInversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)

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

@ -375,13 +375,23 @@ class Signal extends Group {
});
const timeNameY = computedPosition.y + model.positionPoint.y - posit * 15;
// 人工解锁延时时间坐标靠近信号机名称 大铁III型
let remainX = sigNameX;
let remainY = timeNameY;
if (style.Signal.dtTextNearSignalOffset) {
remainX = computedPosition.x + style.Signal.dtTextNearSignalOffset.x * drict;
remainY = sigNameY + style.Signal.dtTextNearSignalOffset.y * posit;
}
this.remainTimeName = new ESigName({
zlevel: this.zlevel,
z: this.z,
silent: false,
style: style,
x: sigNameX,
y: timeNameY,
x: remainX,
// + offsetX,sigNameX
y: remainY,
// + offsetY,timeNameY
text: model.remainTime || 0,
fontWeight: style.Signal.text.fontWeight,
fontSize: 12,
@ -936,7 +946,9 @@ class Signal extends Group {
}
});
if (this.model.type === 'SHUNTING') {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
if (!this.style.Signal.dtTextNearSignalOffset) {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
}
}
}
setAshShow() {
@ -1070,6 +1082,8 @@ class Signal extends Group {
}
}
// model.remainTime = 26;
// this.setDelayUnlock();
if (model.remainTime) {
this.showRemainTime(model.remainTime);
} else {