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 2021-01-05 15:09:25 +08:00
commit 5dadc4747a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@ class Signal extends Group {
const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下
// 信号机高柱矮柱 (信号机底座)
const sigPostY = model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR);
this.sigPost = new ESigPost({
zlevel: this.zlevel,
z: this.z,
@ -64,28 +65,23 @@ class Signal extends Group {
drict: drict,
type: model.lampPostType,
x: model.position.x + model.positionPoint.x,
y: model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR)
y: sigPostY
});
if (style.Signal.ciConfirm) {
this.ciConfirm = new Text({
this.ciConfirm = new Text({ // 信号机使能 E 西安二号线独有
zlevel: this.zlevel,
z: this.z,
_val: '3',
silent: false,
_subType: 'enabled',
_subType: 'enabled', // 标识
style: {
textBorderColor: 'red',
textBorderWidth: 0,
x: model.position.x + model.positionPoint.x,
y: model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR + style.Signal.ciConfirm.distance),
fontWeight: style.textStyle.fontWeight,
x: model.position.x + model.positionPoint.x - drict * 25,
y: sigPostY + posit * 11,
fontSize: style.Signal.ciConfirm.fontSize,
fontFamily: style.fontFamily,
text: style.Signal.ciConfirm.defaultText,
textFill: style.Signal.ciConfirm.textColor,
textAlign: style.textStyle.textAlign,
textPosition: 'inside',
textVerticalAlign: style.textStyle.textVerticalAlign
textVerticalAlign: style.textStyle.textVerticalAlign,
textFill: style.Signal.ciConfirm.textColor
}
});
this.add(this.ciConfirm);

1
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -416,6 +416,7 @@ export default {
device: this.selected,
operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '终端信号解封'},
param: {signalCode: this.selected.code},
ciConfirm: true,
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
});
this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: 'Signal', isRequestLock: 1}]);