diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 17c0e364c..2035ad1ea 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -169,7 +169,7 @@ export default class Station extends Group { return item.includes('lineCode=16'); }); const pic = store.state.map.picture; - if ((queryCtc && model.createControlMode) || (pic == 'trafficTerminal' && queryCtcLineCode)) { + if ((queryCtc || (pic == 'trafficTerminal' && queryCtcLineCode)) && model.createControlMode) { this.createCtcControlMode(); } else if (this.style.Station.StationControl.special) { if (model.visible && model.createControlMode) { // model.createControlMode 控制模式 diff --git a/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue b/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue index 9caf08f28..4af0f0509 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue @@ -288,9 +288,7 @@ export default { operation: OperationEvent.Command.cancel.menu.operation }; this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { - if (valid) { - this.doClose(); - } + this.doClose(); }).catch(() => { this.doClose(); }); diff --git a/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue b/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue index 8330e5e5a..9821a2b17 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue @@ -194,7 +194,6 @@ export default { }, commit() { const list = this.getChangeInfoList(); - console.log('🚀 ~ file: statusSelect.vue:154 ~ commit ~ list', list); if (list.length) { const operate = { over: true, @@ -224,9 +223,7 @@ export default { operation: OperationEvent.CTCCommand.switchRouteSetModel.cancel.operation }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - if (valid) { - this.doClose(); - } + this.doClose(); }); }, doClose() { diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index aeb09a584..e9be2e399 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -319,6 +319,7 @@ export default { } }, beforeDestroy() { + this.$store.dispatch('menuOperation/setButtonOperation', null); this.routeDataMap = null; this.routeButtonCodeList = []; }, @@ -409,9 +410,9 @@ export default { operation: OperationEvent.CTCCommand.switchRouteSetModel.menu.operation }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - if (valid) { - this.$refs.statusSelect.doShow(); - } + // if (valid) { + this.$refs.statusSelect.doShow(); + // } }); }, modeCovertBtn(operation) { @@ -420,7 +421,7 @@ export default { }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { this.modeCovertShow = true; - this.operation = operation; + // this.operation = operation; }); }, buttonDown(operation, commandTypeList) { diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 1540247a5..e0b24cb85 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3806,23 +3806,23 @@ export const OperationEvent = { }, modeCovert:{ button:{ - operation: '299d', - domId: '_Tips-Mode-Covert-Button{TOP}' + operation: '299e', + domId: '_Tips-Mode-Covert-Button{BOTTOM}' }, agreeModeCovert:{ - operation: '299e', - domId: '_Tips-Agree-Mode-Covert{TOP}' + operation: '299f', + domId: '_Tips-Agree-Mode-Covert{BOTTOM}' }, applyModeCovert:{ - operation: '299f', - domId: '_Tips-Apply-Mode-Covert{TOP}' + operation: '299g', + domId: '_Tips-Apply-Mode-Covert{BOTTOM}' }, agreeModeCovertCommit:{ - operation: '299g', + operation: '299h', domId: '_Tips-Agree-Mode-Covert-Commit{TOP}' }, applyModeCovertCommit:{ - operation: '299g', + operation: '299i', domId: '_Tips-Apply-Mode-Covert-Commit{TOP}' } } @@ -4252,7 +4252,7 @@ export const OperationEvent = { switchRouteSetModel: { menu: { operation: 'a063', - domId: '_Tips-CTC-switchRouteSetModel-menu{TOP}' + domId: '_Tips-CTC-switchRouteSetModel-menu{BOTTOM}' }, confirm: { operation: 'a064', diff --git a/src/views/newMap/display/lineBoard.vue b/src/views/newMap/display/lineBoard.vue index 437df709f..0a7808dc9 100644 --- a/src/views/newMap/display/lineBoard.vue +++ b/src/views/newMap/display/lineBoard.vue @@ -279,8 +279,8 @@ import ArrowPic from '@/assets/datie/arrow.png'; import PicT3 from '@/assets/datie/picT3.png'; import ControlPanelPic from '@/assets/datie/controlPanel.png'; import ControlPanel2Pic from '@/assets/datie/controlPanel2.png'; -import RecDep from '@/jmapNew/theme/datie_02/menus/dialog/recDep'; -import RouteSelection from '@/jmapNew/theme/datie_02/menus/dialog/routeSelection1'; +import RecDep from './lineBoard/recDep'; +import RouteSelection from './lineBoard/routeSelection1'; import PopMenu from '@/components/PopMenu'; import { menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import T3Pic from '@/assets/ctc_icon/t3.png'; diff --git a/src/views/newMap/display/lineBoard/confirmTip.vue b/src/views/newMap/display/lineBoard/confirmTip.vue new file mode 100644 index 000000000..6852074ca --- /dev/null +++ b/src/views/newMap/display/lineBoard/confirmTip.vue @@ -0,0 +1,74 @@ + + + + diff --git a/src/views/newMap/display/lineBoard/mapVisual.vue b/src/views/newMap/display/lineBoard/mapVisual.vue new file mode 100644 index 000000000..c2073391e --- /dev/null +++ b/src/views/newMap/display/lineBoard/mapVisual.vue @@ -0,0 +1,245 @@ + + + + diff --git a/src/views/newMap/display/lineBoard/recDep.vue b/src/views/newMap/display/lineBoard/recDep.vue new file mode 100644 index 000000000..1d99ffe15 --- /dev/null +++ b/src/views/newMap/display/lineBoard/recDep.vue @@ -0,0 +1,136 @@ + + + + diff --git a/src/views/newMap/display/lineBoard/routeSelection1.vue b/src/views/newMap/display/lineBoard/routeSelection1.vue new file mode 100644 index 000000000..26df9e930 --- /dev/null +++ b/src/views/newMap/display/lineBoard/routeSelection1.vue @@ -0,0 +1,308 @@ + + + +