宁波一 计轴复位按钮操作

This commit is contained in:
fan 2021-02-22 10:27:32 +08:00
parent efcb9ff262
commit dc3e3d7b7e
11 changed files with 141 additions and 102 deletions

View File

@ -31,10 +31,10 @@ export default class EMouse extends Group {
if (e.target && e.target._subType == 'Text') { if (e.target && e.target._subType == 'Text') {
this.text.show(); this.text.show();
} else { } else {
this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); // this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); // this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
this.device.control.setTextBorder(true); // this.device.control.setTextBorder(true);
this.device.control.setArcBorder(true); // this.device.control.setArcBorder(true);
} }
} }
@ -43,10 +43,10 @@ export default class EMouse extends Group {
if (e.target && e.target._subType == 'Text') { if (e.target && e.target._subType == 'Text') {
this.text.hide(); this.text.hide();
} else { } else {
this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor); // this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
this.device.control.setTextColor('#FFFFFF'); // this.device.control.setTextColor('#FFFFFF');
this.device.control.setTextBorder(false); // this.device.control.setTextBorder(false);
this.device.control.setArcBorder(false); // this.device.control.setArcBorder(false);
} }
} }
} }

View File

@ -421,6 +421,11 @@ export const menuOperate = {
setPreReset: { setPreReset: {
operation: OperationEvent.Station.setPreReset.menu.operation, operation: OperationEvent.Station.setPreReset.menu.operation,
cmdType: CMD.Station.CMD_STATION_PRE_RESET cmdType: CMD.Station.CMD_STATION_PRE_RESET
},
// 取消计轴预复位
cancelPreReset: {
operation: OperationEvent.Station.cancelPreReset.menu.operation,
cmdType: CMD.Station.CMD_STATION_PRE_RESET
} }
}, },
// 设置/取消强制点灯 // 设置/取消强制点灯

View File

@ -9,43 +9,44 @@
:z-index="2000" :z-index="2000"
:modal="false" :modal="false"
:close-on-click-modal="false" :close-on-click-modal="false"
append-to-body
> >
<el-row> <el-row>
<el-col></el-col> <el-col :span="8" style="font-size: 16px;color: #000;">集中站</el-col>
</el-row> <el-col :span="16" style="font-size: 16px;" class="shadow-box">{{ stationName }}</el-col>
<el-row justify="center" class="button-group">
<el-button @click="commit">确定</el-button>
<el-button @click="doClose">关闭</el-button>
</el-row> </el-row>
<el-row style="margin-top: 10px;">
<el-col :span="8" style="font-size: 16px;color: #000;">按钮</el-col>
<el-col :span="16" style="font-size: 16px;" class="shadow-box">{{ buttonName }}</el-col>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="12">
<el-button @click="confirm">确定</el-button>
</el-col>
<el-col :span="12">
<el-button @click="doClose">关闭</el-button>
</el-col>
</el-row>
<confirm-tip ref="confirmTip" />
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import {commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import {commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum'; import ConfirmTip from './childDialog/confirmTip';
export default { export default {
name: 'ConfirmTip', name: 'ButtonDown',
components: {
ConfirmTip
},
data() { data() {
return { return {
dialogShow: false, dialogShow: false,
message: '', message: '',
operation: '', operation: '',
title: '按钮按下', title: '按钮按下',
value1: '', stationName: '',
value2: '', buttonName: ''
options: [
{ label: '车站折返变通', value: '1' },
{ label: '站遥控按钮', value: '2' },
{ label: 'FSA', value: '3'},
{ label: 'NJYXLZ', value: '4'},
{ label: '强制点灯', value: '5' }
],
time: '',
status: '',
confirmIndex: false,
timer: null
}; };
}, },
computed: { computed: {
@ -60,46 +61,33 @@ export default {
}, },
methods: { methods: {
doShow(operate) { doShow(operate, selected) {
this.message = operate.message || '';
this.dialogShow = true; this.dialogShow = true;
this.confirmIndex = false;
this.operation = operate.operation; this.operation = operate.operation;
if (this.operation === OperationEvent.StationLight.SetOrCancelForceLight.confirm1.operation) { this.stationName = selected.name;
this.value1 = '5'; if (this.operation === OperationEvent.Station.setPreReset.confirm.operation || this.operation === OperationEvent.Station.cancelPreReset.confirm.operation) {
this.buttonName = '计轴复位';
} }
}, },
doClose() { doClose() {
this.dialogShow = false; this.dialogShow = false;
if (this.timer) { clearInterval(this.timer); }
}, },
confirm1() {
this.status = '发送First request消息成功请等待服务器'; confirm() {
setTimeout(() => { commitOperate({operation: this.operation}, {}, 1).then(({valid, operate})=>{
this.confirmIndex = true; if (valid) {
this.time = 30; const nextOperate = {
this.status = '收到First request消息'; operation: this.operation
this.timer = setInterval(() => { };
this.time = this.time - 1; if (this.operation === OperationEvent.Station.setPreReset.confirm.operation) {
if (this.time < 0) { this.doClose(); } nextOperate.message = `命令:按钮按下/设置操作<br/>集中站:${this.stationName}<br/>按钮:计轴复位`;
}, 1000); } else if (this.operation === OperationEvent.Station.cancelPreReset.confirm.operation) {
}, 1000); nextOperate.message = `命令:按钮按下/取消操作<br/>集中站:${this.stationName}<br/>按钮:计轴复位`;
},
confirm2() {
if (this.value1 !== this.value2) {
this.status = '确认操作失败!';
return;
}
if (this.operation === OperationEvent.StationLight.SetOrCancelForceLight.confirm1.operation) {
commitOperate({operate: this.operation, cmdType: CMD.Station.CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL}, {}, 2).then(({valid, operate})=>{
if (valid) {
this.status = '发送 Second Confirm消息成功请等待服务器';
setTimeout(() => {
this.doClose();
}, 1000);
} }
}); this.doClose();
} this.$refs.confirmTip.doShow(nextOperate);
}
});
} }
} }
}; };
@ -114,12 +102,11 @@ export default {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
.status-box { .shadow-box {
width: 100%; padding: 2px;
height: 70px; border-top: #7E7B7E 2px solid ;
border-top: #928F92 1px solid; border-right: #F9F6F9 2px solid;
border-left: #928F92 1px solid; border-left: #7E7B7E 2px solid;
border-right: #E6E3E6 1px solid; border-bottom: #F9F6F9 2px solid;
border-bottom: #E6E3E6 1px solid;
} }
</style> </style>

View File

@ -52,9 +52,9 @@ export default {
return '确认对话框'; return '确认对话框';
}, },
confirmId() { confirmId() {
return this.show return this.show
? OperationEvent.Command.common.affirm.domId ? OperationEvent.Command.common.affirm.domId
: ''; : '';
} }
}, },
mounted() { mounted() {
@ -258,11 +258,31 @@ export default {
this.doClose(); this.doClose();
} }
}).catch(() => { this.doClose(); this.$refs.noticeInfo.doShow(); }); }).catch(() => { this.doClose(); this.$refs.noticeInfo.doShow(); });
} else if (this.operation === OperationEvent.Station.setPreReset.confirm.operation) {
const step = {
operation: OperationEvent.Command.common.affirm.operation,
cmdType: CMD.Station.CMD_STATION_PRE_RESET
};
commitOperate(step, {}, 2).then(({valid}) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); this.$refs.noticeInfo.doShow(); });
} else if (this.operation === OperationEvent.Station.cancelPreReset.confirm.operation) {
const step = {
operation: OperationEvent.Command.common.affirm.operation,
cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET
};
commitOperate(step, {}, 2).then(({valid}) => {
if (valid) {
this.doClose();
}
}).catch(() => { this.doClose(); this.$refs.noticeInfo.doShow(); });
} }
}, },
doClose() { doClose() {
this.dialogShow = false; this.dialogShow = false;
this.$emit('close'); this.$emit('close');
} }
} }
}; };

View File

@ -13,6 +13,7 @@
<menu-station ref="menuStation" :selected="selected" /> <menu-station ref="menuStation" :selected="selected" />
<menu-limit ref="menuLimit" :selected="selected" /> <menu-limit ref="menuLimit" :selected="selected" />
<menu-station-light ref="menuStationLight" :selected="selected" /> <menu-station-light ref="menuStationLight" :selected="selected" />
<menu-station-pre-reset ref="menuStationPreReset" />
<!--<passive-alarm ref="passiveAlarm" />--> <!--<passive-alarm ref="passiveAlarm" />-->
<passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" /> <passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" />
<!--<passive-Timeout ref="passiveTimeout" />--> <!--<passive-Timeout ref="passiveTimeout" />-->
@ -34,6 +35,7 @@ import MenuBar from './menuBar';
import MenuLimit from './menuLimit'; import MenuLimit from './menuLimit';
import MenuStationTurnBack from './menuStationTurnBack'; import MenuStationTurnBack from './menuStationTurnBack';
import MenuStationLight from './menuStationLight'; import MenuStationLight from './menuStationLight';
import MenuStationPreReset from './menuStationPreReset';
// import PassiveAlarm from './passiveDialog/alarm'; // import PassiveAlarm from './passiveDialog/alarm';
import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
// import PassiveTimeout from './passiveDialog/timeout'; // import PassiveTimeout from './passiveDialog/timeout';
@ -55,7 +57,8 @@ export default {
MenuLimit, MenuLimit,
// PassiveAlarm, // PassiveAlarm,
PassiveContorl, PassiveContorl,
MenuStationLight MenuStationLight,
MenuStationPreReset
// PassiveTimeout // PassiveTimeout
}, },
props: { props: {

View File

@ -1,31 +1,25 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" /> <pop-menu ref="popMenu" :menu="menu" />
<password-input ref="passwordInput" @confirm="forceLightConfirm" /> <button-down ref="buttonDown" />
<operateConfirm ref="operateConfirm" @executeConfirm="forceLightConfirm1" />
<button-confirm ref="buttonConfirm" />
</div> </div>
</template> </template>
<script> <script>
import PopMenu from '@/components/PopMenu'; import PopMenu from '@/components/PopMenu';
import PasswordInput from './dialog/passwordInput';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum'; import CMD from '@/scripts/cmdPlugin/CommandEnum';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperateConfirm from './dialog/childDialog/operateConfirm'; import ButtonDown from './dialog/buttonDown';
import ButtonConfirm from './dialog/childDialog/buttonConfirm';
export default { export default {
name: 'StationControlLight', name: 'StationControlLight',
components: { components: {
PopMenu, PopMenu,
PasswordInput, ButtonDown
OperateConfirm,
ButtonConfirm
}, },
data() { data() {
return { return {
@ -40,7 +34,7 @@ export default {
{ {
label: '取消', label: '取消',
handler: this.cancelPreReset, handler: this.cancelPreReset,
cmdType: CMD.Station.CMD_STATION_PRE_RESET cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET
} }
], ],
Center: [ Center: [
@ -52,7 +46,7 @@ export default {
{ {
label: '取消', label: '取消',
handler: this.cancelPreReset, handler: this.cancelPreReset,
cmdType: CMD.Station.CMD_STATION_PRE_RESET cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET
} }
] ]
}, },
@ -71,7 +65,7 @@ export default {
}, },
watch: { watch: {
'$store.state.menuOperation.menuCount': function (val) { '$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationLight) && !this.buttonOperation) { if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationPreReset) && !this.buttonOperation) {
this.doShow(this.$store.state.menuOperation.menuPosition); this.doShow(this.$store.state.menuOperation.menuPosition);
} else { } else {
this.doClose(); this.doClose();
@ -97,6 +91,7 @@ export default {
doShow(point) { doShow(point) {
this.clickEvent(); this.clickEvent();
this.initMenu(); this.initMenu();
console.log(this.menu, this.$refs.popMenu);
if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) { if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
this.$refs.popMenu.resetShowPosition(point); this.$refs.popMenu.resetShowPosition(point);
} }
@ -114,14 +109,22 @@ export default {
commitOperate(menuOperate.Station.setPreReset, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Station.setPreReset, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
const nextOperate = { const nextOperate = {
operation: OperationEvent.StationLight.SetOrCancelForceLight.password.operation operation: OperationEvent.Station.setPreReset.confirm.operation
}; };
this.$refs.passwordInput.doShow(nextOperate, this.selected); this.$refs.buttonDown.doShow(nextOperate, this.selected);
} }
}); });
}, },
cancelPreReset() { cancelPreReset() {
//
commitOperate(menuOperate.Station.cancelPreReset, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
const nextOperate = {
operation: OperationEvent.Station.cancelPreReset.confirm.operation
};
this.$refs.buttonDown.doShow(nextOperate, this.selected);
}
});
}, },
forceLightConfirm() { forceLightConfirm() {
const nextOperate = { const nextOperate = {

View File

@ -80,6 +80,7 @@ export const DeviceMenu = {
StationTurnBack: '14', StationTurnBack: '14',
Power:'15', Power:'15',
StationLight: '16', StationLight: '16',
StationPreReset: '17',
Map: '100', Map: '100',
PrdCategory: '101', PrdCategory: '101',
@ -190,7 +191,7 @@ export const UrlConfig = {
trainingPlatform: { trainingPlatform: {
prodDetail: '/trainingPlatform/detail', prodDetail: '/trainingPlatform/detail',
teachDetail: '/trainingPlatform/teach', teachDetail: '/trainingPlatform/teach',
runPlan: '/trainingPlatform/runPlan', runPlan: '/trainingPlatform/runPlan',
teachHome: '/trainingPlatform/teachHome', teachHome: '/trainingPlatform/teachHome',
examHome: '/trainingPlatform/examHome', examHome: '/trainingPlatform/examHome',
course: '/trainingPlatform/course', course: '/trainingPlatform/course',

View File

@ -230,16 +230,18 @@ export default {
CMD_STATION_CANCEL_CI_AUTO: {value: 'Station_Cancel_CI_Auto', label: '全站取消自动通过'}, CMD_STATION_CANCEL_CI_AUTO: {value: 'Station_Cancel_CI_Auto', label: '全站取消自动通过'},
/** 设置/取消强制点灯 */ /** 设置/取消强制点灯 */
CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL: {value: 'Station_Set_Or_Cancel_Force_Physical_Signal', label: '设置/取消强制点灯'}, CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL: {value: 'Station_Set_Or_Cancel_Force_Physical_Signal', label: '设置/取消强制点灯'},
/** 区域选择(请求区域控制权【泰雷兹】 */ /** 区域选择(请求区域控制权【泰雷兹】、【宁波一】 */
CMD_STATION_CONTROL_APPLY: {value: 'Station_Control_Apply', label: '请求区域控制权'}, CMD_STATION_CONTROL_APPLY: {value: 'Station_Control_Apply', label: '请求区域控制权'},
/** 授权转移 (【泰雷兹】) */ /** 授权转移 (【泰雷兹】) */
CMD_STATION_CONTROL_TRANSFER: {value: 'Station_Control_Transfer', label: '授权转移'}, CMD_STATION_CONTROL_TRANSFER: {value: 'Station_Control_Transfer', label: '授权转移'},
/** 下放站控 (【泰雷兹】) */ /** 下放站控 (【泰雷兹】、【宁波一】) */
CMD_STATION_CONTROL_DEVOLVE: {value: 'Station_Control_Devolve', label: '下放站控'}, CMD_STATION_CONTROL_DEVOLVE: {value: 'Station_Control_Devolve', label: '下放站控'},
/** 收回站控 (【泰雷兹】) */ /** 收回站控 (【泰雷兹】、【宁波一】) */
CMD_STATION_CONTROL_REVOKE: {value: 'Station_Control_Revoke', label: '收回站控'}, CMD_STATION_CONTROL_REVOKE: {value: 'Station_Control_Revoke', label: '收回站控'},
/** 计轴预复位 */ /** 设置计轴预复位 */
CMD_STATION_PRE_RESET : {value: 'Station_Pre_Reset', label: '计轴预复位'} CMD_STATION_PRE_RESET : {value: 'Station_Pre_Reset', label: '计轴预复位'},
/** 取消计轴预复位 */
CMD_STATION_CANCEL_PRE_RESET: {value: 'Station_Cancel_Pre_Reset', label: '取消计轴预复位'}
}, },
// 列车 // 列车

View File

@ -65,10 +65,10 @@ export const OperationEvent = {
operation: 'com15', operation: 'com15',
domId: '_Tips-Cmd-Common-Close2' domId: '_Tips-Cmd-Common-Close2'
}, },
affirm: { affirm: {
operation: 'com16', operation: 'com16',
domId: '_Tips-Cmd-Common-Affirm' domId: '_Tips-Cmd-Common-Affirm'
} }
}, },
// 取消操作 // 取消操作
@ -2518,6 +2518,17 @@ export const OperationEvent = {
operation: '6171', operation: '6171',
domId: '_Tips-Station-setPreReset-Confirm' domId: '_Tips-Station-setPreReset-Confirm'
} }
},
// 取消计轴复位
cancelPreReset: {
menu: {
operation: '618',
domId: '_Tips-Station-cancelPreReset-Menu'
},
confirm: {
operation: '6181',
domId: '_Tips-Station-cancelPreReset-Confirm'
}
} }
}, },

View File

@ -88,13 +88,13 @@ const menuOperation = {
state.buttonOperation = operation; state.buttonOperation = operation;
}, },
setSelected: (state, obj) => { setSelected: (state, obj) => {
if (obj.subType) state.subType = obj.subType; if (obj.subType) state.subType = obj.subType;
state.selected = obj.device; state.selected = obj.device;
}, },
setMenuChange: (state, obj) => { setMenuChange: (state, obj) => {
state.selected = obj.device; state.selected = obj.device;
state.subType = obj.subType; state.subType = obj.subType;
}, },
mbmpCountIncrement: (state) => { mbmpCountIncrement: (state) => {
state.mbmpCount += 1; state.mbmpCount += 1;
}, },
@ -182,7 +182,7 @@ const menuOperation = {
*/ */
mbmPositionChange: ({ commit }) => { mbmPositionChange: ({ commit }) => {
commit('mbmpCountIncrement'); commit('mbmpCountIncrement');
}, },
/** /**
* 设置按钮菜单按钮 * 设置按钮菜单按钮
@ -195,12 +195,12 @@ const menuOperation = {
* 设置选中model * 设置选中model
*/ */
setSelected: ({ commit, state }, selected) => { setSelected: ({ commit, state }, selected) => {
commit('setSelected', selected); commit('setSelected', selected);
state.selectedCount += 1; state.selectedCount += 1;
}, },
// 改变哈尔滨底部菜单 // 改变哈尔滨底部菜单
setMenuChange: ({ commit, state }, selected) => { setMenuChange: ({ commit, state }, selected) => {
commit('setMenuChange', selected); commit('setMenuChange', selected);
state.setMenuChangeCount += 1; state.setMenuChangeCount += 1;
}, },
@ -210,7 +210,7 @@ const menuOperation = {
setPopMenu: ({ commit, state }, payLoad) => { setPopMenu: ({ commit, state }, payLoad) => {
commit('setMenu', payLoad.menu); commit('setMenu', payLoad.menu);
commit('setMenuParam', payLoad.param); commit('setMenuParam', payLoad.param);
commit('setMenuPosition', payLoad.position); commit('setMenuPosition', payLoad.position);
state.menuCount += 1; state.menuCount += 1;
}, },

View File

@ -143,6 +143,13 @@ export default {
this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
return; return;
} else if (em.subType == 'preReset' && em.deviceType == 'Station') { // 线
const equipment = this.getDeviceByEm(em);
this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
menu = getDeviceMenuByDeviceType('StationPreReset');
this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
this.$store.dispatch('training/emitTipFresh');
return;
} else if (em.subType == 'enabled' && em.deviceType == 'Switch') { } else if (em.subType == 'enabled' && em.deviceType == 'Switch') {
menu = getDeviceMenuByDeviceType('Enabled'); menu = getDeviceMenuByDeviceType('Enabled');
this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });