From 318d120db63b759957f2f358b6813aed3f4be35d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 29 Jan 2021 15:01:38 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20107:=20=E6=B5=99=E5=A4=A7=E7=BD=91?=
 =?UTF-8?q?=E6=96=B0=E4=BB=BF=E7=9C=9F=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AF=B9?=
 =?UTF-8?q?=E7=AB=8B=E7=9A=84=E5=8A=9F=E8=83=BD=E5=BA=94=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                              | 2 ++
 src/jmapNew/theme/xian_02/menus/menuSection.vue | 9 ++++++---
 src/jmapNew/theme/xian_02/menus/menuSignal.vue  | 5 +++--
 src/jmapNew/theme/xian_02/menus/menuSwitch.vue  | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 1db5748ca..7435511a4 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -543,10 +543,12 @@ class Jlmap {
                         status.atsControl = status.atsControl && elem.atsControl;
                         status.fleetMode = status.fleetMode || elem.fleetMode;
                         status.ciControl = status.ciControl || elem.ciControl;
+                        status.lock = status.lock || elem.lock;
                     } else {
                         status.atsControl = elem.atsControl;
                         status.fleetMode = elem.fleetMode;
                         status.ciControl = elem.ciControl;
+                        status.lock = elem.lock;
                     }
                     status.canSetCi = status.arc || elem.arc;
                 });
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index 0ee2b4a75..bdd90d3c4 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -83,11 +83,13 @@ export default {
                 Center: [
                     {
                         label: '区段封锁',
-                        handler: this.lock
+                        handler: this.lock,
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
                     },
                     {
                         label: '区段解封',
-                        handler: this.unlock
+                        handler: this.unlock,
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
                     },
                     {
                         label: '设备标签',
@@ -112,7 +114,8 @@ export default {
                     },
                     {
                         label: '设置临时限速',
-                        handler: this.setSpeed
+                        handler: this.setSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
                     },
                     {
                         label: '帮助',
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index a49963f42..1786e3230 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -17,6 +17,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'SignalMenu',
@@ -240,8 +241,8 @@ export default {
             };
         },
         initMenu() {
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            this.menu = MenuContextHandler.covert2(this.menuNormal);
+            // this.menu = this.menuNormal.Center;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 8d9587e64..308891ef0 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -24,6 +24,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'SwitchMenu',
@@ -192,8 +193,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            this.menu = MenuContextHandler.covert2(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {