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

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: [],

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秒后关闭'
             }
         };
     },