From 649691b1c3aa5e34d126e4a6f1e49adf4f6bcf24 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 15 Jan 2021 18:42:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/nanjing_02/menus/menuButton.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 5c289cf07..d3deb6379 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -269,8 +269,8 @@ export default { '01': 'Local', // 中心调度工作站 '02': 'Center' // 现地工作站 }; - this.modeMatch = true; if (this.selected._type) { + this.modeMatch = true; const control = this.getStationControl(this.selected); const type = State2SimulationMap[this.$store.state.training.prdType]; if (control.controlMode != type) { @@ -946,14 +946,14 @@ export default { { name: '' }, { name: '' }, { name: '' }, - { name: '强行站控', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu }, + { name: '强行站控', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu, securityCommand: true, mode: 'None' }, { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }, { name: '' }, { name: '' }, { name: '' }, { name: '' }, - { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu } + { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu, mode: 'None' } // { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false } ] : [ From 63881d156c08a4d3e5ddf6a004ccdbbc374d9305 Mon Sep 17 00:00:00 2001 From: lVAL Date: Fri, 15 Jan 2021 18:52:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/nanjing_02/menus/menuButton.vue | 1 - src/scripts/cmdPlugin/CommandEnum.js | 2 +- src/utils/baseUrl.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 0ea61e860..686cd0b04 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -956,7 +956,6 @@ export default { { name: '' }, { name: '' }, { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu } - // { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false } ] : [ { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, show: false, disabledName: 'controlMode', mode: 'Center' }, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 3dc08ce9d..07b9c61b0 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -21,7 +21,7 @@ export default { /** 故障解锁 */ CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'}, /** 强解道岔*/ - CMD_SWITCH_FORCE_UNLOCK: {value:'', label: '强解道岔'}, + CMD_SWITCH_FORCE_UNLOCK: {value:'Switch_Force_Unlock', label: '强解道岔'}, /** 转动 */ CMD_SWITCH_TURN: {value:'Switch_Turn', label: '转动'}, /** 强扳 */ 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'; 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 3/4] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=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'; From f60054ccad6c8d077ac5fedd58fccc2745686752 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 18 Jan 2021 11:29:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=8E=B0=E5=9C=B0=E5=88=87=E8=A1=8C?= =?UTF-8?q?=E8=B0=83=E5=90=8E=20=E8=BD=A6=E7=AB=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/socket.js | 6 ++++++ src/views/newMap/jlmapNew/index.vue | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 23738c92f..9bd695c6b 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -369,6 +369,9 @@ const socket = { }, setIsFirst:(state, isFirst)=>{ state.isFirst = isFirst; + }, + clearSimulationRoleList: (state)=>{ + state.simulationRoleList = []; } }, @@ -440,6 +443,9 @@ const socket = { }, setIsFirst:({ commit }, isFirst) => { commit('setIsFirst', isFirst); + }, + clearSimulationRoleList:({ commit }) => { + commit('clearSimulationRoleList'); } } }; diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 84c4a0e9f..9052adce8 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -219,6 +219,7 @@ export default { EventBus.$off('refresh'); EventBus.$off('viewLoading'); EventBus.$off('viewProgressAt'); + this.$store.dispatch('socket/clearSimulationRoleList'); this.$store.dispatch('map/mapClear'); if (this.$jlmap) { this.$jlmap.dispose(); @@ -393,7 +394,6 @@ export default { if (path.includes('/practiceDisplay')) { if (em.deviceType == 'StationStand') { runPassenger(this.$route.query.group, em.deviceCode).then(netdata => { - console.log(netdata); if (netdata.data) { const routeData = this.$router.resolve({ path:'/jlmap3d/trafficplan', @@ -413,7 +413,6 @@ export default { if (em.deviceType == 'Train') { runPassenger(this.$route.query.group, em.deviceCode).then(netdata => { - console.log(netdata); if (netdata.data) { const routeData = this.$router.resolve({ path:'/jlmap3d/traffictrain',