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:
zyy 2020-04-08 14:14:04 +08:00
commit 85eef4b8f9
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/config/deviceStyle.js
View File

@ -1,5 +1,6 @@
const mapDeviceStyle = { const mapDeviceStyle = {
'01': 'chengdu_01', '01': 'chengdu_01',
// '01': 'xian_02'
'02': 'fuzhou_01', '02': 'fuzhou_01',
'03': 'bejing_01', '03': 'bejing_01',
'04': 'chengdu_03', '04': 'chengdu_03',

3
src/jmapNew/config/skinCode/xian_02.js
View File

@ -137,7 +137,8 @@ class SkinCode extends defaultStyle {
standardLength: 7, // 高柱长度 standardLength: 7, // 高柱长度
standardHeight: 6, // 灯柱高度 standardHeight: 6, // 灯柱高度
standardColor: '#fff', // 灯柱颜色 standardColor: '#fff', // 灯柱颜色
standardWidth: 3 // 灯柱宽度 standardWidth: 3, // 灯柱宽度
autoRouteColor: '#008000' // 自动进路开启灯柱颜色
}, },
text: { text: {
show: true, // 信号机名称显示 show: true, // 信号机名称显示

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

@ -88,7 +88,7 @@ class Signal extends Group {
z: this.z - 1, z: this.z - 1,
shape: { shape: {
x: signalRect.x - style.Signal.sigBack.distanceX, x: signalRect.x - style.Signal.sigBack.distanceX,
y: signalRect.y - style.Signal.sigBack.distanceY, y: signalRect.y + style.Signal.sigBack.distanceY,
width: signalRect.width + 2 * style.Signal.sigBack.distanceX, width: signalRect.width + 2 * style.Signal.sigBack.distanceX,
height: signalRect.height - 2 * style.Signal.sigBack.distanceY height: signalRect.height - 2 * style.Signal.sigBack.distanceY
}, },
@ -97,6 +97,8 @@ class Signal extends Group {
fill: style.Signal.sigBack.color fill: style.Signal.sigBack.color
} }
}); });
this.add(this.sigBack);
this.sigBack.hide();
} }
// 信号机名称 // 信号机名称
const sigNameX = model.position.x + model.positionPoint.x - drict * (style.Signal.post.standardWidth) + model.namePosition.x; const sigNameX = model.position.x + model.positionPoint.x - drict * (style.Signal.post.standardWidth) + model.namePosition.x;
@ -311,6 +313,15 @@ class Signal extends Group {
this.sigName.setStyle({ textBorderWidth: 1 }); this.sigName.setStyle({ textBorderWidth: 1 });
this.sigName.setColor('#fff'); this.sigName.setColor('#fff');
} }
// if (this.style.Signal.sigBack) {
// this.sigBack.show();
// this.sigBack.animateStyle(true)
// .when(0, { fill: this.style.backgroundColor })
// .when(1000, { fill: this.style.Signal.sigBack.color })
// .when(2000, { fill: this.style.backgroundColor })
// .when(3000, { fill: this.style.Signal.sigBack.color })
// .start();
// }
} }
// 功能封锁 // 功能封锁
@ -366,6 +377,9 @@ class Signal extends Group {
this.sigName.setColor(this.style.Signal.text.AutoRouteColor); this.sigName.setColor(this.style.Signal.text.AutoRouteColor);
this.setAutoClose(); this.setAutoClose();
} }
if (this.style.Signal.post.autoRouteColor) {
this.sigPost.setColor(this.style.Signal.post.autoRouteColor);
}
} }
// 信号机进路自动触发模式状态类型 // 信号机进路自动触发模式状态类型