Merge remote-tracking branch 'origin/develop' into local-test

新增线路配置项
现地工作站添加运行图加载
2024-10-12 17:39:11 +08:00 · 2024-10-12 17:38:30 +08:00 · 2024-09-30 14:33:11 +08:00 · 2024-09-29 14:11:41 +08:00 · 2024-09-29 14:11:09 +08:00
2 changed files with 7 additions and 4 deletions
--- a/src/views/newMap/display/terminals/terminalMenu.vue
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@ -106,7 +106,7 @@ export default {
                dispatchingCommand: ['DISPATCHER'],
                trainTicket: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'DRIVER'],
                registerBook: ['STATION_SUPERVISOR', 'STATION_MASTER', 'STATION_WORKER', 'ELECTRIC_DISPATCHER', 'STATION_ELECTRIC_WORKER'],
-                diagramLoad: ['DISPATCHER'],
+                diagramLoad: ['DISPATCHER', 'STATION_SUPERVISOR'],
                driverAtsWork: ['DRIVER'],
                diagramPreview: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'NCC_DISPATCHER'],
                diagramEdit: [],
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@ -120,7 +120,8 @@ export default {
                'SFUCanOnlyApplyForFaultLockSection',
                'signalBolckOptReflectSignal',
                'routeCanSetWhenSwitchFault',
-                'manualTrainDefaultStop'
+                'manualTrainDefaultStop',
+                'guideDelayCloseWhenFirstSectionOccupied'
            ],
            selectList: ['runMode', 'singleApproachLockCancelRoute'],
            generalConfig: [
@ -174,7 +175,8 @@ export default {
                'SFUCanOnlyApplyForFaultLockSection',
                'signalBolckOptReflectSignal',
                'routeCanSetWhenSwitchFault',
-                'manualTrainDefaultStop'
+                'manualTrainDefaultStop',
+                'guideDelayCloseWhenFirstSectionOccupied'
            ],
            rangeList: ['noParkingSM', 'parkingSM'],
            speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -234,7 +236,8 @@ export default {
                SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段',
                signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示',
                routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）',
-                manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态'
+                manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态',
+                guideDelayCloseWhenFirstSectionOccupied: '办理引导进路时，如果进路首区段占用，引导信号15秒后关闭'
            }
        };
    },
Author	SHA1	Message	Date
joylink_fanyuhong	b8175b0d7c	Merge remote-tracking branch 'origin/develop' into local-test All checks were successful local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m22s Details	2024-10-12 17:39:11 +08:00
joylink_fanyuhong	c8a49e3d31	新增线路配置项	2024-10-12 17:38:30 +08:00
joylink_fanyuhong	0d34d83747	现地工作站添加运行图加载	2024-09-30 14:33:11 +08:00
joylink_fanyuhong	92c66ab4d6	画面管理处理设备map为空	2024-09-29 14:11:41 +08:00
joylink_fanyuhong	5a7c5fdbeb	成都三号线折返进路办理调整	2024-09-29 14:11:09 +08:00