修改成都3操作优化,以及实训配置修正

This commit is contained in:
lVAL 2021-01-22 10:57:27 +08:00
parent 5d7810b6f9
commit 277252916c
2 changed files with 42 additions and 5 deletions

View File

@ -117,6 +117,7 @@ import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import CMD from '@/scripts/cmdPlugin/CommandEnum'; import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { OperateMode } from '@/scripts/ConstDic';
export default { export default {
name: 'MapButtonMenu', name: 'MapButtonMenu',
@ -143,13 +144,15 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters('training', [
'operatemode'
]),
...mapGetters('map', [ ...mapGetters('map', [
'routeList', 'routeList',
'routeData', 'routeData',
'signalList', 'signalList',
'autoReentryList', 'autoReentryList',
'autoReentryData', 'autoReentryData',
''
]), ]),
Switch() { Switch() {
return OperationEvent.Switch; return OperationEvent.Switch;
@ -330,7 +333,7 @@ export default {
const operate = { const operate = {
operation: this.$store.state.menuOperation.buttonOperation operation: this.$store.state.menuOperation.buttonOperation
}; };
let isArrangementRoute = false; let isArrangementRoute = false;
if (deviceList.length === 1) { if (deviceList.length === 1) {
const signal = deviceList[0]; const signal = deviceList[0];
const sectionModel = this.$store.getters['map/getDeviceByCode'](signal.sectionCode); const sectionModel = this.$store.getters['map/getDeviceByCode'](signal.sectionCode);
@ -694,8 +697,8 @@ export default {
this.clearOperate(); this.clearOperate();
} }
} else { } else {
this.clearOperate(); this.clearOperate();
// this.$messageBox(''); this.operatemode != OperateMode.FAULT && this.$message.info('请先切换到站控或紧急站控');
} }
} }
} }

View File

@ -8,6 +8,39 @@
// STAND 站台 // STAND 站台
// ROUTE 进路 // ROUTE 进路
// CYCLE 自动折返 // CYCLE 自动折返
// {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
// {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
// {id: "3", trainingType: "Signal", name: "进路名称"}
// {id: "4", trainingType: "Signal", name: "进路编号"}
// {id: "5", trainingType: "Signal", name: "信号机名称"}
// {id: "6", trainingType: "Signal", name: "信号机编号"}
// {id: "7", trainingType: "Switch", name: "道岔名称"}
// {id: "8", trainingType: "Section", name: "物理区段名称"}
// {id: "9", trainingType: "Section", name: "逻辑区段名称"}
// {id: "10", trainingType: "Stand", name: "车站名称"}
// {id: "11", trainingType: "Stand", name: "站台行驶方向编号"}
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}
// {id: "17", trainingType: "Switch", name: "道岔编码"}
// {id: "18", trainingType: "Section", name: "逻辑区段编码"}
// {id: "19", trainingType: "Section", name: "区段编号"}
// {id: "20", trainingType: "Section", name: "车站名称"}
// {id: "21", trainingType: "Switch", name: "车站名称"}
// {id: "22", trainingType: "Section", name: "车站编号"}
// {id: "23", trainingType: "Switch", name: "车站编号"}
// {id: "24", trainingType: "Switch", name: "道岔计轴区段编号"}
// {id: "25", trainingType: "Switch", name: "道岔计轴区段名称"}
import CMD from '@/scripts/cmdPlugin/CommandEnum'; import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default { export default {
list: [ list: [
@ -85,7 +118,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' }, { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
] ]
}, },
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,