From 4dffdb5aba0b868708e7c309fd1a2b6d25908774 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 18 Oct 2021 10:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=89=A3=E8=BD=A6=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/nanjing_02.js | 2 +- src/jmapNew/shape/graph/StationStand/detain/EDetain.js | 3 ++- src/jmapNew/theme/nanjing_02/menus/menuButton.vue | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index cd75d85ed..32358d6aa 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -314,7 +314,7 @@ class SkinCode extends defaultStyle { detainNormal:{ z:0, position: 1, // 扣车标识在站台上显示方向 - special:false, + special:true, text: 'H', // 扣车显示内容 insideOffset: { x: 15, y: -28 }, // 内站台扣车偏移量 outsideOffset: { x:15, y: 22 }, // 外站台扣车偏移量 diff --git a/src/jmapNew/shape/graph/StationStand/detain/EDetain.js b/src/jmapNew/shape/graph/StationStand/detain/EDetain.js index ca10c9511..7fd1ff738 100644 --- a/src/jmapNew/shape/graph/StationStand/detain/EDetain.js +++ b/src/jmapNew/shape/graph/StationStand/detain/EDetain.js @@ -42,7 +42,8 @@ class EDetain extends Group { this.add(this.detain); if (deviceParam.special) { - this.detain.setStyle({x:model.position.x - detainD * (model.width / 2 + detainOffset.x), 'textPadding':[1, 3], 'textBorderColor':'#fff', 'textBorderWidth':1}); + //, 'textPadding':[1, 3], 'textBorderColor':'#fff', 'textBorderWidth':1 + this.detain.setStyle({x:model.position.x - detainD * (model.width / 2 + detainOffset.x), y: model.position.y - detainD * 10}); } } } diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index f17ac9ddb..9ff381c1d 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -1256,9 +1256,9 @@ export default { stationAllJumpTrain() { const list = this.stationStandList.filter(el => el.right == this.selectedObj.right); const index = list.findIndex(el => el.code == this.selectedObj.code); - let lists = list.slice(0, index + 1); + let lists = list.slice(index); if (this.selectedObj.right) { - lists = list.slice(index, 9999); + lists = list.slice(0, index + 1); } const row = {}; row.operation = OperationEvent.StationStand.setBulkBuckleTrain.menuButton.operation;