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:
lVAL 2020-12-25 14:24:47 +08:00
parent c4aba14e1f
commit d5315ef81b
6 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
View File

@ -199,7 +199,7 @@ export default {
title: this.$t('menu.menuBar.toCentralControl'), title: this.$t('menu.menuBar.toCentralControl'),
click: this.conterStationControl, click: this.conterStationControl,
operate: OperationEvent.StationControl.requestCentralControl.mbar, operate: OperationEvent.StationControl.requestCentralControl.mbar,
froce: true force: true
} }
] ]
}, },
@ -326,13 +326,13 @@ export default {
title: this.$t('menu.menuBar.toStationControl'), title: this.$t('menu.menuBar.toStationControl'),
click: this.turnToStationControl, click: this.turnToStationControl,
operate: OperationEvent.StationControl.requestStationControl.mbar, operate: OperationEvent.StationControl.requestStationControl.mbar,
froce: true force: true
}, },
{ {
title: this.$t('menu.menuBar.forcedStationControl'), title: this.$t('menu.menuBar.forcedStationControl'),
click: this.mandatoryStationControl, click: this.mandatoryStationControl,
operate: OperationEvent.StationControl.forcedStationControl.password, operate: OperationEvent.StationControl.forcedStationControl.password,
froce: true force: true
}, },
{ {
title: this.$t('menu.menuBar.toCentralControl'), title: this.$t('menu.menuBar.toCentralControl'),

54
src/jmapNew/theme/ningbo_03/menus/menuBar.vue
View File

@ -423,28 +423,28 @@ export default {
children: [ children: [
{ {
title: '开放/关闭', title: '开放/关闭',
click: this.standOpenOrClose click: this.standOpenOrClose,
}, },
{ {
title: '设置/取消扣车', title: '设置/取消扣车',
click: this.setStandDetain click: this.setStandDetain,
}, },
{ {
title: '设置站间列车数量', title: '设置站间列车数量',
// click: this.setIntervalStopNumber // click: this.setIntervalStopNumber
click: this.undeveloped click: this.undeveloped,
}, },
{ {
title: '分配停站时间', title: '分配停站时间',
click: this.setAllocateTime click: this.setAllocateTime,
}, },
{ {
title: '授权转移', title: '授权转移',
click: this.authorizeTransfer click: this.authorizeTransfer,
}, },
{ {
title: '显示', title: '显示',
click: this.showStandDetail click: this.showStandDetail,
} }
] ]
}, },
@ -454,23 +454,23 @@ export default {
children: [ children: [
{ {
title: '命令', title: '命令',
click: this.setSwitchCommand click: this.setSwitchCommand,
}, },
{ {
title: '封锁', title: '封锁',
click: this.setBlockSwitch click: this.setBlockSwitch,
}, },
{ {
title: '解除封锁', title: '解除封锁',
click: this.setUnblockSwitch click: this.setUnblockSwitch,
}, },
{ {
title: '请求动岔/请求或授权/取消', title: '请求动岔/请求或授权/取消',
click: this.setSwitchActive click: this.setSwitchActive,
}, },
{ {
title: '显示', title: '显示',
click: this.showSwitchDetail click: this.showSwitchDetail,
} }
] ]
}, },
@ -481,31 +481,31 @@ export default {
{ {
title: '引导', title: '引导',
click: this.setSignalGuide click: this.setSignalGuide,
}, },
{ {
title: '取消允许锁闭', title: '取消允许锁闭',
click: this.setSignalCanBlock click: this.setSignalCanBlock,
}, },
{ {
title: '进路/命令', title: '进路/命令',
click: this.setRouteCommand click: this.setRouteCommand,
}, },
{ {
title: '信号指示模式', title: '信号指示模式',
click: this.setSignalModel click: this.setSignalModel,
}, },
{ {
title: '封锁', title: '封锁',
click: this.setSignalBlock click: this.setSignalBlock,
}, },
{ {
title: '解除封锁', title: '解除封锁',
click: this.setSignalCancelBlock click: this.setSignalCancelBlock,
}, },
{ {
title: '显示', title: '显示',
click: this.showSignalDetail click: this.showSignalDetail,
} }
] ]
}, },
@ -515,19 +515,19 @@ export default {
children: [ children: [
{ {
title: '开放', title: '开放',
click: this.handleOpenSection click: this.handleOpenSection,
}, },
{ {
title: '关闭', title: '关闭',
click: this.handleCloseSection click: this.handleCloseSection,
}, },
{ {
title: '临时限速', title: '临时限速',
click: this.handleLimitSpeed click: this.handleLimitSpeed,
}, },
{ {
title: '显示', title: '显示',
click: this.handleSectionShow click: this.handleSectionShow,
} }
] ]
}, },
@ -538,27 +538,27 @@ export default {
{ {
title: '取消转换锁闭', title: '取消转换锁闭',
// click: this.handleLock // click: this.handleLock
click: this.undeveloped click: this.undeveloped,
}, },
{ {
title: '取消过岔锁闭', title: '取消过岔锁闭',
// click: this.handleUnLock // click: this.handleUnLock
click: this.undeveloped click: this.undeveloped,
}, },
{ {
title: '远程预复位使能', title: '远程预复位使能',
// click: this.handleRestoration // click: this.handleRestoration
click: this.undeveloped click: this.undeveloped,
}, },
{ {
title: '复位', title: '复位',
// click: this.handleSectionRestoration // click: this.handleSectionRestoration
click: this.undeveloped click: this.undeveloped,
}, },
{ {
title: '显示', title: '显示',
// click: this.handleSectionStopShow // click: this.handleSectionStopShow
click: this.undeveloped click: this.undeveloped,
} }
] ]
}, },

6
src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
View File

@ -119,13 +119,15 @@ export default {
cmdType:this.status ? CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP : CMD.Stand.CMD_STAND_SET_JUMP_STOP, cmdType:this.status ? CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP : CMD.Stand.CMD_STAND_SET_JUMP_STOP,
operation:this.status ? OperationEvent.StationStand.cancelJumpStop.confirm.operation : OperationEvent.StationStand.setJumpStop.confirm.operation, operation:this.status ? OperationEvent.StationStand.cancelJumpStop.confirm.operation : OperationEvent.StationStand.setJumpStop.confirm.operation,
param: {standCode: this.selected.code} param: {standCode: this.selected.code}
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.doClose(); this.doClose();
} }
}).catch(() => { }).catch((error) => {
console.log(error)
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },

6
src/jmapNew/theme/xian_01/menus/menuBar.vue
View File

@ -203,7 +203,7 @@ export default {
title: this.$t('menu.menuBar.toCentralControl'), title: this.$t('menu.menuBar.toCentralControl'),
click: this.conterStationControl, click: this.conterStationControl,
operate: OperationEvent.StationControl.requestCentralControl.mbar, operate: OperationEvent.StationControl.requestCentralControl.mbar,
froce: true force: true
} }
] ]
}, },
@ -330,13 +330,13 @@ export default {
title: this.$t('menu.menuBar.toStationControl'), title: this.$t('menu.menuBar.toStationControl'),
click: this.turnToStationControl, click: this.turnToStationControl,
operate: OperationEvent.StationControl.requestStationControl.mbar, operate: OperationEvent.StationControl.requestStationControl.mbar,
froce: true force: true
}, },
{ {
title: this.$t('menu.menuBar.forcedStationControl'), title: this.$t('menu.menuBar.forcedStationControl'),
click: this.mandatoryStationControl, click: this.mandatoryStationControl,
operate: OperationEvent.StationControl.forcedStationControl.password, operate: OperationEvent.StationControl.forcedStationControl.password,
froce: true force: true
}, },
{ {
title: this.$t('menu.menuBar.toCentralControl'), title: this.$t('menu.menuBar.toCentralControl'),

7
src/scripts/cmdPlugin/MenuContextHandler.js
View File

@ -117,9 +117,9 @@ class MenuContextHandler {
item.show = false; item.show = false;
if (!item.click) { if (!item.click) {
item.click = () => { }; item.click = () => { };
} }
if (!item.froce) { if (!item.force) {
item.show = true; item.show = true;
if (item.children && item.children.length > 0) { if (item.children && item.children.length > 0) {
this.menuBarConvert(item.children, mode); this.menuBarConvert(item.children, mode);
@ -131,7 +131,8 @@ class MenuContextHandler {
item.show = true; item.show = true;
if (!item.click) { if (!item.click) {
item.click = () => { }; item.click = () => { };
} }
if (item.children && item.children.length > 0) { if (item.children && item.children.length > 0) {
this.menuBarConvert(item.children, mode); this.menuBarConvert(item.children, mode);
} }

10
src/views/system/commandDictionary/index.vue
View File

@ -38,6 +38,13 @@ export default {
label: this.$t('system.lineCode'), label: this.$t('system.lineCode'),
config: { config: {
data: [] data: []
}
},
simulationRole: {
type: 'select',
label: this.$t('system.simulationRole'),
config: {
data: []
} }
}, },
operateObject: { operateObject: {
@ -145,7 +152,8 @@ export default {
this.$ConstSelect.deviceTypeList.forEach(elem => { this.$ConstSelect.deviceTypeList.forEach(elem => {
this.deviceTypeList.push(elem); this.deviceTypeList.push(elem);
}); });
this.queryForm.queryObject.operateObject.config.data = this.deviceTypeList; this.queryForm.queryObject.operateObject.config.data = this.deviceTypeList;
this.queryForm.queryObject.simulationRole.config.data = this.$ConstSelect.simulationRole;
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }