From fa412d10791f3b9c6f9df00d0c2b23852b738fba Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 18 Jan 2021 10:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=20=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/haerbin_01.js | 3 ++- src/jmapNew/config/skinCode/nanjing_02.js | 2 +- src/jmapNew/shape/Section/index.js | 9 +++++++-- src/jmapNew/shape/Station/index.js | 6 ++++++ src/utils/baseUrl.js | 4 ++-- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 6f41e0dc2..73b0881ef 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -80,6 +80,7 @@ class SkinCode extends defaultStyle { line: { z: 0, width: 5, // 区段宽度 + routeBlockFlashing: true, // 进路锁闭区段封锁闪烁 beyondWidth: 0, // 区段宽超出宽度 invadeColor: '#EF0C08', // 区段侵入颜色 spareColor: '#ffff00', // 区段空闲颜色 (黄色) @@ -390,7 +391,7 @@ class SkinCode extends defaultStyle { borderColor:'', // 字体边框颜色 textBorderWidth:1 // 字体边框宽度 }, - + syncCentralizeStation: true, // 集中站和下辖车站控制权状态同步 kmPostShow: true, // 公里标显示 kilometerPosition: 'up', // 公里标朝向 text: { diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index b8dea9229..b7eecc54c 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -437,7 +437,7 @@ class SkinCode extends defaultStyle { borderColor:'', // 字体边框颜色 textBorderWidth:1 // 字体边框宽度 }, - + syncCentralizeStation: true, // 集中站和下辖车站控制权状态同步 kmPostShow: true, // 公里标显示 kilometerPosition: 'up', // 公里标朝向 text: { diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index ceb7c15e6..531e381af 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -89,6 +89,7 @@ export default class Section extends Group { this.line.setCrossUnBlock(); this.line.stopAnimation(true); this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段 + this.sectionBlock && this.sectionBlock.stopAnimation(); this.line.setStyle({ stroke: this.style.Section.line.spareColor, lineWidth: this.style.Section.line.width @@ -173,9 +174,13 @@ export default class Section extends Group { } /** 封锁 06*/ - block() { + block(routeLock) { if (this.sectionBlock) { this.model.type !== '03' && this.sectionBlock.show(); + routeLock && this.style.Section.line.routeBlockFlashing && this.sectionBlock.animateStyle(true, [ + { time: 500, styles: { stroke: this.style.backgroundColor } }, + { time: 1000, styles: { stroke: this.style.Section.line.blockColor } } + ]); } else { this.line && this.line.setStyle({ stroke: this.style.Section.line.blockColor, @@ -318,7 +323,7 @@ export default class Section extends Group { /** 计轴故障 */ model.invalid && this.invalid(); /** 轨道封锁 */ - model.blockade && this.block(); + model.blockade && this.block(model.routeLock); /** 非通信车占用状态 */ model.nctOccupied && this.unCommunicationOccupied(); /** 通信车占用状态 */ diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index ab350ced1..b222d549d 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -433,6 +433,12 @@ export default class Station extends Group { if (!this.isShowShape) return; this.recover(); model.controlMode && this['handle' + model.controlMode](); + if (this.style.Station.syncCentralizeStation && model.controlMode) { + model.chargeStationCodeList.forEach(item => { + const device = store.getters['map/getDeviceByCode'](item); + device && device.instance && device.instance['handle' + model.controlMode](); + }); + } if (model.tbStrategyId) { store.state.map.map.tbStrategyList.forEach(item => { if (item.stationCode == model.code) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 768654966..51ddbe296 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://api.joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 - BASE_API = 'http://192.168.8.129:9000'; // 旭强 + // BASE_API = 'http://192.168.8.129:9000'; // 旭强 // BASE_API = 'http://192.168.8.119:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip';