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

Merge remote-tracking branch 'origin/develop' into local-test
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m22s Details

This commit is contained in:
joylink_fanyuhong 2024-10-12 17:39:11 +08:00
parent 92a782de6b c8a49e3d31
commit b8175b0d7c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ export default {
dispatchingCommand: ['DISPATCHER'], dispatchingCommand: ['DISPATCHER'],
trainTicket: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'DRIVER'], trainTicket: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'DRIVER'],
registerBook: ['STATION_SUPERVISOR', 'STATION_MASTER', 'STATION_WORKER', 'ELECTRIC_DISPATCHER', 'STATION_ELECTRIC_WORKER'], registerBook: ['STATION_SUPERVISOR', 'STATION_MASTER', 'STATION_WORKER', 'ELECTRIC_DISPATCHER', 'STATION_ELECTRIC_WORKER'],
diagramLoad: ['DISPATCHER'], diagramLoad: ['DISPATCHER', 'STATION_SUPERVISOR'],
driverAtsWork: ['DRIVER'], driverAtsWork: ['DRIVER'],
diagramPreview: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'NCC_DISPATCHER'], diagramPreview: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'NCC_DISPATCHER'],
diagramEdit: [], diagramEdit: [],

9
src/views/system/configLine/config.vue
View File

@ -120,7 +120,8 @@ export default {
'SFUCanOnlyApplyForFaultLockSection', 'SFUCanOnlyApplyForFaultLockSection',
'signalBolckOptReflectSignal', 'signalBolckOptReflectSignal',
'routeCanSetWhenSwitchFault', 'routeCanSetWhenSwitchFault',
'manualTrainDefaultStop' 'manualTrainDefaultStop',
'guideDelayCloseWhenFirstSectionOccupied'
], ],
selectList: ['runMode', 'singleApproachLockCancelRoute'], selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [ generalConfig: [
@ -174,7 +175,8 @@ export default {
'SFUCanOnlyApplyForFaultLockSection', 'SFUCanOnlyApplyForFaultLockSection',
'signalBolckOptReflectSignal', 'signalBolckOptReflectSignal',
'routeCanSetWhenSwitchFault', 'routeCanSetWhenSwitchFault',
'manualTrainDefaultStop' 'manualTrainDefaultStop',
'guideDelayCloseWhenFirstSectionOccupied'
], ],
rangeList: ['noParkingSM', 'parkingSM'], rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -234,7 +236,8 @@ export default {
SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段', SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段',
signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示', signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示',
routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）', routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）',
manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态' manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态',
guideDelayCloseWhenFirstSectionOccupied: '办理引导进路时，如果进路首区段占用，引导信号15秒后关闭'
} }
}; };
}, },