From 84c379410f007942cd0a0c7d5b621055fc724ced Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 6 Mar 2020 19:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=99=E5=8F=B0=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/chengdu_01.js | 6 +++--- src/jmapNew/config/skinCode/chengdu_03.js | 4 ++-- src/jmapNew/config/skinCode/haerbin_01.js | 2 +- src/jmapNew/shape/Station/index.js | 1 - src/jmapNew/shape/StationStand/EDetain.js | 9 +++++++-- src/jmapNew/shape/StationStand/index.js | 3 ++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 825d54c2e..93ae793ac 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -208,7 +208,7 @@ class SkinCode extends defaultStyle { this[deviceType.StationStand] = { common: { // 通用属性 textFontSize: 10, // 站台默认字体大小 - haveJumpShow: true, // 站台是否有列车停跳显示 + haveJumpShow: false, // 站台是否有列车停跳显示 functionButtonShow: [] // 功能灯按钮显示条件（prdType） }, safetyDoor: { // 屏蔽门 @@ -236,9 +236,9 @@ class SkinCode extends defaultStyle { autoChangeEndsColor: '#0BF400' // 站台自动换端 }, detainCar: { // 扣车 - text: '扣', // 扣车显示内容 + text: 'H', // 扣车显示内容 position: -1, // 扣车方向 - offset: {x: -8, y: -20}, // 扣车偏移量 + offset: {x: -8, y: 13}, // 扣车偏移量 trainColor: 'yellow', // 车站扣车颜色 centerTrainColor: 'white', // 中心扣车颜色 andCenterTrainColor: 'red', // 车站+中心扣车颜色 diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index da0e6a652..72b5297d2 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -258,8 +258,8 @@ class SkinCode extends defaultStyle { text: '跳', // 停跳显示内容 position: -1, // 停跳方向 offset: {x: -8, y: 10}, - textColor: '#0000FF', // 停跳文字颜色 - arcColor: '#0000FF', // 停跳圆圈颜色 + textColor: '#00ffcc', // 停跳文字颜色 + arcColor: '#00ffcc', // 停跳圆圈颜色 fillColor: 'rgba(0,0,0,0)', // 透明填充颜色 r: 8 // 圆半径大小 }, diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index f69e8d708..2041f1767 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -237,7 +237,7 @@ class SkinCode extends defaultStyle { position: -1, // 扣车方向 offset: { x: -8, y: -6 }, // 扣车偏移量 trainColor: '#E4EF50', // 车站扣车颜色 - centerTrainColor: '#FFFFFF', // 中心扣车颜色 + centerTrainColor: 'red', // 中心扣车颜色 andCenterTrainColor: '#F61107', // 车站+中心扣车颜色 detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色 }, diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index cc0607f97..b9f7ce994 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -121,7 +121,6 @@ export default class Station extends Group { createGuideTotalLock() { // 创建引导总锁 const model = this.model; const style = this.style; - console.log(model.guideTotalLockPoint); if (model.guideTotalLock || (!this.prdType && style.Station.functionButtonShow.indexOf(this.prdType) !== -1 && model.guideTotalLockPoint)) { this.guideLamp = new EControl({ zlevel: this.zlevel, diff --git a/src/jmapNew/shape/StationStand/EDetain.js b/src/jmapNew/shape/StationStand/EDetain.js index 16d67df09..86cbb0d65 100644 --- a/src/jmapNew/shape/StationStand/EDetain.js +++ b/src/jmapNew/shape/StationStand/EDetain.js @@ -91,8 +91,13 @@ class EDetain extends Group { } show() { - this.create('H'); - this.detain.show(); + if (this.model.style.StationStand.common.special) { + this.detain.setStyle('text', 'H'); + } else { + this.create('H'); + this.detain.show(); + } + } } diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index b5f34e2ae..426ba30bc 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -476,11 +476,12 @@ class StationStand extends Group { } /** 设置跳停*/ - // this.unJumpStop(); // 未设置跳停 + // model.assignSkip = 1; model.assignSkip && this.designatedJumpStop(); // 指定站台跳停 model.allSkip && this.jumpStop(); // 站台全部跳停 /** 设置扣车*/ + // model.centerHoldTrain = 1; if (model.stationHoldTrain && model.centerHoldTrain) { this.standAndCenterDetainTrain(); // 中心+车站扣车 } else if (model.stationHoldTrain) {