From 86ac34e8991c5ff3f5c1bb371df496662a12d018 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sat, 20 Feb 2021 15:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=B0=E9=9B=B7=E5=85=B9=20=E5=AE=81?= =?UTF-8?q?=E6=B3=A2=E4=B8=89=E5=8F=B7=E7=BA=BF=20=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=9D=83=E8=BD=AC=E7=A7=BB=E4=BB=A3=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/jmapNew/config/skinCode/ningbo_03.js | 6 +- src/jmapNew/shape/Station/index.js | 28 +- src/jmapNew/theme/ningbo_03/menus/menuBar.vue | 294 ++++++++++-------- .../menus/menuDialog/stationRequest.vue | 57 ++-- 4 files changed, 223 insertions(+), 162 deletions(-) diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js index 15a11683b..57517f7cf 100644 --- a/src/jmapNew/config/skinCode/ningbo_03.js +++ b/src/jmapNew/config/skinCode/ningbo_03.js @@ -239,7 +239,9 @@ class SkinCode extends defaultStyle { fontWeight:'normal', // 字体粗细 textPadding:[0, 0], // 字体边距 borderColor:'', // 字体边框颜色 - textBorderWidth:0 // 字体边框宽度 + textBorderWidth:0, // 字体边框宽度 + isSpecialType:true, // 特雷兹特殊类型 + noneModeColor:'#ff0' // 无模式时字体颜色 }, kmPostShow: false, // 公里标显示 @@ -262,7 +264,7 @@ class SkinCode extends defaultStyle { lampSpace: 60 // 灯间距 }, StationControl: { - disPlayNone: true, // 不显示 + disPlayNone: true, // 不显示 text: { distance: 12, // 灯和文字之间的距离 fontSize: 12, // 字体大小 diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index 2b18bd2ff..4259c6a3b 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -385,7 +385,12 @@ export default class Station extends Group { this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor); this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 - this.stationText.setColor('#1fdc1f'); + if (this.style.Station.stationText.isSpecialType) { + // simulationRoleList + } else { + this.stationText.setColor('#1fdc1f'); + } + this.stationControlText && this.stationControlText.setStyle({text:'CC', textFill:this.style.Station.StationControl.text.centerControlColor}); // // @@ -411,7 +416,11 @@ export default class Station extends Group { // this.subheadText && this.subheadText.setStyle('textFill', '#fff'); // } // } - this.stationText.setColor('#fff'); + if (this.style.Station.stationText.isSpecialType) { + + } else { + this.stationText.setColor('#fff'); + } } handleEmergency() { // 紧急站控 @@ -427,7 +436,11 @@ export default class Station extends Group { // this.subheadText && this.subheadText.setStyle('textFill', '#fff'); // } // } - this.stationText.setColor('#fff'); + if (this.style.Station.stationText.isSpecialType) { + + } else { + this.stationText.setColor('#fff'); + } } handleInterlock() { // 联锁控 成都三号线 @@ -448,6 +461,9 @@ export default class Station extends Group { if (this.style.Station.stationText.noneModeFlash) { this.stationText.setAnimateStyle(this.noneBeforeMode); } + if (this.style.Station.stationText.isSpecialType) { + this.stationText.setColor(this.style.Station.stationText.noneModeColor); + } } recover() { @@ -462,7 +478,11 @@ export default class Station extends Group { this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); - this.stationText && this.stationText.stopAnimate(); + if (this.style.Station.stationText.isSpecialType) { + + } else { + this.stationText && this.stationText.stopAnimate(); + } } // 设置状态 diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index 78e32346f..d72b16f29 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -95,9 +95,9 @@ - - - + + + @@ -203,10 +203,10 @@ export default { StandDetain, IntervalStopNumber, AllocateTime, - StationTransfer, - StationRequest, - StationDevolution, - StationReclaim, + StationTransfer, + StationRequest, + StationDevolution, + StationReclaim, StandDetail, SwitchCommand, InitializeSwitchBlock, @@ -356,7 +356,7 @@ export default { { title: '取消CBTC列车进路', click: this.cancelCbtcRoute - }, + } // { // title: 'VOBC切换', // click: this.undeveloped @@ -429,33 +429,33 @@ export default { children: [ { title: '开放/关闭', - click: this.standOpenOrClose, + click: this.standOpenOrClose, operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain, - operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot }, { title: '设置站间列车数量', - click: this.undeveloped, - operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime, - operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo3.line_stand_transfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_stand_transfer }, { title: '显示', - click: this.showStandDetail, - operate: OperationEvent.Command.commandNingBo3.line_stand_detail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo3.line_stand_detail } ] }, @@ -464,28 +464,28 @@ export default { operate: OperationEvent.Command.commandNingBo3.line_switch, children: [ { - title: '命令', - operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, + title: '命令', + operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', - operate: OperationEvent.Command.commandNingBo3.line_switch_empower, + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo3.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_switch_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_switch_detail, click: this.showSwitchDetail } ] @@ -496,38 +496,38 @@ export default { children: [ { - title: '引导', - operate: OperationEvent.Command.commandNingBo3.line_signal_guide, + title: '引导', + operate: OperationEvent.Command.commandNingBo3.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', - operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', - operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', - operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_signal_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_signal_detail, click: this.showSignalDetail } ] @@ -537,23 +537,23 @@ export default { operate: OperationEvent.Command.commandNingBo3.line_section, children: [ { - title: '开放', - operate: OperationEvent.Command.commandNingBo3.line_section_open, + title: '开放', + operate: OperationEvent.Command.commandNingBo3.line_section_open, click: this.handleOpenSection }, { - title: '关闭', - operate: OperationEvent.Command.commandNingBo3.line_section_close, + title: '关闭', + operate: OperationEvent.Command.commandNingBo3.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', - operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, + title: '临时限速', + operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_section_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_section_detail, click: this.handleSectionShow } ] @@ -727,6 +727,38 @@ export default { } ] }, + { + title: '用户权限(U)', + operate: OperationEvent.Command.mBar.userManage, + children: [ + { + title: '转移控制', + operate: OperationEvent.Command.commandNingBo3.line_user, + children: [ + { + title: '请求区域控制权', + click: this.authorizeRequest, + operate: OperationEvent.Command.commandNingBo3.line_user_request + }, + { + title: '授权转移', + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_user_transfer + }, + { + title: '下放站控', + click: this.authorizeDevolution, + operate: OperationEvent.Command.commandNingBo3.line_user_devolution + }, + { + title: '收回站控', + click: this.authorizeReclaim, + operate: OperationEvent.Command.commandNingBo3.line_user_reclaim + } + ] + } + ] + } // { // title: '视图(V)', // operate: '', @@ -919,39 +951,39 @@ export default { title: '线路(G)', operate: OperationEvent.Command.commandNingBo3.line, children: [ - { + { title: '站台', operate: OperationEvent.Command.commandNingBo3.line_stand, children: [ { title: '开放/关闭', - click: this.standOpenOrClose, + click: this.standOpenOrClose, operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain, - operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot }, { title: '设置站间列车数量', - click: this.undeveloped, - operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime, - operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo3.line_stand_transfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_stand_transfer }, { title: '显示', - click: this.showStandDetail, - operate: OperationEvent.Command.commandNingBo3.line_stand_detail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo3.line_stand_detail } ] }, @@ -960,99 +992,99 @@ export default { operate: OperationEvent.Command.commandNingBo3.line_switch, children: [ { - title: '命令', - operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, + title: '命令', + operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', - operate: OperationEvent.Command.commandNingBo3.line_switch_empower, + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo3.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_switch_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_switch_detail, click: this.showSwitchDetail } ] }, - { + { title: '信号机', operate: OperationEvent.Command.commandNingBo3.line_signal, children: [ { - title: '引导', - operate: OperationEvent.Command.commandNingBo3.line_signal_guide, + title: '引导', + operate: OperationEvent.Command.commandNingBo3.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', - operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', - operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', - operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_block, + title: '封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', - operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_signal_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_signal_detail, click: this.showSignalDetail } ] }, - { + { title: '轨道', operate: OperationEvent.Command.commandNingBo3.line_section, children: [ { - title: '开放', - operate: OperationEvent.Command.commandNingBo3.line_section_open, + title: '开放', + operate: OperationEvent.Command.commandNingBo3.line_section_open, click: this.handleOpenSection }, { - title: '关闭', - operate: OperationEvent.Command.commandNingBo3.line_section_close, + title: '关闭', + operate: OperationEvent.Command.commandNingBo3.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', - operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, + title: '临时限速', + operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', - operate: OperationEvent.Command.commandNingBo3.line_section_detail, + title: '显示', + operate: OperationEvent.Command.commandNingBo3.line_section_detail, click: this.handleSectionShow } ] - }, + }, { title: '闭塞区段', operate: '', @@ -1214,9 +1246,9 @@ export default { click: this.adjustStrategy } ] - }, - { - title: '用户权限(U)', + }, + { + title: '用户权限(U)', operate: OperationEvent.Command.mBar.userManage, children: [ { @@ -1225,28 +1257,28 @@ export default { children: [ { title: '请求区域控制权', - click: this.authorizeRequest, - operate: OperationEvent.Command.commandNingBo3.line_user_request + click: this.authorizeRequest, + operate: OperationEvent.Command.commandNingBo3.line_user_request }, { title: '授权转移', - click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo3.line_user_transfer - }, - { + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo3.line_user_transfer + }, + { title: '下放站控', - click: this.authorizeDevolution, - operate: OperationEvent.Command.commandNingBo3.line_user_devolution - }, - { + click: this.authorizeDevolution, + operate: OperationEvent.Command.commandNingBo3.line_user_devolution + }, + { title: '收回站控', - click: this.authorizeReclaim, - operate: OperationEvent.Command.commandNingBo3.line_user_reclaim + click: this.authorizeReclaim, + operate: OperationEvent.Command.commandNingBo3.line_user_reclaim } ] - } - ] - } + } + ] + } // { // title: '视图(V)', // operate: '', @@ -1317,7 +1349,7 @@ export default { return true; }, initMenu(menu) { - const type = State2SimulationMap[this.$store.state.training.prdType]; + const type = State2SimulationMap[this.$store.state.training.prdType]; this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); this.clickEvent(); this.closeMenu(true); @@ -1357,7 +1389,7 @@ export default { hookClick(item, event) { this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null }); if (item && typeof item.click == 'function') { - item.click(item.operate||{}); + item.click(item.operate || {}); } }, selectedClassA(item, index) { @@ -1538,10 +1570,10 @@ export default { this.$refs.stationTransfer.doShow(); } }); - }, + }, // 请求区域控制权 authorizeRequest(item) { - const operate = { + const operate = { type: 'bar', operation: item.operation }; @@ -1552,10 +1584,10 @@ export default { this.$refs.stationRequest.doShow(); } }); - }, - // 下放站控 - authorizeDevolution(item) { - const operate = { + }, + // 下放站控 + authorizeDevolution(item) { + const operate = { type: 'bar', operation: item.operation }; @@ -1566,10 +1598,10 @@ export default { this.$refs.stationDevolution.doShow(); } }); - }, - // 收回站控 - authorizeReclaim(item) { - const operate = { + }, + // 收回站控 + authorizeReclaim(item) { + const operate = { type: 'bar', operation: item.operation }; @@ -1580,7 +1612,7 @@ export default { this.$refs.stationReclaim.doShow(); } }); - }, + }, showStandDetail(item) { const operate = { type: 'bar', @@ -1632,8 +1664,8 @@ export default { if (valid) { this.closeMenu(true); this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); - // this.$refs.initializeSwitchBlock.doShow(operate); - this.$refs.switchBlock.doShow(operate); + // this.$refs.initializeSwitchBlock.doShow(operate); + this.$refs.switchBlock.doShow(operate); } }); }, diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue index 2501b63be..db1a063e5 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue @@ -12,19 +12,19 @@ :close-on-click-modal="false" > - - - - - - 所有站台(F) + + + + + + 所有站台(F)
{{ message }}
- 确定(O) + 确定(O) - 应用(A) + 应用(A) 关闭(C) @@ -46,15 +46,15 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'StationControl', components: { - NoticeInfo + NoticeInfo }, data() { return { - status: true, + status: '', operate: null, loading: false, dialogShow: false, - allChecked: false, + allChecked: false, station:{}, message:'' }; @@ -107,26 +107,31 @@ export default { 'selected': function(val) { if (val) { const sationEle = this.$store.getters['map/getDeviceByCode'](val.code); - if (this.prdType == '02') { - this.status = sationEle && sationEle.controlMode != 'Center'; - } else { - this.status = sationEle && sationEle.controlMode == 'Center'; + if (this.prdType == '01' && sationEle && sationEle.controlMode == 'Center') { + this.status = 'Center'; + } else if (this.prdType == '02' && sationEle && sationEle.controlMode != 'Center') { + this.status = 'Local'; } + // if (this.prdType == '02') { + // + // } else { + // this.status = sationEle && sationEle.controlMode == 'Center'; + // } } } }, methods: { doShow() { this.message = ''; - this.dialogShow = true; - this.$nextTick(e => { - this.$refs.table.setCurrentRow(); - this.$store.dispatch('training/emitTipFresh'); - }) + this.dialogShow = true; + this.$nextTick(e => { + this.$refs.table.setCurrentRow(); + this.$store.dispatch('training/emitTipFresh'); + }); }, doClose() { - this.dialogShow = false; - this.$refs.table.setCurrentRow(); + this.dialogShow = false; + this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('socket/shiftMsgQueue'); }, @@ -160,21 +165,23 @@ export default { }); }, commit(isClose = true) { + debugger; const val = this.selected || {}; const steps = { operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation, over: true, - param: {stationCode:val.code} + param: {stationCodes:[val.code]} }; - steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL; + // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL; + steps.cmdType = this.status == 'Center' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL; this.$store.dispatch('training/nextNew', steps).then(({ valid }) => { if (valid) { isClose && this.doClose(); this.$emit('commandSuccess', val.code); } - }).catch((error) => { + }).catch(() => { isClose && this.doClose(); this.$refs.noticeInfo.doShow(); });