From b1b8324484844ff1ab6c54765c83e4de485608c3 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 22 Jul 2020 13:37:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=BD=A6?=
=?UTF-8?q?=EF=BC=8C=E9=81=93=E5=B2=94=E6=95=85=E9=9A=9C=E6=A8=A1=E5=BC=8F?=
=?UTF-8?q?=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../theme/beijing_01/menus/menuSwitch.vue | 19 ++++++++---
.../theme/beijing_01/menus/menuTrain.vue | 34 ++++++++++++++++++-
.../theme/chengdu_01/menus/menuSwitch.vue | 19 ++++++++---
.../theme/chengdu_01/menus/menuTrain.vue | 34 ++++++++++++++++++-
.../theme/chengdu_03/menus/menuSwitch.vue | 19 ++++++++---
.../theme/chengdu_03/menus/menuTrain.vue | 34 ++++++++++++++++++-
.../theme/foshan_01/menus/menuSwitch.vue | 13 ++++++-
.../theme/foshan_01/menus/menuTrain.vue | 34 ++++++++++++++++++-
.../theme/fuzhou_01/menus/menuSwitch.vue | 19 ++++++++---
.../theme/fuzhou_01/menus/menuTrain.vue | 34 ++++++++++++++++++-
.../theme/haerbin_01/menus/menuSwitch.vue | 13 ++++++-
.../theme/haerbin_01/menus/menuTrain.vue | 32 +++++++++++++++++
.../theme/ningbo_01/menus/menuSwitch.vue | 13 ++++++-
.../theme/ningbo_01/menus/menuTrain.vue | 34 ++++++++++++++++++-
.../theme/xian_01/menus/menuSwitch.vue | 17 ++++------
.../theme/xian_02/menus/menuSwitch.vue | 13 ++++++-
src/jmapNew/theme/xian_02/menus/menuTrain.vue | 34 ++++++++++++++++++-
17 files changed, 373 insertions(+), 42 deletions(-)
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
index 3c5fc18f7..db029395c 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
@@ -5,6 +5,7 @@
+
@@ -17,6 +18,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SpeedLimitControl from './dialog/speedLimitControl';
import AlxeEffective from './dialog/alxeEffective';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
@@ -35,7 +37,8 @@ export default {
SpeedLimitControl,
AlxeEffective,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
props: {
selected: {
@@ -90,13 +93,15 @@ export default {
menuForce: [
{
label: '设置故障',
- handler: this.setStoppage,
- cmdType: CMD.Fault.CMD_SET_FAULT
+ handler: this.setStoppage
},
{
label: '取消故障',
- handler: this.cancelStoppage,
- cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ handler: this.cancelStoppage
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -281,6 +286,10 @@ export default {
this.$refs.alxeEffective.doShow(operate, this.selected);
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index 3fe261b7b..b847e688f 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -228,6 +228,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -341,7 +349,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
index d4ae20be8..2a68de6fb 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
@@ -4,6 +4,7 @@
+
@@ -14,6 +15,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import CreateDeviceLabel from './dialog/createDeviceLabel';
import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import CancelMouseState from '@/mixin/CancelMouseState';
import { mapGetters } from 'vuex';
@@ -29,7 +31,8 @@ export default {
NoticeInfo,
CreateDeviceLabel,
SwitchControl,
- SetFault
+ SetFault,
+ SwitchHookLock
},
mixins: [
CancelMouseState
@@ -121,13 +124,15 @@ export default {
menuForce: [
{
label: '设置故障',
- handler: this.setStoppage,
- cmdType: CMD.Fault.CMD_SET_FAULT
+ handler: this.setStoppage
},
{
label: '取消故障',
- handler: this.cancelStoppage,
- cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ handler: this.cancelStoppage
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -262,6 +267,10 @@ export default {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 23bcb4716..8d01a64d1 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -141,6 +141,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -248,7 +256,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
index 44e1fbb1c..64d75b0ac 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
@@ -4,6 +4,7 @@
+
@@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import CancelMouseState from '@/mixin/CancelMouseState';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
@@ -28,7 +30,8 @@ export default {
SectionControl,
SwitchControl,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
mixins: [
CancelMouseState
@@ -93,13 +96,15 @@ export default {
menuForce: [
{
label: '设置故障',
- handler: this.setStoppage,
- cmdType: CMD.Fault.CMD_SET_FAULT
+ handler: this.setStoppage
},
{
label: '取消故障',
- handler: this.cancelStoppage,
- cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ handler: this.cancelStoppage
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -230,6 +235,10 @@ export default {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index 406043f95..f5e7f51e3 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -124,6 +124,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -228,7 +236,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
index 98629b95d..904c46a51 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
@@ -4,6 +4,7 @@
+
@@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchUnLock from './dialog/switchUnLock';
import SpeedLimitControl from './dialog/speedLimitControl';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@@ -31,7 +33,8 @@ export default {
SwitchUnLock,
SpeedLimitControl,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
props: {
selected: {
@@ -90,6 +93,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -301,6 +308,10 @@ export default {
}).catch(error=>{
this.$refs.noticeInfo.doShow({}, error.message);
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
},
// 设置临时限速
// setSpeed() {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
index 7d460fdd9..f34f3037b 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
@@ -133,6 +133,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -238,7 +246,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const step = {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
index 7f2d4df2d..a6e7f2274 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
@@ -5,6 +5,7 @@
+
@@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchCmdControl from './dialog/switchCmdControl';
import SpeedCmdControl from './dialog/speedCmdControl';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
@@ -31,7 +33,8 @@ export default {
SwitchCmdControl,
SpeedCmdControl,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
props: {
selected: {
@@ -158,13 +161,15 @@ export default {
menuForce: [
{
label: this.$t('menu.menuSwitch.setFault'),
- handler: this.setStoppage,
- cmdType:CMD.Fault.CMD_SET_FAULT
+ handler: this.setStoppage
},
{
label: this.$t('menu.menuSwitch.cancelFault'),
- handler: this.cancelStoppage,
- cmdType:CMD.Fault.CMD_CANCEL_FAULT
+ handler: this.cancelStoppage
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -329,6 +334,10 @@ export default {
this.$refs.speedCmdControl.doShow(operate, this.selected);
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
}
}
};
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index e6743a40c..47dc71267 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -101,6 +101,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -221,7 +229,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const step = {
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
index 9c2c4c1f7..007b625b8 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
@@ -2,6 +2,7 @@
@@ -10,6 +11,7 @@
import PopMenu from '@/components/PopMenu';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
@@ -22,7 +24,8 @@ export default {
components: {
PopMenu,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
props: {
selected: {
@@ -51,6 +54,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -115,6 +122,10 @@ export default {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
}
}
};
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index a80a66621..1b39c4621 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -72,6 +72,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -190,6 +198,30 @@ export default {
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index 7963423ef..4e1c1e2d9 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -5,6 +5,7 @@
+
@@ -17,6 +18,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchUnLock from './dialog/switchUnLock';
import SpeedLimitControl from './dialog/speedLimitControl';
import AlxeEffective from './dialog/alxeEffective';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
@@ -34,7 +36,8 @@ export default {
SpeedLimitControl,
AlxeEffective,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
props: {
selected: {
@@ -137,6 +140,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -289,6 +296,10 @@ export default {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
}
}
};
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index e60c6e118..f17330c4f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -216,6 +216,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -321,7 +329,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const operate = {
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 0f4a36cfa..7f7a0003a 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -102,12 +102,12 @@ export default {
label: '道岔取消限速',
handler: this.cancelSpeed,
cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
- },
- {
- label: '道岔钩锁',
- handler: this.hookLock,
- cmdType:CMD.Switch.CMD_SWITCH_HOOK_LOCK
}
+ // {
+ // label: '道岔钩锁',
+ // handler: this.hookLock,
+ // cmdType:CMD.Switch.CMD_SWITCH_HOOK_LOCK
+ // }
],
Center: [
{
@@ -179,7 +179,7 @@ export default {
{
label: '道岔钩锁',
handler: this.hookLock
- },
+ }
]
};
},
@@ -337,11 +337,6 @@ export default {
},
// 道岔钩锁
hookLock() {
- // commitOperate(menuOperate.Switch.hookLock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
- // if (valid) {
- // this.$refs.switchHookLock.doShow(operate, this.selected);
- // }
- // });
this.$refs.switchHookLock.doShow(this.selected);
}
}
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index c4a114e71..2593fb0b8 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -5,6 +5,7 @@
+
@@ -15,6 +16,7 @@ import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import SwitchUnLock from './dialog/switchUnLock';
import SpeedLimitControl from './dialog/speedLimitControl';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
@@ -31,7 +33,8 @@ export default {
SwitchUnLock,
SpeedLimitControl,
NoticeInfo,
- SetFault
+ SetFault,
+ SwitchHookLock
},
props: {
selected: {
@@ -151,6 +154,10 @@ export default {
label: '取消故障',
handler: this.cancelStoppage,
cmdType: CMD.Fault.CMD_CANCEL_FAULT
+ },
+ {
+ label: '道岔钩锁',
+ handler: this.hookLock
}
]
};
@@ -318,6 +325,10 @@ export default {
switchCode: this.selected.code
}
});
+ },
+ // 道岔钩锁
+ hookLock() {
+ this.$refs.switchHookLock.doShow(this.selected);
},
undeveloped() {
this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index 0c7a798bd..054b85091 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -230,6 +230,14 @@ export default {
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
+ },
+ {
+ label: '越引导信号行驶',
+ handler: this.handleOverFuideSignal
+ },
+ {
+ label: '越红灯行驶',
+ handler: this.handleOverEedLight
}
],
menuSpeed: [
@@ -338,7 +346,31 @@ export default {
}).catch((error) => {
this.$refs.noticeInfo.doShow(error.message);
});
- },
+ },
+ handleOverFuideSignal() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Guide_Signal',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
+ handleOverEedLight() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Drive_Through_The_Red_Light',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate})=>{
+ }).catch((error) => {
+ this.$refs.noticeInfo.doShow(error.message);
+ });
+ },
// 限速行驶
limitSpeed() {
const operate = {
From fbe928749b54451094443543803de6c37a76c790 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 22 Jul 2020 13:55:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88?=
=?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/views/newMap/chatView/chatBox.vue | 6 +--
src/views/newMap/chatView/chatContent.vue | 12 +++---
src/views/newMap/chatView/chatMemberList.vue | 6 ---
src/views/newMap/displayNew/designIndex.vue | 6 ++-
.../newMap/displayNew/scriptPreviewChat.vue | 40 ++++++++++++++++---
5 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 2bca00dc5..fab875557 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -44,7 +44,7 @@
取消
-
+