From d68daaa8371eed7dc521d0b0b36109d2f3edbe9a Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 14:26:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/shape/StationStand/EJump.js | 37 ++++++++++++++++++++++++---- src/jmap/shape/StationStand/index.js | 20 ++++++++++++++- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/src/jmap/shape/StationStand/EJump.js b/src/jmap/shape/StationStand/EJump.js index c2823ed7a..7665c6567 100644 --- a/src/jmap/shape/StationStand/EJump.js +++ b/src/jmap/shape/StationStand/EJump.js @@ -1,11 +1,14 @@ import Group from 'zrender/src/container/Group'; import Text from 'zrender/src/graphic/Text'; +import Arc from 'zrender/src/graphic/shape/Arc'; class EJump extends Group { constructor(model) { super(); this.model = model; this.isNew = false; + this.create(); + this.setStatus(); } create() { @@ -23,13 +26,28 @@ class EJump extends Group { fontWeight: 'normal', fontSize: style.StationStand.common.textFontSize, fontFamily: style.textFontFormat, - text: model.name, - textFill: style.StationStand.level.textColor, - textAlign: 'middle' + text: style.StationStand.jump.text, + textFill: style.StationStand.jump.textColor, + textAlign: model.textAlign, + textVerticalAlign: model.textVerticalAlign } }); - + this.jumpArc = new Arc({ + zlevel: model.zlevel, + z: model.z, + shape: { + cx: model.cx, + cy: model.cy, + r: style.StationStand.jump.r + }, + style: { + stroke: style.StationStand.jump.arcColor, + fill: style.StationStand.jump.fillColor + } + }); + this.add(this.jumpArc); this.add(this.jump); + this.jumpArc.hide(); } } @@ -37,7 +55,16 @@ class EJump extends Group { this.create(); this.jump.setStyle('text', val); } - + setStatus(val) { + switch (val) { + case '01': + this.jumpArc.show(); + break; + case '02': + this.jumpArc.hide(); + break; + } + } setColor(color) { this.create(); this.jump.setStyle('textFill', color); diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js index e4b1e8ea7..2c3c11398 100644 --- a/src/jmap/shape/StationStand/index.js +++ b/src/jmap/shape/StationStand/index.js @@ -8,6 +8,7 @@ import ESafeDoor from './ESafeDoor'; import ESafeStand from './ESafeStand'; import ESafeEmergent from './ESafeEmergent'; import EMouse from './EMouse'; +import EJump from './EJump'; class StationStand extends Group { constructor(model, style) { @@ -115,7 +116,6 @@ class StationStand extends Group { y: timeY, name: model.parkingTime || '30' }); - /** 运行等级*/ const levelD = style.StationStand.level.direction ? model.height - distance: -style.StationStand.safetyDoor.height; const levelH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + levelD; @@ -129,6 +129,24 @@ class StationStand extends Group { y: levelY, name: model.intervalRunTime || '5' }); + /** 列车停跳 */ + const jumpD = style.StationStand.jump.direction ? model.height - distance: -style.StationStand.safetyDoor.height; + const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD; + const jumpX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); + const jumpY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y) + drict * jumpH; + const jumpCX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2 - style.StationStand.common.textFontSize/2); + const jumpCY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y + style.StationStand.common.textFontSize / 2) + drict * jumpH; + this.jump = new EJump({ + zlevel: this.zlevel, + z: this.z + 1, + style: style, + x: jumpX, + y: jumpY, + cx: jumpCX, + cy: jumpCY, + textAlign: 'middle', + textVerticalAlign: 'top' + }); this.add(this.safeDoor); this.add(this.safeStand); From 02ba15964ce7bf5bbcd33204eb4d44a4669b7e59 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 14:38:05 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/skinStyle/bejing_01.js | 1 + src/jmap/config/skinStyle/chengdu_03.js | 33 +++++++++++++++--------- src/jmap/shape/StationStand/index.js | 34 ++++++++++++------------- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/jmap/config/skinStyle/bejing_01.js b/src/jmap/config/skinStyle/bejing_01.js index 373284fa4..c96da1f09 100644 --- a/src/jmap/config/skinStyle/bejing_01.js +++ b/src/jmap/config/skinStyle/bejing_01.js @@ -338,6 +338,7 @@ class SkinStyle extends defaultStyle { fontWeight: 'normal', textAlign: 'middle', textVerticalAlign: 'top', + textColor: '#000000', arcColor: '#00FFFF' } }; diff --git a/src/jmap/config/skinStyle/chengdu_03.js b/src/jmap/config/skinStyle/chengdu_03.js index 11037d119..72efc1cbd 100644 --- a/src/jmap/config/skinStyle/chengdu_03.js +++ b/src/jmap/config/skinStyle/chengdu_03.js @@ -165,15 +165,15 @@ class SkinStyle extends defaultStyle { }, stand: { // 站台 headFontSize: 10, // 站台首端字体大小 - spareColor: '#606060', // 站台空闲颜色 - stopColor: '#FEFE00', // 站台列车停站颜色 + spareColor: '#808080', // 站台空闲颜色 + stopColor: '#FFF000', // 站台列车停站颜色 jumpStopColor: '#9A99FF', // 站台跳停颜色 designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色 }, standEmergent: { // 紧急关闭 mergentR: 4, // 站台紧急关闭半径 offset: {x: 0, y: 40}, // 站台紧急关闭偏移量 - closeColor: '#F61107' // 站台紧急关闭颜色 + closeColor: '#C00808' // 站台紧急关闭颜色 }, reentry: { // 站台折返策略 direction: 0, // 折返方向 @@ -182,23 +182,32 @@ class SkinStyle extends defaultStyle { AutoChangeEndsColor: '#0BF400' // 站台自动换端 }, detainCar: { // 扣车 - text: 'H', // 扣车显示内容 + text: '扣', // 扣车显示内容 direction: -1, // 扣车方向 - offset: {x: -8, y: -6}, // 扣车偏移量 - trainColor: '#E4EF50', // 车站扣车颜色 - centerTrainColor: '#FFFFFF', // 中心扣车颜色 - andCenterTrainColor: '#F61107', // 车站+中心扣车颜色 + offset: {x: -8, y: -2}, // 扣车偏移量 + trainColor: '#FFFF00', // 车站扣车颜色 + centerTrainColor: '#C0C0C0', // 中心扣车颜色 + andCenterTrainColor: '#C00808', // 车站+中心扣车颜色 detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色 }, + jump: { + text: '跳', // 停跳显示内容 + direction: -1, // 停跳方向 + offset: {x: -8, y: 4}, + textColor: '#0000FF', // 停跳文字颜色 + arcColor: '#0000FF', // 停跳圆圈颜色 + fillColor: 'rgba(0,0,0,0)', // 透明填充颜色 + r: 8 // 圆半径大小 + }, stopTime: { // 停站时间 direction: 1, // 运行时间方向 - offset: {x: -8, y: 26}, // 运行时间偏移量 - textColor: '#FFFFFF' // 停站时间字体颜色 + offset: {x: -8, y: -4}, // 运行时间偏移量 + textColor: '#C0C0C0' // 停站时间字体颜色 }, level: { // 运行等级 direction: 1, // 运行等级方向 - offset: {x: -8, y: 6}, // 运行等级偏移量 - textColor: '#FFFFFF' // 停站等级字体颜色 + offset: {x: -8, y: 30}, // 运行等级偏移量 + textColor: '#FFF000' // 停站等级字体颜色 } }; this[deviceType.StationControl] = { diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js index a5298bcd6..74bd525ed 100644 --- a/src/jmap/shape/StationStand/index.js +++ b/src/jmap/shape/StationStand/index.js @@ -130,23 +130,23 @@ class StationStand extends Group { name: model.intervalRunTime || '5' }); /** 列车停跳 */ - const jumpD = style.StationStand.jump.direction ? model.height - distance: -style.StationStand.safetyDoor.height; - const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD; - const jumpX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); - const jumpY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y) + drict * jumpH; - const jumpCX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2 - style.StationStand.common.textFontSize/2); - const jumpCY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y + style.StationStand.common.textFontSize / 2) + drict * jumpH; - this.jump = new EJump({ - zlevel: this.zlevel, - z: this.z + 1, - style: style, - x: jumpX, - y: jumpY, - cx: jumpCX, - cy: jumpCY, - textAlign: 'middle', - textVerticalAlign: 'top' - }); + // const jumpD = style.StationStand.jump.direction ? model.height - distance: -style.StationStand.safetyDoor.height; + // const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD; + // const jumpX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); + // const jumpY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y) + drict * jumpH; + // const jumpCX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2 - style.StationStand.common.textFontSize/2); + // const jumpCY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y + style.StationStand.common.textFontSize / 2) + drict * jumpH; + // this.jump = new EJump({ + // zlevel: this.zlevel, + // z: this.z + 1, + // style: style, + // x: jumpX, + // y: jumpY, + // cx: jumpCX, + // cy: jumpCY, + // textAlign: 'middle', + // textVerticalAlign: 'top' + // }); this.add(this.safeDoor); this.add(this.safeStand); From 44a1d197cbe0c86a209c9596f0627408170a70c9 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 17:06:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/shape/StationControl/index.js | 17 ++++++++-- src/jmap/shape/StationStand/EJump.js | 7 ++-- src/jmap/shape/StationStand/index.js | 47 ++++++++++++++++---------- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/jmap/shape/StationControl/index.js b/src/jmap/shape/StationControl/index.js index 22eaa3eed..8255c295a 100644 --- a/src/jmap/shape/StationControl/index.js +++ b/src/jmap/shape/StationControl/index.js @@ -63,7 +63,18 @@ export default class StationControl extends Group { context: model.zakContent, pop: false }); - + this.turnedAroundControl = new ESingleControl({ + _subType: 'turnedAround', + style: this.style, + zlevel: this.zlevel, + z: this.z, + point: { + x: model.position.x + this.style.StationControl.stationControlDistance * 3 / 2 + this.style.StationControl.stationOffset.x, + y: model.position.y + this.style.StationControl.stationOffset.y + }, + context: '按图折返', + pop: false + }); // 箭头 if (this.style.StationControl.arrowsShow) { const point = arrows(this.model.position.x, this.model.position.y + this.style.StationControl.stationControlmodeR / 2, this.style.StationControl.stationControlDistance / 6, this.style.StationControl.stationControlmodeR * 0.8); @@ -82,11 +93,13 @@ export default class StationControl extends Group { }); this.add(this.arrowsControl); } - this.add(this.substationControl); this.add(this.centerControl); if (this.style.StationControl.singleControlNum == 3) { this.add(this.emergencyControl); + } else if (this.style.StationControl.singleControlNum == 4) { + this.add(this.emergencyControl); + this.add(this.turnedAroundControl); } } diff --git a/src/jmap/shape/StationStand/EJump.js b/src/jmap/shape/StationStand/EJump.js index 7665c6567..12bc43583 100644 --- a/src/jmap/shape/StationStand/EJump.js +++ b/src/jmap/shape/StationStand/EJump.js @@ -8,7 +8,7 @@ class EJump extends Group { this.model = model; this.isNew = false; this.create(); - this.setStatus(); + this.setStatus(model.jumpStopStatus); } create() { @@ -57,12 +57,15 @@ class EJump extends Group { } setStatus(val) { switch (val) { - case '01': + case '03': this.jumpArc.show(); break; case '02': this.jumpArc.hide(); break; + case '01': + this.jumpArc.hide(); + break; } } setColor(color) { diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js index 74bd525ed..ba6e18049 100644 --- a/src/jmap/shape/StationStand/index.js +++ b/src/jmap/shape/StationStand/index.js @@ -130,24 +130,27 @@ class StationStand extends Group { name: model.intervalRunTime || '5' }); /** 列车停跳 */ - // const jumpD = style.StationStand.jump.direction ? model.height - distance: -style.StationStand.safetyDoor.height; - // const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD; - // const jumpX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); - // const jumpY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y) + drict * jumpH; - // const jumpCX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2 - style.StationStand.common.textFontSize/2); - // const jumpCY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y + style.StationStand.common.textFontSize / 2) + drict * jumpH; - // this.jump = new EJump({ - // zlevel: this.zlevel, - // z: this.z + 1, - // style: style, - // x: jumpX, - // y: jumpY, - // cx: jumpCX, - // cy: jumpCY, - // textAlign: 'middle', - // textVerticalAlign: 'top' - // }); - + if (style.StationStand.haveJumpShow) { + const jumpD = style.StationStand.jump.direction ? model.height - distance: -style.StationStand.safetyDoor.height; + const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD; + const jumpX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); + const jumpY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y) + drict * jumpH; + const jumpCX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); + const jumpCY = model.position.y + (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.y - style.StationStand.common.textFontSize / 2) + drict * jumpH; + this.jump = new EJump({ + zlevel: this.zlevel, + z: this.z + 1, + style: style, + x: jumpX, + y: jumpY, + cx: jumpCX, + cy: jumpCY, + textAlign: 'middle', + textVerticalAlign: 'top', + jumpStopStatus: model.jumpStopStatus + }); + this.add(this.jump); + } this.add(this.safeDoor); this.add(this.safeStand); this.add(this.emergent); @@ -185,6 +188,7 @@ class StationStand extends Group { this.detain.hide(); this.reentry.hide(); this.emergent.hide(); + this.jump && this.jump.hide(); if (this.model.visible) { this.safeDoor.hasDoor(false); } this.safeDoor.setColor(this.style.StationStand.safetyDoor.defaultColor); } @@ -202,6 +206,8 @@ class StationStand extends Group { /** 指定列车跳站*/ designatedJumpStop() { this.safeStand.setColor(this.style.StationStand.stand.designatedJumpStopColor); + this.jump && this.jump.show(); + this.jump && this.jump.setStatus(this.model.jumpStopStatus); } /** 站台紧急关闭*/ @@ -212,11 +218,15 @@ class StationStand extends Group { /** 未设置跳停*/ unJumpStop() { + this.jump && this.jump.hide(); + this.jump && this.jump.setStatus(this.model.jumpStopStatus); } /** 站台跳停*/ jumpStop() { this.safeStand.setColor(this.style.StationStand.stand.jumpStopColor); + this.jump && this.jump.show(); + this.jump && this.jump.setStatus(this.model.jumpStopStatus); } /** 未设置扣车*/ @@ -319,6 +329,7 @@ class StationStand extends Group { /** 设置跳停*/ if (model.status == '01') { + console.log( 'jump', model.jumpStopStatus); switch (model.jumpStopStatus) { case '01': /** 未设置跳停*/ this.unJumpStop(); From b7e021d7375f44eff80ab051b0c2b1ca390b9aa5 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 17:14:21 +0800 Subject: [PATCH 4/8] Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient # Conflicts: # src/jmap/config/skinStyle/chengdu_03.js --- src/jmap/config/skinStyle/chengdu_03.js | 35 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/jmap/config/skinStyle/chengdu_03.js b/src/jmap/config/skinStyle/chengdu_03.js index 6abd70b84..921201bbf 100644 --- a/src/jmap/config/skinStyle/chengdu_03.js +++ b/src/jmap/config/skinStyle/chengdu_03.js @@ -124,14 +124,14 @@ class SkinStyle extends defaultStyle { height: 3, // 站台屏蔽门高度 distance: 8, // 站台和屏蔽门之间的距离 defaultColor: '#00FF00', // 屏蔽门默认颜色 - splitDoorColor: '#F61107' // 屏蔽门切除颜色 + splitDoorColor: '#C00808' // 屏蔽门切除颜色 }, stand: { // 站台 headFontSize: 10, // 站台首端字体大小 - spareColor: '#606060', // 站台空闲颜色 - stopColor: '#FEFE00', // 站台列车停站颜色 - jumpStopColor: '#9A99FF', // 站台跳停颜色 - designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色 + spareColor: '#808080', // 站台空闲颜色 + stopColor: '#FFF000', // 站台列车停站颜色 + jumpStopColor: '#808080', // 站台跳停颜色 + designatedJumpStopColor: '#808080' // 站台指定列车跳停颜色 }, standEmergent: { // 紧急关闭 mergentR: 4, // 站台紧急关闭半径 @@ -147,21 +147,30 @@ class SkinStyle extends defaultStyle { detainCar: { // 扣车 text: '扣', // 扣车显示内容 direction: -1, // 扣车方向 - offset: {x: -8, y: -6}, // 扣车偏移量 - trainColor: '#E4EF50', // 车站扣车颜色 - centerTrainColor: '#FFFFFF', // 中心扣车颜色 - andCenterTrainColor: '#F61107', // 车站+中心扣车颜色 + offset: {x: -8, y: -20}, // 扣车偏移量 + trainColor: '#FFFF00', // 车站扣车颜色 + centerTrainColor: '#C0C0C0', // 中心扣车颜色 + andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色 detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色 }, stopTime: { // 停站时间 direction: 1, // 运行时间方向 - offset: {x: -8, y: 26}, // 运行时间偏移量 - textColor: '#FFFFFF' // 停站时间字体颜色 + offset: {x: -8, y: -4}, // 运行时间偏移量 + textColor: '#C0C0C0' // 停站时间字体颜色 + }, + jump: { + text: '跳', // 停跳显示内容 + direction: -1, // 停跳方向 + offset: {x: -8, y: 0}, + textColor: '#0000FF', // 停跳文字颜色 + arcColor: '#0000FF', // 停跳圆圈颜色 + fillColor: 'rgba(0,0,0,0)', // 透明填充颜色 + r: 8 // 圆半径大小 }, level: { // 运行等级 direction: 1, // 运行等级方向 - offset: {x: -8, y: 6}, // 运行等级偏移量 - textColor: '#FFFFFF' // 停站等级字体颜色 + offset: {x: -8, y: 30}, // 运行等级偏移量 + textColor: '#FFF000' // 停站等级字体颜色 } }; From ce5600c17346f1f5e2ac4b60d931082b84ca23e4 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 17:22:23 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/shape/StationControl/index.js | 4 ++-- src/jmap/shape/StationStand/index.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/jmap/shape/StationControl/index.js b/src/jmap/shape/StationControl/index.js index f7390cfb5..d50888b10 100644 --- a/src/jmap/shape/StationControl/index.js +++ b/src/jmap/shape/StationControl/index.js @@ -69,8 +69,8 @@ export default class StationControl extends Group { zlevel: this.zlevel, z: this.z, point: { - x: model.position.x + this.style.StationControl.stationControlDistance * 3 / 2 + this.style.StationControl.stationOffset.x, - y: model.position.y + this.style.StationControl.stationOffset.y + x: model.position.x + this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x, + y: model.position.y + this.style.StationControl.lamp.offset.y }, context: '按图折返', pop: false diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js index 8f744481a..e41079d64 100644 --- a/src/jmap/shape/StationStand/index.js +++ b/src/jmap/shape/StationStand/index.js @@ -329,7 +329,6 @@ class StationStand extends Group { /** 设置跳停*/ if (model.status == '01') { - console.log( 'jump', model.jumpStopStatus); switch (model.jumpStopStatus) { case '01': /** 未设置跳停*/ this.unJumpStop(); From 7dec924ac426ff9422401599f65d517e5825b92b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 17:38:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/skinStyle/chengdu_03.js | 7 ++++--- src/jmap/shape/StationStand/index.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/jmap/config/skinStyle/chengdu_03.js b/src/jmap/config/skinStyle/chengdu_03.js index 921201bbf..5e335d3ad 100644 --- a/src/jmap/config/skinStyle/chengdu_03.js +++ b/src/jmap/config/skinStyle/chengdu_03.js @@ -118,7 +118,8 @@ class SkinStyle extends defaultStyle { this[deviceType.StationStand] = { common: { // 通用属性 - textFontSize: 10 // 站台默认字体大小 + textFontSize: 10, // 站台默认字体大小 + haveJumpShow: true // 站台是否有列车停跳显示 }, safetyDoor: { // 屏蔽门 height: 3, // 站台屏蔽门高度 @@ -131,7 +132,7 @@ class SkinStyle extends defaultStyle { spareColor: '#808080', // 站台空闲颜色 stopColor: '#FFF000', // 站台列车停站颜色 jumpStopColor: '#808080', // 站台跳停颜色 - designatedJumpStopColor: '#808080' // 站台指定列车跳停颜色 + designatedJumpStopColor: '#808080' // 站台指定列车跳停颜色 }, standEmergent: { // 紧急关闭 mergentR: 4, // 站台紧急关闭半径 @@ -165,7 +166,7 @@ class SkinStyle extends defaultStyle { textColor: '#0000FF', // 停跳文字颜色 arcColor: '#0000FF', // 停跳圆圈颜色 fillColor: 'rgba(0,0,0,0)', // 透明填充颜色 - r: 8 // 圆半径大小 + r: 8 // 圆半径大小 }, level: { // 运行等级 direction: 1, // 运行等级方向 diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js index e41079d64..7f9b53504 100644 --- a/src/jmap/shape/StationStand/index.js +++ b/src/jmap/shape/StationStand/index.js @@ -130,7 +130,7 @@ class StationStand extends Group { name: model.intervalRunTime || '5' }); /** 列车停跳 */ - if (style.StationStand.haveJumpShow) { + if (style.StationStand.common.haveJumpShow) { const jumpD = style.StationStand.jump.direction ? model.height - distance: -style.StationStand.safetyDoor.height; const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD; const jumpX = model.position.x - (style.StationStand.jump.direction || drict) * (style.StationStand.jump.offset.x - model.width / 2); From e38570436042c166f477247a9bde33115e480eb4 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 17:41:12 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/skinStyle/fuzhou_01.js | 2 +- src/jmap/shape/StationControl/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jmap/config/skinStyle/fuzhou_01.js b/src/jmap/config/skinStyle/fuzhou_01.js index 2301400c9..19bab85a6 100644 --- a/src/jmap/config/skinStyle/fuzhou_01.js +++ b/src/jmap/config/skinStyle/fuzhou_01.js @@ -172,7 +172,7 @@ class SkinStyle extends defaultStyle { textVerticalAlign: 'top' // 字体垂直对齐 }, lamp: { - count: 2, // 控制模式灯个数 + count: 4, // 控制模式灯个数 offset: {x: 0, y: 0}, // 控制模式灯偏移量 radiusR: 4, // 控制模式灯的半径 distance: 36, // 控制模式之间灯之间的距离 diff --git a/src/jmap/shape/StationControl/index.js b/src/jmap/shape/StationControl/index.js index d50888b10..f0f37d187 100644 --- a/src/jmap/shape/StationControl/index.js +++ b/src/jmap/shape/StationControl/index.js @@ -97,7 +97,7 @@ export default class StationControl extends Group { this.add(this.centerControl); if (this.style.StationControl.lamp.count == 3) { this.add(this.emergencyControl); - } else if (this.style.StationControl.singleControlNum == 4) { + } else if (this.style.StationControl.lamp.count == 4) { this.add(this.emergencyControl); this.add(this.turnedAroundControl); } From 9c51e10ec127d6b4bf9b18b65162b3abca00fc09 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 2 Aug 2019 17:57:14 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmap/config/skinStyle/chengdu_03.js | 2 +- src/jmap/config/skinStyle/fuzhou_01.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jmap/config/skinStyle/chengdu_03.js b/src/jmap/config/skinStyle/chengdu_03.js index 5e335d3ad..8e68e401c 100644 --- a/src/jmap/config/skinStyle/chengdu_03.js +++ b/src/jmap/config/skinStyle/chengdu_03.js @@ -185,7 +185,7 @@ class SkinStyle extends defaultStyle { textVerticalAlign: 'top' // 字体垂直对齐 }, lamp: { - count: 2, // 控制模式的个数 + count: 4, // 控制模式的个数 offset: {x: 0, y: 0}, // 偏移量 radiusR: 4, // 控制模式灯的半径 distance: 36, // 控制模式之间灯之间的距离 diff --git a/src/jmap/config/skinStyle/fuzhou_01.js b/src/jmap/config/skinStyle/fuzhou_01.js index 19bab85a6..2301400c9 100644 --- a/src/jmap/config/skinStyle/fuzhou_01.js +++ b/src/jmap/config/skinStyle/fuzhou_01.js @@ -172,7 +172,7 @@ class SkinStyle extends defaultStyle { textVerticalAlign: 'top' // 字体垂直对齐 }, lamp: { - count: 4, // 控制模式灯个数 + count: 2, // 控制模式灯个数 offset: {x: 0, y: 0}, // 控制模式灯偏移量 radiusR: 4, // 控制模式灯的半径 distance: 36, // 控制模式之间灯之间的距离