diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 571539220..d8b3f3ef2 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -224,8 +224,8 @@ class SkinCode extends defaultStyle { z:1, mergentR: 4, // 站台紧急关闭半径 mergentN: 4, // 站台紧急关闭边数 - insideOffset: { x: 0, y: 25 }, // 内站台紧急关闭偏移量 - outsideOffset: { x: 0, y: -25 }, // 外站台紧急关闭偏移量 + insideOffset: { x: 0, y: 18 }, // 内站台紧急关闭偏移量 + outsideOffset: { x: 0, y: -18 }, // 外站台紧急关闭偏移量 closeColor: '#F61107' // 站台紧急关闭颜色 }, // 扣车元素 普通扣车 @@ -733,7 +733,7 @@ class SkinCode extends defaultStyle { }; this[deviceType.FloodGate] = {}; this[deviceType.DirectionRod] = {}; - this[deviceType.IndicatorLight] = {}; + this[deviceType.IndicatorLight] = {}; } } diff --git a/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js b/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js index cb8b4d3ac..c2ef4c8e6 100644 --- a/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js +++ b/src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js @@ -48,9 +48,9 @@ class EEmergentRhombus extends Group { this.hideMode(); } - setColor(color) { + setColor(color) { this.emergent && this.emergent.setStyle('stroke', color); - } + } setState(model) { // 紧急停车 diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue index f3289ad84..7b33fd360 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue @@ -149,6 +149,16 @@ export default { handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT }, + { + label: '站台紧急停车', + handler: this.emergencyClose, + cmdType: CMD.Stand.CMD_STAND_EMERGENCY_CLOSE + }, + { + label: '取消站台紧急停车', + handler: this.cancelEmergencyClose, + cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE + }, { label: this.$t('menu.menuSection.triggerFaultManagement'), handler: this.triggerFaultManagement, @@ -306,6 +316,22 @@ export default { } }); }, + // 站台紧急停车 + emergencyClose() { + commitOperate(menuOperate.StationStand.emergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => { + }).catch(error=>{ + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + // 取消站台紧急停车 + cancelEmergencyClose() { + commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => { + }).catch(error=> { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, triggerFaultManagement() { this.$store.dispatch('training/setTriggerFaultCount', this.selected); } diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue index 4eabe03db..e37804850 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue @@ -124,6 +124,14 @@ export default { this.$refs.noticeInfo.doShow(); }); }, + // 取消站台紧急停车 + cancelEmergencyClose() { + commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => { + }).catch(error=> { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, // 设置故障 setStoppage() { commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ @@ -140,14 +148,6 @@ export default { } }); }, - // 取消站台紧急停车 - cancelEmergencyClose() { - commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => { - }).catch(error=> { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, triggerFaultManagement() { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }