diff --git a/src/jmapNew/theme/beijing_01/model.js b/src/jmapNew/theme/beijing_01/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/beijing_01/model.js
+++ b/src/jmapNew/theme/beijing_01/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/jmapNew/theme/chengdu_01/model.js b/src/jmapNew/theme/chengdu_01/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/chengdu_01/model.js
+++ b/src/jmapNew/theme/chengdu_01/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/jmapNew/theme/chengdu_03/model.js b/src/jmapNew/theme/chengdu_03/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/chengdu_03/model.js
+++ b/src/jmapNew/theme/chengdu_03/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/jmapNew/theme/foshan_01/model.js b/src/jmapNew/theme/foshan_01/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/foshan_01/model.js
+++ b/src/jmapNew/theme/foshan_01/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/jmapNew/theme/fuzhou_01/model.js b/src/jmapNew/theme/fuzhou_01/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/fuzhou_01/model.js
+++ b/src/jmapNew/theme/fuzhou_01/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/haerbin_01/model.js
+++ b/src/jmapNew/theme/haerbin_01/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
index 2d2286ee7..6073486a3 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
@@ -175,6 +175,8 @@ export default {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
                     });
+                } else {
+                    this.$refs.noticeInfo.doShow('当前进路不允许排列, 与其他进路可能发生冲突');
                 }
             }
         },
diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js
index 62440bda8..9ea48872d 100644
--- a/src/jmapNew/theme/ningbo_01/model.js
+++ b/src/jmapNew/theme/ningbo_01/model.js
@@ -21,6 +21,7 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue
index ed43d9651..c09a21552 100644
--- a/src/layout/components/Entry.vue
+++ b/src/layout/components/Entry.vue
@@ -132,7 +132,12 @@ export default {
             window.open(routeData.href, '_blank');
         },
         goToHelp() {
-            const href = 'https://joylink.club/helps/help1.pdf';
+            let href = '';
+            if (getSessionStorage('project').startsWith('design')) {
+                href = 'https://joylink.club/docs-design';
+            } else {
+                href = 'https://joylink.club/docs';
+            }
             window.open(href, '_blank');
         },
         goEmpty() {},
diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js
index 198f339c4..00ed1f075 100644
--- a/src/scripts/OperationConfig.js
+++ b/src/scripts/OperationConfig.js
@@ -4047,7 +4047,7 @@ export const OperationList = {
                 productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' },
-                    { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【{7}】按钮' }
+                    { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }
                 ]
             },
             {
@@ -4409,7 +4409,7 @@ export const OperationList = {
                 trainingType: '02',
                 productTypes: ['01', '02'],
                 stepVOList: [
-                    { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' },
+                    { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' },
                     { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
                 ]
             },
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 78d0cee37..f0cd23508 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -838,6 +838,10 @@ export const OperationEvent = {
             menu: {
                 operation: '309',
                 domId: '_Tips-Signal-SetAutoInterlock-Menu'
+            },
+            confirm: {
+                operation: '3091',
+                domId: '_Tips-Signal-SetAutoInterlock-Confirm'
             }
         },
         // 取消联锁自动进路
@@ -845,6 +849,10 @@ export const OperationEvent = {
             menu: {
                 operation: '310',
                 domId: '_Tips-Signal-CancelAutoInterlock-Menu'
+            },
+            confirm: {
+                operation: '3101',
+                domId: '_Tips-Signal-CancelAutoInterlock-Confirm'
             }
         },
         // 设置联锁自动触发
@@ -852,6 +860,10 @@ export const OperationEvent = {
             menu: {
                 operation: '311',
                 domId: '_Tips-Signal-SetAutoTrigger-Menu{TOP}'
+            },
+            confirm: {
+                operation: '3111',
+                domId: '_Tips-Signal-SetAutoTrigger-Confirm'
             }
         },
         // 取消联锁自动触发
@@ -859,6 +871,10 @@ export const OperationEvent = {
             menu: {
                 operation: '312',
                 domId: '_Tips-Signal-CancelAutoTrigger-Menu{TOP}'
+            },
+            confirm: {
+                operation: '3121',
+                domId: '_Tips-Signal-CancelAutoTrigger-Confirm'
             }
         },
         // 信号关灯