From fd960d2155e6ce2c042d7f9e84d2c633da451cb4 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 11 Feb 2020 15:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=EF=BC=8C=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7=E7=BA=BF=20?=
 =?UTF-8?q?=E9=81=93=E5=B2=94=20=E5=AE=9A=E6=93=8D=E5=92=8C=E5=8F=8D?=
 =?UTF-8?q?=E6=93=8D=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/constant/deviceState.js               | 3 ++-
 src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue | 4 ++--
 src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue  | 5 ++---
 src/scripts/cmdPlugin/CommandEnum.js              | 6 +++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js
index ee26224bf..bbc43859e 100644
--- a/src/jmapNew/constant/deviceState.js
+++ b/src/jmapNew/constant/deviceState.js
@@ -70,7 +70,8 @@ deviceState[deviceType.Signal] = {
 deviceState[deviceType.Station] = {
     /** 是否故障*/
     fault: false, /** 非故障*/
-    controlMode: 'Center' // Center 中控 Local 站控  Emergency 紧急站控 Interlock 联锁控
+    controlMode: 'Center'
+    // controlMode: 'Local' // Center 中控 Local 站控  Emergency 紧急站控 Interlock 联锁控
 };
 
 deviceState[deviceType.Psd] = {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
index 64a22f16a..e4c842f0d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
@@ -47,12 +47,12 @@ export default {
                     {
                         label: '单操到定位',
                         handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
                     },
                     {
                         label: '单操到反位',
                         handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
                     },
                     {
                         label: '道岔单锁',
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index e1426223e..55c938c9f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -55,12 +55,12 @@ export default {
                     {
                         label: '单操到定位',
                         handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
                     },
                     {
                         label: '单操到反位',
                         handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
                     },
                     {
                         label: '道岔单锁',
@@ -147,7 +147,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            debugger;
             this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 519df63dd..d5bc064bf 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -29,7 +29,11 @@ export default {
         /** 强扳 */
         CMD_SWITCH_FORCE_TURN: {value:'Switch_Force_Turn', label: '强扳'},
         /** 确认计轴有效 */
-        CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Comfirmation_Axle', label: '确认计轴有效'}
+        CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Comfirmation_Axle', label: '确认计轴有效'},
+        /** 定位（定操） */
+        CMD_SWITCH_NORMAL_POSITION:{value:'Switch_Normal_Position',label:'单操到定位'},
+        /** 反位（反操） */
+        CMD_SWITCH_REVERSE_POSITION:{value:'Switch_Reverse_Position',label:'单操到反位'},
     },
 
     // 控制模式操作