From e3ee44aae7c8630c8290326e5f02c4e6b8f67ac7 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Sun, 28 Jun 2020 13:27:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=81=93=E5=B2=94=E5=A4=B1?=
 =?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81=EF=BC=8C=E6=88=90=E9=83=BD3?=
 =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E5=AE=9E=E6=93=8D=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/ningbo_01.js      |   1 +
 src/jmapNew/shape/Switch/index.js             |  16 +-
 .../childDialog/confirmControlSpeed.vue       |  50 ++---
 .../menus/dialog/childDialog/confirmTip.vue   |   6 +-
 .../dialog/childDialog/passwordInputBox.vue   |   7 +-
 .../menus/dialog/routeSelection.vue           |  10 +-
 .../theme/chengdu_03/operationConfig.js       | 209 ++++++++----------
 .../theme/foshan_01/operationConfig.js        |   2 +-
 .../mapsystemNew/plugin/trainingtip.vue       |   4 -
 src/views/system/configLine/config.vue        |   7 +-
 10 files changed, 147 insertions(+), 165 deletions(-)

diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index ef1403e5e..3e2aeab49 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -301,6 +301,7 @@ class SkinCode extends defaultStyle {
                 block: true,								// 联合图形封锁状态
                 flashingColors: '#D600D5',					// 联合图形封锁闪烁显示颜色
                 fork: true,									// 挤岔专用（如有挤岔操作 变为true）
+                faultStatus: true,							// 宁波失表状态用 挤岔表示
                 forKColor: 'red'							// 挤岔颜色 配合挤岔专用
             },
             arcBlcok: {										// 圆形封锁图形
diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js
index b2989f0fa..cfa2851ed 100644
--- a/src/jmapNew/shape/Switch/index.js
+++ b/src/jmapNew/shape/Switch/index.js
@@ -347,12 +347,16 @@ export default class Switch extends Group {
 
     }
     setSwitchFault(split) {
-        if (this.model.switchFaultCode && split) {
-            const switchFault = store.getters['map/getDeviceByCode'](this.model.switchFaultCode);
-            switchFault.instance.setControlColor('#F00', true);
-        } else if (this.model.switchFaultCode && !split) {
-            const switchFault = store.getters['map/getDeviceByCode'](this.model.switchFaultCode);
-            switchFault.instance.setControlColor(this.style.backgroundColor, false);
+        if (this.style.Switch.jointImg.faultStatus && split) {
+            this.setForkAction(); // 道岔挤岔 宁波线失表状态
+        } else {
+            if (this.model.switchFaultCode && split) {
+                const switchFault = store.getters['map/getDeviceByCode'](this.model.switchFaultCode);
+                switchFault.instance.setControlColor('#F00', true);
+            } else if (this.model.switchFaultCode && !split) {
+                const switchFault = store.getters['map/getDeviceByCode'](this.model.switchFaultCode);
+                switchFault.instance.setControlColor(this.style.backgroundColor, false);
+            }
         }
     }
     /** 挤叉*/
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
index f7d3c615d..e8932dcc9 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -44,37 +44,35 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         title() {
-            if (this.dialogShow) {
-                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                    return '区段设置限速';
-                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                    return '区段取消限速';
-                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                    return '道岔设置限速';
-                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                    return '道岔取消限速';
-                }
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                return '区段设置限速';
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                return '区段取消限速';
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                return '道岔设置限速';
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                return '道岔取消限速';
             }
+            return '';
         },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.confirm.domId;
-                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.confirm.domId;
-                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.confirm.domId;
-                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                    /** 道岔取消限速*/
-                    return OperationEvent.Switch.cancelSpeed.confirm.domId;
-                }
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                /** 区段设置限速*/
+                return OperationEvent.Section.setSpeed.confirm.domId;
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                /** 区段取消限速*/
+                return OperationEvent.Section.cancelSpeed.confirm.domId;
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                /** 道岔设置限速*/
+                return OperationEvent.Switch.setSpeed.confirm.domId;
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                /** 道岔取消限速*/
+                return OperationEvent.Switch.cancelSpeed.confirm.domId;
             }
+            return '';
         }
     },
     mounted() {
@@ -128,7 +126,7 @@ export default {
                     this.$emit('setOperate', { step: 1, success: true });
                     this.doClose();
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.loading = false;
                 this.$emit('setOperate', { step: 0, success: false });
                 this.doClose();
@@ -147,7 +145,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.doClose();
             });
         }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue
index 9ff15f636..6852074ca 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue
@@ -26,8 +26,6 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
 export default {
     name: 'ConfirmTip',
     data() {
@@ -42,9 +40,7 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         title() {
-            if (this.dialogShow) {
-                return '提示';
-            }
+            return '提示';
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
index 36e151d71..7e8a953de 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -78,7 +78,7 @@
 
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'PasswordBox',
@@ -87,7 +87,7 @@ export default {
             /* 写死的初始密码*/
             correctPassword: '123',
             dialogShow: false,
-            operation: null,
+            operation: '',
             checkHasInput: false,
             /* 输入值*/
             passwordCheck: '',
@@ -109,7 +109,7 @@ export default {
             }
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         }
     },
     mounted() {
@@ -120,6 +120,7 @@ export default {
     methods: {
         doShow(operate) {
             this.operate = operate || {};
+            this.operation = operate.operation;
             this.dialogShow = true;
             this.checkHasInput = false;
             this.$nextTick(function () {
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
index ed4d41092..5c692a6db 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
@@ -248,7 +248,8 @@ export default {
 
                 // 设置选中指令
                 const operate = {
-                    operation: OperationEvent.Signal.arrangementRoute.choose.operation
+                    operation: OperationEvent.Signal.arrangementRoute.choose.operation,
+                    val: row.code
                 };
 
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -262,7 +263,6 @@ export default {
             if (this.row && this.row.canSetting) {
                 const operate = {
                     operation: OperationEvent.Signal.arrangementRoute.menu.operation,
-                    val: this.row.code,
                     param: {
                         routeCode: this.row.code
                     }
@@ -272,7 +272,7 @@ export default {
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.$refs.passwordBox.doShow(operate);
                         this.doClose();
                     }
@@ -287,9 +287,7 @@ export default {
             const operate = {
                 over: true,
                 operation: data.operation,
-                cmdType: data.cmdType,
-                val: data.val,
-                param: data.param
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
             };
 
             this.loading = true;
diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js
index 72828f743..15c446dea 100644
--- a/src/jmapNew/theme/chengdu_03/operationConfig.js
+++ b/src/jmapNew/theme/chengdu_03/operationConfig.js
@@ -1,29 +1,31 @@
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
         // 信号机列表
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0201',
+            operateType: CMD.Signal.CMD_SIGNAL_SET_ROUTE.value,
             skinCode: '04',
             trainingName: '办理进路({3} 进路)',
             trainingRemark: '办理进路功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【办理进路】' },
                 { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【执行】按钮' },
+                { deviceType: '04', orderNum: 4, operateCode: '301', tip: '输入密码123，点击【确定】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0201',
+            operateType: CMD.Signal.CMD_SIGNAL_SET_ROUTE.value,
             skinCode: '04',
             trainingName: '办理进路({3} 进路)',
             trainingRemark: '办理进路功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
@@ -34,11 +36,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0216',
+            operateType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE.value,
             skinCode: '04',
             trainingName: '办理引导进路({3})',
             trainingRemark: '进路办理信号引导',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【办理引导进路】' },
@@ -49,11 +51,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0216',
+            operateType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE.value,
             skinCode: '04',
             trainingName: '引导进路({3})[进路未锁闭]',
             trainingRemark: '进路办理信号引导',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' },
@@ -65,26 +67,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '待定',
-            skinCode: '04',
-            trainingName: '引导进路({3})[进路锁闭]',
-            trainingRemark: '进路办理信号引导',
-            trainingType: '02',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{4}' }, // 进路编号值不正确
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: '0202',
+            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value,
             skinCode: '04',
             trainingName: '取消进路({3} 进路)',
             trainingRemark: '取消进路功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
@@ -94,11 +81,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0202',
+            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value,
             skinCode: '04',
             trainingName: '总取消({3} 进路)',
             trainingRemark: '总取消功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3030', tip: '鼠标左键点击【总取消】' },
@@ -109,11 +96,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0215', // 新增数据字典code
+            operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value, // 新增数据字典code
             skinCode: '04',
             trainingName: '总人解({3})',
             trainingRemark: '总人解',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
@@ -124,11 +111,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0215', // 新增数据字典code
+            operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value, // 新增数据字典code
             skinCode: '04',
             trainingName: '总人解({3})',
             trainingRemark: '总人解',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
@@ -139,25 +126,25 @@ export default {
         {
             maxDuration: 8,
             minDuration: 5,
-            operateType: '0206',
+            operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value,
             skinCode: '04',
             trainingName: '信号重开({3} 进路)',
             trainingRemark: '信号重开功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】', val: '{6}' },
+                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
                 { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
         {
             maxDuration: 8,
             minDuration: 5,
-            operateType: '0206',
+            operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value,
             skinCode: '04',
             trainingName: '信号重开({3} 进路)',
             trainingRemark: '信号重开功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
@@ -167,11 +154,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0203',
+            operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value,
             skinCode: '04',
             trainingName: '信号封锁({5})',
             trainingRemark: '信号封闭',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
@@ -182,11 +169,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0203',
+            operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value,
             skinCode: '04',
             trainingName: '信号封锁({5})',
             trainingRemark: '信号封锁功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
@@ -196,11 +183,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0204',
+            operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
             skinCode: '04',
             trainingName: '信号解封({5})',
             trainingRemark: '信号解封',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
@@ -211,11 +198,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0204',
+            operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
             skinCode: '04',
             trainingName: '信号解封({5})',
             trainingRemark: '信号解封功能',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
@@ -226,11 +213,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0209',
+            operateType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value,
             skinCode: '04',
             trainingName: '进路收人工控({5})',
             trainingRemark: '进路收人工控',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路收人工控】' },
@@ -241,11 +228,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0209',
+            operateType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value,
             skinCode: '04',
             trainingName: '人工控({5})',
             trainingRemark: '人工控',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' },
@@ -255,11 +242,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0208',
+            operateType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value,
             skinCode: '04',
             trainingName: '进路交自动控({5})',
             trainingRemark: '进路交自动控',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
@@ -270,11 +257,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0208',
+            operateType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value,
             skinCode: '04',
             trainingName: '自动控({5})',
             trainingRemark: '自动控',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: 'mbm', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' },
@@ -284,11 +271,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0210',
+            operateType: CMD.Signal.CMD_SIGNAL_DETAIL.value,
             skinCode: '04',
             trainingName: '查询进路信息({5})',
             trainingRemark: '查询进路信息',
-            trainingType: '02',
+            trainingType: 'Signal',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【进路信息】' },
@@ -299,11 +286,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0312', // 0312 新增定位字典
+            operateType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION.value, // 0312 新增定位字典
             skinCode: '04',
             trainingName: '单操到定位({7})',
             trainingRemark: '单操到定位({15})',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标右键菜单选择【单操到定位】' },
@@ -313,11 +300,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0312',
+            operateType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION.value,
             skinCode: '04',
             trainingName: '单操到定位({7})',
             trainingRemark: '单操到定位({7})',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【道岔定操】' },
@@ -327,11 +314,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0313', // 0313 新增定位字典
+            operateType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION.value, // 0313 新增定位字典
             skinCode: '04',
             trainingName: '单操到反位({7})',
             trainingRemark: '单操到反位({7})',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【单操到反位】' },
@@ -341,11 +328,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0313',
+            operateType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION.value,
             skinCode: '04',
             trainingName: '单操到反位({7})',
             trainingRemark: '单操到反位({7})',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键菜单选择【道岔反操】' },
@@ -355,11 +342,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0301',
+            operateType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value,
             skinCode: '04',
             trainingName: '道岔单锁({7})',
             trainingRemark: '道岔单锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
@@ -369,11 +356,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0301',
+            operateType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value,
             skinCode: '04',
             trainingName: '道岔单锁({7})',
             trainingRemark: '道岔单锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['01'], // 现地操作
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键菜单选择【道岔单锁】' },
@@ -383,11 +370,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0302',
+            operateType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
             skinCode: '04',
             trainingName: '道岔解锁({7})',
             trainingRemark: '道岔解锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' },
@@ -397,11 +384,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0305',
+            operateType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
             skinCode: '04',
             trainingName: '道岔解锁({7})',
             trainingRemark: '道岔解锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键菜单选择【道岔解锁】' },
@@ -412,11 +399,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0303',
+            operateType: CMD.Switch.CMD_SWITCH_BLOCK.value,
             skinCode: '04',
             trainingName: '道岔封锁({7})',
             trainingRemark: '道岔封锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
@@ -427,11 +414,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0305',
+            operateType: CMD.Switch.CMD_SWITCH_BLOCK.value,
             skinCode: '04',
             trainingName: '道岔封锁({7})',
             trainingRemark: '道岔封锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
@@ -441,11 +428,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0304',
+            operateType: CMD.Switch.CMD_SWITCH_UNBLOCK.value,
             skinCode: '04',
             trainingName: '道岔解封({7})',
             trainingRemark: '道岔解封功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
@@ -456,11 +443,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0305',
+            operateType: CMD.Switch.CMD_SWITCH_UNBLOCK.value,
             skinCode: '04',
             trainingName: '道岔解封({7})',
             trainingRemark: '道岔解封功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
@@ -471,11 +458,11 @@ export default {
         {
             maxDuration: 20,
             minDuration: 10,
-            operateType: '0306',
+            operateType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK.value,
             skinCode: '04',
             trainingName: '区故解({7})',
             trainingRemark: '道岔区段故障解锁功能',
-            trainingType: '03',
+            trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【区故解】' },
@@ -487,11 +474,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0401',
+            operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
             skinCode: '04',
             trainingName: '区故解({8}{9})',
             trainingRemark: '故障解锁功能',
-            trainingType: '04',
+            trainingType: 'Section',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' },
@@ -502,11 +489,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0401',
+            operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
             skinCode: '04',
             trainingName: '区故解({9})',
             trainingRemark: '故障解锁功能',
-            trainingType: '04',
+            trainingType: 'Section',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' },
@@ -518,11 +505,11 @@ export default {
         {
             maxDuration: 15, // 自动生成实训失败
             minDuration: 8,
-            operateType: '0409',
+            operateType: CMD.Section.CMD_SECTION_DETAILS.value,
             skinCode: '04',
             trainingName: '属性({8}{9})',
             trainingRemark: '区段详情({8}{9})',
-            trainingType: '04',
+            trainingType: 'Section',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '410', tip: '鼠标右键菜单选择【属性】' },
@@ -533,11 +520,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0501',
+            operateType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value,
             skinCode: '04',
             trainingName: '设置扣车({10}-{12}站台)',
             trainingRemark: '设置扣车功能',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' },
@@ -547,11 +534,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0502',
+            operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value,
             skinCode: '04',
             trainingName: '取消扣车({10}-{12}站台)',
             trainingRemark: '设置取消扣车功能',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
@@ -561,11 +548,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0502',
+            operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value,
             skinCode: '04',
             trainingName: '取消扣车({10}-{12}站台)',
             trainingRemark: '设置取消扣车功能(上行全线)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
@@ -576,11 +563,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0505',
+            operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
             skinCode: '04',
             trainingName: '设置跳停({10}-{12}站台)',
             trainingRemark: '设置跳停功能',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
@@ -590,11 +577,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0506',
+            operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
             skinCode: '04',
             trainingName: '取消跳停({10}-{12}站台)',
             trainingRemark: '设置取消跳停功能',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
@@ -604,11 +591,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0508',
+            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
             skinCode: '04',
             trainingName: '设置停站时间({10}-{12}站台)',
             trainingRemark: '设置停站时间(自动, 一直有效)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
@@ -619,11 +606,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0508',
+            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
             skinCode: '04',
             trainingName: '设置停站时间({10}-{12}站台)',
             trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
@@ -636,11 +623,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0508',
+            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
             skinCode: '04',
             trainingName: '设置停站时间({10}-{12}站台)',
             trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
@@ -652,11 +639,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0509',
+            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
             skinCode: '04',
             trainingName: '设置站间运行等级({10}-{12}站台)',
             trainingRemark: '设置站间运行等级(自动, 一直有效)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
@@ -667,11 +654,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0509',
+            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
             skinCode: '04',
             trainingName: '设置站间运行等级({10}-{12}站台)',
             trainingRemark: '设置站间运行等级(人工, 常速, 一直有效)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
@@ -683,11 +670,11 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: '0509',
+            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
             skinCode: '04',
             trainingName: '设置站间运行等级({10}-{12}站台)',
             trainingRemark: '设置站间运行等级(人工, 常速, 一次有效)',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
@@ -698,11 +685,11 @@ export default {
         {
             maxDuration: 8, // 自动生成实训失败
             minDuration: 5,
-            operateType: '0507',
+            operateType: CMD.Stand.CMD_STAND_VIEW_STATUS.value,
             skinCode: '04',
             trainingName: '属性({10}-{12}站台)',
             trainingRemark: '查询站台状态功能',
-            trainingType: '05',
+            trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【属性】' },
diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js
index b9caa7f5e..14bb0e7f5 100644
--- a/src/jmapNew/theme/foshan_01/operationConfig.js
+++ b/src/jmapNew/theme/foshan_01/operationConfig.js
@@ -454,7 +454,7 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType:CMD.Signal.CMD_SIGNAL_SET_ROUTE.value,
+            operateType: CMD.Signal.CMD_SIGNAL_SET_ROUTE.value,
             skinCode: '08',
             trainingName: '排列进路({3} 进路)',
             trainingRemark: '排列进路功能',
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index 04d262fc6..b2be99011 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -167,10 +167,6 @@ export default {
             }
 
             if (/{TOP}/.test(domId)) {
-                return false;
-            }
-
-            if (/{BOTTOM}/.test(domId)) {
                 return true;
             }
             // 如果domId中不含以下关键字，则箭头朝上
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 118262a71..5fce6d713 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -75,9 +75,9 @@ export default {
             height: 800,
             roadData: [],
             focus: false,
-            booleanList: ['lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock'],
+            booleanList: ['lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock'],
             selectList: ['upDirection', 'runMode'],
-            generalConfig: ['lockFirst', 'switchSingleHandle', 'upDirection', 'switchNRTurnChain', 'switchSingleLockChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM'],
+            generalConfig: ['lockFirst', 'switchSingleHandle', 'upDirection', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM'],
             rangeList: ['noParkingSM', 'parkingSM'],
             numberList: [],
             optionsMap: {
@@ -95,7 +95,8 @@ export default {
                 initSingleLockSwitch: '初始加载设备时是否默认单锁正线道岔',
                 ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭',
                 noParkingSM: '不停站头码车服务号取值范围',
-                parkingSM: '停站头码车服务号取值范围'
+                parkingSM: '停站头码车服务号取值范围',
+                switchLossChain: '道岔故障失表是否联动'
             }
         };
     },