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

调度命令socket调整

Browse Source
This commit is contained in:
dong 2023-01-13 11:28:12 +08:00
parent 4778a3c909
commit 816c0d01f5
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/store/modules/socket.js
View File

@ -372,6 +372,9 @@ const socket = {
setDispatchCommandMsg: (state, data) => { setDispatchCommandMsg: (state, data) => {
state.dispatchCommandMsg = data; state.dispatchCommandMsg = data;
}, },
setDispatchCommandState: (state, data) => {
state.dispatchCommandState = data;
},
setChangedCtcRunplanMap: (state, data) => { setChangedCtcRunplanMap: (state, data) => {
state.changedCtcRunplanMap = data; state.changedCtcRunplanMap = data;
}, },
@ -601,6 +604,9 @@ const socket = {
setDispatchCommandMsg: ({ commit }, data) => { setDispatchCommandMsg: ({ commit }, data) => {
commit('setDispatchCommandMsg', data); commit('setDispatchCommandMsg', data);
}, },
setDispatchCommandState: ({ commit }, data) => {
commit('setDispatchCommandState', data);
},
setChangedCtcRunplanMap: ({ commit }, data) => { setChangedCtcRunplanMap: ({ commit }, data) => {
commit('setChangedCtcRunplanMap', data); commit('setChangedCtcRunplanMap', data);
}, },

6
src/utils/subscribeCallback.js
View File

@ -161,9 +161,13 @@ function handle(data) {
store.dispatch('socket/removeCtcManagerRunPlanEdit', msg); store.dispatch('socket/removeCtcManagerRunPlanEdit', msg);
break; break;
// 调度命令信息 // 调度命令信息
case 'SIMULATION_RAIL_CTC_DISPATCH_COMMAND': case 'SIMULATION_RAIL_CTC_DIS_COMMAND_ADD':
store.dispatch('socket/setDispatchCommandMsg', msg); store.dispatch('socket/setDispatchCommandMsg', msg);
break; break;
// 调度命令状态
case 'SIMULATION_RAIL_CTC_DIS_COMMAND_SYNC':
store.dispatch('socket/setDispatchCommandState', msg);
break;
// 车站发送计划信息 // 车站发送计划信息
case 'SIMULATION_CTC_RUN_PLAN_CONFIRM_SEND': case 'SIMULATION_CTC_RUN_PLAN_CONFIRM_SEND':
store.dispatch('socket/setChangedCtcRunplanMap', msg); store.dispatch('socket/setChangedCtcRunplanMap', msg);

13
src/views/newMap/display/terminals/dispatchCmd.vue
View File

@ -422,7 +422,7 @@ import { sendCommandNew } from '@/api/jmap/training';
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import { parseTime } from '@/utils/index'; import { parseTime } from '@/utils/index';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import {UserOperationType} from "../../../../scripts/ConstDic"; import {UserOperationType} from '../../../../scripts/ConstDic';
export default { export default {
name:'DispatcherCmd', name:'DispatcherCmd',
data() { data() {
@ -496,7 +496,7 @@ export default {
STATION: 'Station', STATION: 'Station',
TRAIN: 'Train' TRAIN: 'Train'
}, },
DisStationId: 'DisStation1986', // DisStationId: 'DisStation1986',
allographRow: null, allographRow: null,
tableChecked: false, tableChecked: false,
active1: true, active1: true,
@ -610,15 +610,15 @@ export default {
}); });
const activeUser = userInfo || {}; const activeUser = userInfo || {};
return activeUser; return activeUser;
},
DisStationId() {
return this.getActiveSender.deviceCode ? this.getActiveSender.deviceCode : '';
} }
}, },
watch: { watch: {
getTableData() { getTableData() {
this.allographRow = null; this.allographRow = null;
}, },
getActiveSender(obj) {
this.DisStationId = obj.deviceCode ? obj.deviceCode : 'DisStation1986';
},
dispatchCommandState(obj) { dispatchCommandState(obj) {
Object.values(obj.cpStateMap).forEach(item => { Object.values(obj.cpStateMap).forEach(item => {
if (item.cpId) { if (item.cpId) {
@ -746,6 +746,9 @@ export default {
} }
}); });
} }
if (state == 'Signed') {
console.log(list, 'list');
}
return list.reverse(); return list.reverse();
}, },
findDisCmdObj(obj, val) { findDisCmdObj(obj, val) {

2
src/views/newMap/display/terminals/index.vue
View File

@ -274,6 +274,8 @@ export default {
this.mapViewLoaded(true); this.mapViewLoaded(true);
} else if (val === 'dispatcherManage') { } else if (val === 'dispatcherManage') {
this.mapViewLoaded(true); this.mapViewLoaded(true);
} else if (val === 'dispatchingCommand') {
this.$nextTick(() => { this.subscribe('CTC'); });
} }
this.$nextTick(() => { this.loading = false; }); this.$nextTick(() => { this.loading = false; });
}, },