From 21e8785ecb0be13a2c9521b0486268ec5a88b3fe Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 29 Jun 2022 15:57:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=20=20=E8=B7=AF=E7=A5=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/utils/menuOperate.js | 14 +- src/jmapNew/theme/datie_02/menus/index.vue | 1 - src/scripts/ConstConfig.js | 19 +- src/scripts/cmdPlugin/CommandEnum.js | 4 + src/scripts/cmdPlugin/OperationHandler.js | 14 + src/store/modules/map.js | 12 +- src/store/modules/training.js | 1 + src/views/newMap/displayNew/trainTicket.vue | 283 ------------------ .../newMap/jointTrainingNew/menuSchema.vue | 4 +- src/views/newMap/trainTicket/greenLicence.vue | 64 ++++ src/views/newMap/trainTicket/index.vue | 281 +++++++++++++++++ src/views/newMap/trainTicket/redLicence.vue | 92 ++++++ src/views/newMap/trainTicket/trainTicket.vue | 64 ++++ 13 files changed, 550 insertions(+), 303 deletions(-) delete mode 100644 src/views/newMap/displayNew/trainTicket.vue create mode 100644 src/views/newMap/trainTicket/greenLicence.vue create mode 100644 src/views/newMap/trainTicket/index.vue create mode 100644 src/views/newMap/trainTicket/redLicence.vue create mode 100644 src/views/newMap/trainTicket/trainTicket.vue diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index b7ada1a2e..04519f77a 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -618,6 +618,16 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.setRoute.menu.operation, cmdType: CMD.CTC.CTC_SET_ROUTE } + }, + Rail: { + railFillInTicket: { + operation: OperationEvent.RailCommand.railFillInTicket.menu.operation, + cmdType: CMD.RAIL.CMD_RAIL_FILL_IN_TICKET + }, + railQueryTicket: { + operation: OperationEvent.RailCommand.railQueryTicket.menu.operation, + cmdType: CMD.RAIL.CMD_RAIL_QUERY_TICKET + } } }; @@ -656,11 +666,11 @@ export function commitOperate(operate, paramList, over, fillStep = {}) { Object.assign(step, fillStep); return new Promise(function(resolve, reject) { - store.dispatch('training/nextNew', step).then(({ valid }) => { + store.dispatch('training/nextNew', step).then(({ valid, response }) => { if (valid) { store.dispatch('menuOperation/handleBreakFlag', { break: true }); } - resolve({ valid: valid, operate: {...step} }); + resolve({ valid: valid, response: response, operate: {...step} }); }).catch(error=>{ reject(error); }); diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index b7dc8d15f..0088b2618 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -193,7 +193,6 @@ export default { } }, mounted() { - console.log(this.$store.state.training.prdType === '02', this.$store.state.training.prdType, this.isShowBar, this.title); this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); const _that = this; diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index dfc88db72..1b223db8b 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -117,7 +117,8 @@ export default { { label: '司机', value: 'Driver' }, { label: '列车', value: 'Train' }, { label: '方向杆', value: 'DirectionRod'}, - { label: 'CTC', value: 'CTC' } + { label: 'CTC', value: 'CTC' }, + { label: '路票', value: 'RAIL' } ], simulationDeviceList:[ @@ -242,13 +243,13 @@ export default { { label: '自动换端', value: 'AUTO' }, { label: '无人折返', value: 'UNMANNED' } ], - directionLabelList: [ - { label: 'X', value: 'X' }, - { label: 'XF', value: 'XF' }, - { label: 'XD', value: 'XD' }, - { label: 'S', value: 'S' }, - { label: 'SF', value: 'SF' }, - { label: 'SD', value: 'SD' } - ] + directionLabelList: [ + { label: 'X', value: 'X' }, + { label: 'XF', value: 'XF' }, + { label: 'XD', value: 'XD' }, + { label: 'S', value: 'S' }, + { label: 'SF', value: 'SF' }, + { label: 'SD', value: 'SD' } + ] } }; diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index b0035ab3c..4330d6efc 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -406,5 +406,9 @@ export default { CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA:{value: 'CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA', label: '删除列车固定径路'}, CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'CTC_RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'}, CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'} + }, + RAIL: { + CMD_RAIL_FILL_IN_TICKET: {value: 'RAIL_FILL_IN_TICKET', label: '填写票据'}, + CMD_RAIL_QUERY_TICKET: {value: 'RAIL_QUERY_TICKET', label: '查询票据'} } }; diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 404e9e199..0f5283899 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3786,6 +3786,20 @@ export const OperationEvent = { domId: '_Tips-CTC-setRoute-Menu{TOP}' } } + }, + RailCommand: { + railFillInTicket: { + menu: { + operation: '1201', + domId: '_Tips-Rail-railFillInTicket-Menu{TOP}' + } + }, + railQueryTicket: { + menu: { + operation: '1202', + domId: '_Tips-Rail-railQueryTicket' + } + } } }; diff --git a/src/store/modules/map.js b/src/store/modules/map.js index b873b4c6f..ead7dd0f0 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -238,8 +238,8 @@ const map = { activeTrainListChange: 0, // 当前按计划行车的列车列表变化标识(只对列车的groupNumber进行了检测) activeTrainList: [], // 当前按计划行车的列车列表 showCentralizedStationCode: '', // 现地分集中站显示(集中站code) - stationSGuideMasterLock: false, - stationXGuideMasterLock: false, + stationSGuideMasterLock: false, + stationXGuideMasterLock: false, showCentralizedStationNum: 0, // 现地分集中站显示判断 overlapList: [], // 延续保护list overlapData: {}, // 延续保护数据 @@ -696,18 +696,18 @@ const map = { return flag; } }, - checkStationGuideMaster: state => (stationCode,sGuideMasterLock,xGuideMasterLock) => { + checkStationGuideMaster: state => (stationCode, sGuideMasterLock, xGuideMasterLock) => { if (state.showCentralizedStationCode === stationCode) { state.stationSGuideMasterLock = sGuideMasterLock; state.stationXGuideMasterLock = xGuideMasterLock; - } - }, + } + }, checkDeviceShow: state => deviceCode => { if (state.map && state.map.displayList && state.map.displayList.length && store.state.training.prdType) { let flag = false; const stationCode = state.showCentralizedStationCode; state.map.displayList.forEach(item => { - if ( + if ( store.state.training.prdType === '01' && item.type === 'LOCAL' && ((item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) || !stationCode) diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 746f36542..52966a432 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -450,6 +450,7 @@ const training = { rtn && rtn.valid && commit('next'); } } + console.log(rtn, '*********'); resolve(rtn); }).catch(error => { // console.error(error); diff --git a/src/views/newMap/displayNew/trainTicket.vue b/src/views/newMap/displayNew/trainTicket.vue deleted file mode 100644 index 4a51e229f..000000000 --- a/src/views/newMap/displayNew/trainTicket.vue +++ /dev/null @@ -1,283 +0,0 @@ - - - - - diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index aede42923..de2d35505 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -14,7 +14,7 @@ CTC - 路票 + 路票 调度台 IBP盘 大屏 @@ -49,7 +49,7 @@ import { EventBus } from '@/scripts/event-bus'; import { timesSpeedPlayback } from '@/api/rtSimulation'; import { queryHasIscs } from '@/api/iscs'; import { getToken } from '@/utils/auth'; -import TrainTicket from '../displayNew/trainTicket'; +import TrainTicket from '../trainTicket/index'; export default { name: 'MenuDemonSchema', components:{ diff --git a/src/views/newMap/trainTicket/greenLicence.vue b/src/views/newMap/trainTicket/greenLicence.vue new file mode 100644 index 000000000..bdcf1541a --- /dev/null +++ b/src/views/newMap/trainTicket/greenLicence.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/views/newMap/trainTicket/index.vue b/src/views/newMap/trainTicket/index.vue new file mode 100644 index 000000000..afb77f324 --- /dev/null +++ b/src/views/newMap/trainTicket/index.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/src/views/newMap/trainTicket/redLicence.vue b/src/views/newMap/trainTicket/redLicence.vue new file mode 100644 index 000000000..51f377134 --- /dev/null +++ b/src/views/newMap/trainTicket/redLicence.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/newMap/trainTicket/trainTicket.vue b/src/views/newMap/trainTicket/trainTicket.vue new file mode 100644 index 000000000..d5a510fad --- /dev/null +++ b/src/views/newMap/trainTicket/trainTicket.vue @@ -0,0 +1,64 @@ + + + + +