Merge remote-tracking branch 'origin/develop'

commit 1b0ddc2740
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 17:39:39 2024 +0800

    Squashed commit of the following:

    commit cef55a4c6b
    Author: joylink_zhaoerwei <Bob_Engineer@163.com>
    Date:   Mon May 27 17:09:01 2024 +0800

        三维url调整

    commit 869c86b94d
    Author: joylink_zhaoerwei <Bob_Engineer@163.com>
    Date:   Mon May 27 16:57:01 2024 +0800

        更改三维地址

    commit dc2165733e
    Author: joylink_zhaoerwei <Bob_Engineer@163.com>
    Date:   Mon May 27 16:33:48 2024 +0800

        场景添加三维场景，实训中可根据url打开三维场景（待测试）

commit 7d774db362
Merge: b66515eba 0c5bba7c0
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 21 16:48:35 2024 +0800

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

commit 0c5bba7c0f
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 21 16:47:37 2024 +0800

    传输信号机调整

commit ef9165faa4
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu May 16 15:43:56 2024 +0800

    third

commit ae74123f18
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed May 8 09:17:37 2024 +0800

    成都工学院第三方登录调整

commit b1baeaabcd
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 7 15:46:29 2024 +0800

    成都工业学院第三方登录调整

commit b66515ebad
Merge: 5cf57c4d2 91a8410dc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Apr 24 11:01:32 2024 +0800

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

commit 91a8410dc2
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Apr 24 10:58:02 2024 +0800

    道岔名称背景颜色更换透明色

commit 5cf57c4d2f
Merge: 5ca4f2be8 c97def5fc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 17:16:40 2024 +0800

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

commit 5ca4f2be8d
Merge: 66a376298 31376bc22
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 16:10:23 2024 +0800

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

commit 66a3762987
Merge: 9dab09e4d 5be2cea1c
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 15:53:54 2024 +0800

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

commit 9dab09e4d0
Merge: b8f90509e dda44c870
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 09:33:42 2024 +0800

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

commit b8f90509eb
Merge: 26d9cc892 5548806ea
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Sun Apr 21 17:51:33 2024 +0800

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

commit 26d9cc892f
Merge: ce8d3f453 3fc31777a
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Apr 19 22:27:07 2024 +0800

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

commit ce8d3f4531
Author: fan <fanyuhong@joylink.club>
Date:   Fri Apr 19 22:25:43 2024 +0800

    iscs退出仿真调整&iscs绘制地图调整

commit 98662ec177
Author: fan <fanyuhong@joylink.club>
Date:   Fri Apr 19 18:25:09 2024 +0800

    实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode

src/jmapNew/theme/chengdu_03/menus/menuButton.vue

@@ -596,6 +596,13 @@ export default {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation
             };
+
+            if (model.aspect == 'RY') {
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_CLOSE_GUIDE;
+                operate.param = {signalCode: model.code};
+                this.deviceList = [];
+                this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {});
+            } else {
                 operate.cmdType = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
                 operate.param = {signalCode: model.code};
                 operate.val = model.code;
@@ -604,6 +611,7 @@ export default {
                     console.error(error);
                     this.$refs.noticeInfo.doShow();
                 });
+            }
         },
         handelControlRoute(model) { // 自动控 人工控点击button 发送
             const routeCodeList = [];

src/views/system/configLine/config.vue

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