-
@@ -15,7 +14,6 @@
import PopMenu from '@/components/PopMenu';
import RouteControl from './dialog/routeControl';
import RouteSelection from './dialog/routeSelection';
-import RouteLock from './dialog/routeLock';
import RouteCmdControl from './dialog/routeCmdControl';
import RouteHandControl from './dialog/routeHandControl';
import RouteDetail from './dialog/routeDetail';
@@ -24,7 +22,7 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import {OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
import { mouseCancelState } from './utils/menuItemStatus';
export default {
@@ -33,7 +31,6 @@ export default {
PopMenu,
RouteControl,
RouteSelection,
- RouteLock,
RouteCmdControl,
RouteHandControl,
RouteDetail,
@@ -160,9 +157,9 @@ export default {
}
},
'$store.state.menuOperation.selectedCount': function(val) {
- if (this.buttonOperation) {
- this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected._type);
- }
+ if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Signal') {
+ this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected);
+ }
}
},
computed: {
@@ -175,7 +172,7 @@ export default {
]),
...mapGetters('map', [
'routeList'
- ]),
+ ])
},
methods: {
clickEvent() {
@@ -235,16 +232,18 @@ export default {
// 引导总锁
break;
}
- case OperationEvent.Signal.guide.button.operation: {
+ case OperationEvent.Signal.setAutoInterlock.button.operation: {
// 自动进路
- break;
- }
- case OperationEvent.Signal.guide.button.operation: {
- // 区故解
- break;
- }
- case OperationEvent.Signal.guide.button.operation: {
- // 计轴复位
+ if (selectType.fleetMode != undefined) {
+ if (selectType.fleetMode) {
+ this.singalCancelPassModel(selectType);
+ } else {
+ this.singalPassModel(selectType);
+ }
+
+ } else {
+ this.$refs.noticeInfo.doShow({}, `信号机[${selectType.name}(${selectType.code})]没有已锁闭进路，不能设置联锁自动进路`);
+ }
break;
}
}
@@ -340,42 +339,6 @@ export default {
}
});
},
- // // 信号封锁
- // lock() {
- // const operate = {
- // start: true,
- // send: true,
- // code: this.selected.code,
- // type: MapDeviceType.Signal.type,
- // label: MapDeviceType.Signal.label,
- // operation: OperationEvent.Signal.lock.menu.operation
- // };
-
- // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- // if (valid) {
- // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- // this.$refs.routeLock.doShow(operate.operation, this.selected);
- // }
- // }).catch(() => {
- // this.$refs.noticeInfo.doShow(operate);
- // });
- // },
- // // 信号解封
- // unlock() {
- // const operate = {
- // start: true,
- // code: this.selected.code,
- // type: MapDeviceType.Signal.type,
- // label: MapDeviceType.Signal.label,
- // operation: OperationEvent.Signal.unlock.menu.operation
- // };
- // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- // if (valid) {
- // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- // this.$refs.routeCmdControl.doShow(operate, this.selected);
- // }
- // });
- // },
// 信号重开
reopenSignal() {
const operate = {
@@ -456,6 +419,44 @@ export default {
}
});
},
+ // 设置通过模式
+ singalPassModel(selectType) {
+ const operate = {
+ start: true,
+ over: true,
+ operation: OperationEvent.Signal.setAutoInterlock.menu.operation,
+ param: {
+ signalCode:selectType.code
+ },
+ cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+ };
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ }).catch(error => {
+ this.$refs.noticeInfo.doShow(operate, error.message);
+ });
+ },
+ // 取消通过模式
+ singalCancelPassModel(selectType) {
+ const operate = {
+ start: true,
+ over: true,
+ operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
+ param: {
+ signalCode:selectType.code
+ },
+ cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+ };
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ }).catch(error => {
+ this.$refs.noticeInfo.doShow(operate, error.message);
+ });
+ },
// 查询进路状态
detail() {
const step = {
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
index 202a8a862..69f3d5e7a 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
@@ -52,16 +52,16 @@ 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.split,
+ // cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
+ // },
+ // {
+ // label: '轨道激活',
+ // handler: this.active,
+ // cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
+ // }
// {
// label: '查看站场设备状态',
// handler: this.undeveloped
From a65ad91129f045a174e4e7e70931173a6154d660 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 10 Mar 2020 11:16:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E7=BB=98=E5=9B=BE?=
=?UTF-8?q?=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/shape/StationStand/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index a5712f590..6b1d28b39 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -328,7 +328,7 @@ class StationStand extends Group {
fontWeight: style.StationStand.text.fontWeight,
fontSize: style.StationStand.text.fontSize,
fontFamily: style.fontFamily,
- text: '上行扣车',
+ text: '下行扣车',
textFill: '#fff',
textAlign: 'middle',
textVerticalAlign: 'top'