From c7569931ff31881636a86f5d3792260b961f2a7b Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 22 Jun 2021 17:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=20=E4=B8=8A=E8=A1=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BA=86=E8=B6=8A=E7=AB=99=E5=90=8E=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E8=BD=A8=E9=81=93=E4=B8=8A=E7=9C=8B=E4=B8=8D=E6=B8=85=E6=A5=9A?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E8=B0=83=E4=B8=80=E4=B8=8B=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/haerbin_01.js | 10 +++++----- src/jmapNew/shape/graph/StationStand/jump/EJump.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index e7f2e7990..999039334 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -203,12 +203,12 @@ class SkinCode extends defaultStyle { buttonColor: 'darkgreen', // 信号灯按钮颜色 buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色 }, - transmission: { // 传输信号机 + transmission: { // 传输信号机 fillColor: '#f00', - fillColorVirtual: '#000080', + fillColorVirtual: '#000080', sideLength: 20, textColor: '#fff', - strokeColor: '#00FFFF', + strokeColor: '#00FFFF' }, lowButton:{ display: false // 现地 信号机按钮 @@ -282,7 +282,7 @@ class SkinCode extends defaultStyle { z:1, position: 1, // 停跳方向 text: 'S', // 停跳显示内容 - offset: { x: 20, y: 21 }, + offset: { x: 20, y: -21 }, textColor: '#00FF00', // 停跳文字颜色 fontWeight: 'bold', // 文字居中 fontSize: 18 // 文字大小 @@ -829,7 +829,7 @@ class SkinCode extends defaultStyle { fontOffsetX: 45, fontOffsetY: 24 }; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/shape/graph/StationStand/jump/EJump.js b/src/jmapNew/shape/graph/StationStand/jump/EJump.js index eed3053e4..9003befb7 100644 --- a/src/jmapNew/shape/graph/StationStand/jump/EJump.js +++ b/src/jmapNew/shape/graph/StationStand/jump/EJump.js @@ -16,7 +16,7 @@ class EJump extends Group { const jumpDirct = model.right ? -1 : 1; const jumpOffsetY = model.inside ? -1 : 1; const jumpX = model.position.x - jumpDirct * (deviceParam.offset.x - model.width / 2); - const jumpY = model.position.y + jumpDirct * deviceParam.offset.y; + const jumpY = model.position.y + jumpDirct * jumpOffsetY * deviceParam.offset.y; if (deviceParam.special) { this.jump = new Text({