From c0819a4745fb9e3c2fe571b546c5da22e7eee7f9 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 11 Mar 2020 10:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=8C=87=E4=BB=A4=E6=93=8D=E4=BD=9C=E4=BB=A3?= =?UTF-8?q?=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/shape/Section/index.js | 4 - src/jmapNew/shape/Train/ETriangle.js | 11 - src/jmapNew/shape/Train/index.js | 1 - .../beijing_01/menus/dialog/standControl.vue | 19 +- .../menus/dialog/standDetainTrainAll.vue | 180 ---- .../menus/dialog/switchCmdControl.vue | 879 +++++++++--------- .../beijing_01/menus/dialog/switchControl.vue | 35 +- .../theme/beijing_01/menus/menuSignal.vue | 25 +- .../beijing_01/menus/menuStationStand.vue | 97 +- .../theme/beijing_01/menus/menuSwitch.vue | 69 +- 10 files changed, 468 insertions(+), 852 deletions(-) delete mode 100644 src/jmapNew/theme/beijing_01/menus/dialog/standDetainTrainAll.vue diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 6b129ef84..2f93998e8 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -591,10 +591,6 @@ export default class Section extends Group { this.remove(this.speedLimitLeft); this.remove(this.speedLimitRight); } - // if (this.style.Section.trainPosition.display) { - // this.triangleL.hide(); - // this.triangleR.hide(); - // } } } diff --git a/src/jmapNew/shape/Train/ETriangle.js b/src/jmapNew/shape/Train/ETriangle.js index dbe74477c..d47ec973e 100644 --- a/src/jmapNew/shape/Train/ETriangle.js +++ b/src/jmapNew/shape/Train/ETriangle.js @@ -32,13 +32,6 @@ export default class ETriangle extends Group { updateTriangle(model, right) { const trainRight = right == 1 ? 1 : -1; - // const data = this.angle.shape.points; - // this.angle.shape.points.pop(); - // this.angle.shape.points.pop(); - // this.angle.shape.points.pop(); - // this.angle.shape.points.push([model.x + 10 * trainRight, model.y]); - // this.angle.shape.points.push([model.x, model.y - 6]); - // this.angle.shape.points.push([model.x, model.y + 6]); const data = [[model.x + 10 * trainRight, model.y], [model.x, model.y - 6], [model.x, model.y + 6]]; // this.angle.shape.points.push([model.x + 10 * trainRight, model.y]); // this.angle.attr('shape', { points: this.angle.shape.points }); @@ -47,16 +40,12 @@ export default class ETriangle extends Group { points:data } }); - // const object = this.angle; this.angle.animateTo({ shape: { points:data } }, 10, 0, 'elasticOut', function () { - // done - // object.stopAnimation(true); }); - // this.angle.setS this.dirty(); } } diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index ae254f303..19b3f9e76 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -3,7 +3,6 @@ import TrainHead from './TrainHead'; import TrainBody from './TrainBody'; import BoundingRect from 'zrender/src/core/BoundingRect'; import Rect from 'zrender/src/graphic/shape/Rect'; -import { deepAssign } from '@/utils/index'; import ETriangle from '../Train/ETriangle'; import store from '@/store'; diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue index c2fe566c7..c085f2079 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue @@ -159,23 +159,6 @@ export default { return '提前发车'; } return ''; - // this.earlyDepar = false; - // if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) { - // this.radio1 = '1'; - // return '扣车'; - // } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) { - // this.radio1 = '2'; - // return '取消扣车'; - // } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) { - // this.earlyDepar = true; - // if (this.selected.direction == '01') { - // this.radio2 = '2'; - // } else { - // this.radio2 = '1'; - // } - // return '提前发车'; - // } - // return ''; } }, mounted() { @@ -309,7 +292,7 @@ export default { this.$refs.noticeInfo.doShow(operate, [error.message]); }); }, - + // 提前发车 earlyDeparture() { const operate = { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standDetainTrainAll.vue deleted file mode 100644 index 6aac5f482..000000000 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standDetainTrainAll.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - \ No newline at end of file diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/switchCmdControl.vue index f5164c4c0..f6fd64aa0 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/switchCmdControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/switchCmdControl.vue @@ -1,459 +1,472 @@ \ No newline at end of file +}; + diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue index 8304e61b0..41f017c32 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue @@ -66,11 +66,7 @@ export default { return this.dialogShow ? getDomIdByOperation(this.operation) : ''; }, title() { - if (this.operation == OperationEvent.Switch.block.menu.operation) { - return '道岔封锁'; - } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) { - return '道岔强扳'; - } else if (this.operation == OperationEvent.Switch.split.menu.operation) { + if (this.operation == OperationEvent.Switch.split.menu.operation) { return '区段切除'; } else if (this.operation == OperationEvent.Switch.active.menu.operation) { return '区段激活'; @@ -111,13 +107,7 @@ export default { mouseCancelState(this.selected); }, commit() { - if (this.operation == OperationEvent.Switch.block.menu.operation) { - /** 道岔封锁*/ - this.block(); - } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) { - /** 道岔强扳*/ - this.turnoutForce(); - } else if (this.operation == OperationEvent.Switch.split.menu.operation) { + if (this.operation == OperationEvent.Switch.split.menu.operation) { /** 区段激活*/ this.split(); } else if (this.operation == OperationEvent.Switch.active.menu.operation) { @@ -125,25 +115,6 @@ export default { this.active(); } }, - // 道岔封锁 - block() { - const operate = { - over: true, - operation: OperationEvent.Switch.block.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_BLOCK - }; - - this.sendCommand(operate); - }, - // 道岔强扮 - turnoutForce() { - const operate = { - over: true, - operation: OperationEvent.Switch.turnoutForce.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN - }; - this.sendCommand(operate); - }, // 区段切除 split() { const operate = { @@ -189,7 +160,7 @@ export default { this.doClose(); this.$refs.noticeInfo.doShow(operate, error.message); }); - }, + } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index b48cedaed..f0affb54e 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -143,6 +143,18 @@ export default { ] }; }, + computed: { + ...mapGetters('training', [ + 'mode', + 'operatemode' + ]), + ...mapGetters('menuOperation', [ + 'buttonOperation' + ]), + ...mapGetters('map', [ + 'routeList' + ]) + }, watch: { '$store.state.menuOperation.menuCount': function (val) { if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) { @@ -157,18 +169,7 @@ export default { } } }, - computed: { - ...mapGetters('training', [ - 'mode', - 'operatemode' - ]), - ...mapGetters('menuOperation', [ - 'buttonOperation' - ]), - ...mapGetters('map', [ - 'routeList' - ]) - }, + methods: { clickEvent() { const self = this; diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue index 09340016e..f65842cc8 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue @@ -6,7 +6,6 @@ - @@ -20,11 +19,10 @@ import StandBackStrategy from './dialog/standBackStrategy'; import StandDetail from './dialog/standDetail'; import StandRunLevel from './dialog/standRunLevel'; import StandStopTime from './dialog/standStopTime'; -import StandDetainTrainAll from './dialog/standDetainTrainAll'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; -import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic'; +import {OperationEvent, DeviceMenu } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mouseCancelState } from './utils/menuItemStatus'; @@ -39,8 +37,7 @@ export default { StandRunLevel, NoticeInfo, StandBackStrategy, - StandStopTime, - StandDetainTrainAll + StandStopTime }, props: { selected: { @@ -55,78 +52,6 @@ export default { menu: [], menuNormal: { Local: [ - // { - // label: '设置扣车', - // handler: this.setDetainTrain, - // cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, - // auth: { station: true, center: false } - // }, - // { - // label: '取消扣车', - // handler: this.cancelDetainTrain, - // cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, - // auth: { station: true, center: true } - // }, - // { - // label: '设置跳停', - // handler: this.setJumpStop, - // cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, - // auth: { station: true, center: false } - // }, - // { - // label: '取消跳停', - // handler: this.cancelJumpStop, - // cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, - // auth: { station: true, center: true } - // }, - // { - // type: 'separator' - // }, - // { - // label: '提前发车', - // handler: this.earlyDeparture, - // cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, - // auth: { station: true, center: true } - // }, - // { - // label: '设置停站时间', - // handler: this.setStopTime, - // cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME, - // auth: { station: true, center: true } - // }, - // { - // type: 'separator' - // }, - // { - // label: '站台详细信息', - // handler: this.detail, - // cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS, - // auth: { station: true, center: true } - // }, - // { - // label: '运行时间控制', - // handler: this.setRunLevel, - // cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME, - // auth: { station: false, center: false } - // }, - // { - // label: '设置提前发车', - // handler: this.earlyDeparture, - // cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, - // auth: { station: false, center: false } - // }, - // { - // label: '人工折返策略设置', - // handler: this.setBackStrategy, - // cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, - // auth: { station: false, center: false } - // } - // { - // label: '查询站台状态', - // handler: this.detail, - // disabledCallback: MenuDisabledState.StationStand.detail, - // auth: { station: false, center: false } - // } ], Center: [ { @@ -351,22 +276,6 @@ export default { // } // }); // }, - // 全线取消扣车 - // cancelDetainTrainAll() { - // const operate = { - // start: true, - // code: this.selected.code, - // type: MapDeviceType.StationStand.type, - // label: MapDeviceType.StationStand.label, - // operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation - // }; - // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - // if (valid) { - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // this.$refs.standDetainTrainAll.doShow(operate, this.selected); - // } - // }); - // }, // 设置跳停 setJumpStop() { const operate = { @@ -484,7 +393,7 @@ export default { const operate = { start: true, code: this.selected.code, - operation: OperationEvent.StationStand.detail.menu.operation, + operation: OperationEvent.StationStand.detail.menu.operation }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index dc0b1cd72..70354ce37 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -22,7 +22,7 @@ import AlxeEffective from './dialog/alxeEffective'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; -import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic'; +import {OperationEvent, DeviceMenu } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mouseCancelState } from './utils/menuItemStatus'; @@ -52,20 +52,6 @@ export default { menu: [], menuNormal: { Local: [ - // { - // label: '轨道切除', - // handler: this.split, - // cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF - // }, - // { - // label: '轨道激活', - // handler: this.active, - // cmdType: CMD.Switch.CMD_SWITCH_ACTIVE - // } - // { - // label: '查看站场设备状态', - // handler: this.undeveloped - // } ], Center: [ { @@ -266,7 +252,7 @@ export default { } }); }, - // 道岔解封 + // 道岔解锁 unlock(selectType) { const operate = { start: true, @@ -285,57 +271,6 @@ export default { } }); }, - // 道岔封锁 - // block() { - // const operate = { - // start: true, - // code: this.selected.code, - // operation: OperationEvent.Switch.block.menu.operation, - // param: { - // switchCode: `${this.selected.code}` - // } - // }; - // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - // if (valid) { - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // this.$refs.switchControl.doShow(operate, this.selected); - // } - // }); - // }, - // 道岔解封 - // unblock() { - // const operate = { - // start: true, - // code: this.selected.code, - // operation: OperationEvent.Switch.unblock.menu.operation, - // param: { - // switchCode: `${this.selected.code}` - // } - // }; - // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - // if (valid) { - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // this.$refs.switchCmdControl.doShow(operate, this.selected); - // } - // }); - // }, - // 道岔强扳 - // switchTurnoutForce() { - // const operate = { - // start: true, - // code: this.selected.code, - // operation: OperationEvent.Switch.turnoutForce.menu.operation, - // param: { - // switchCode: `${this.selected.code}` - // } - // }; - // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - // if (valid) { - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // this.$refs.switchControl.doShow(operate, this.selected); - // } - // }); - // }, // 单操到定位 locate(selectType) { const operate = {