joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整流程

Browse Source
This commit is contained in:
zyy 2020-08-05 13:14:30 +08:00
parent d9866e8372
commit e852eb95db
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -476,9 +476,9 @@ export default {
{ name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menu, show: false } { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menu, show: false }
]; ];
this.stationParamList = this.$store.state.training.prdType === '01' ? [ this.stationParamList = this.$store.state.training.prdType === '01' ? [
{ name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }, { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, // { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' } // { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }
] : [ ] : [
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' }, { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }, { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },

4
src/store/modules/training.js
View File

@ -14,7 +14,7 @@ const training = {
namespaced: true, namespaced: true,
state: { state: {
mode: null, // 模式 (教学系统中教学、练习、测验模式) mode: TrainingMode.NORMAL, // 模式 (教学系统中教学、练习、测验模式)
operatemode: null, // 操作模式 管理员(故障、指令、普通) operatemode: null, // 操作模式 管理员(故障、指令、普通)
started: false, // 是否开始 started: false, // 是否开始
switchcount: 0, // 开关标识 switchcount: 0, // 开关标识
@ -464,7 +464,6 @@ const training = {
nextNew: ({ commit, state }, operate) => { nextNew: ({ commit, state }, operate) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
commit('setOperate', operate); commit('setOperate', operate);
if (!state.started && !state.mode) { if (!state.started && !state.mode) {
commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' }); commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
return; return;
@ -609,7 +608,6 @@ const training = {
* 结束模式 * 结束模式
*/ */
end: ({ commit }, mode) => { end: ({ commit }, mode) => {
console.log('end 8888888888888');
commit('over'); commit('over');
commit('resetOrder'); commit('resetOrder');
// commit('stopCountTime'); // commit('stopCountTime');