From b0f7d125a38d109c750d2e6d3c5882ca5c7cd525 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 1 Jul 2020 16:10:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chengdu_03/menus/dialog/sectionDetail.vue | 10 ++---
 .../theme/chengdu_03/menus/menuButton.vue     | 11 ++---
 .../theme/chengdu_03/menus/menuSection.vue    | 42 ++++---------------
 .../theme/components/utils/menuOperate.js     |  5 +++
 4 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
index f70667610..ebbdd8c4c 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
@@ -21,8 +21,8 @@
         <el-form-item label="公里标(Km)">
           <el-input v-model="formModel.kmPost" disabled />
         </el-form-item>
-        <el-form-item label="长度(Km)">
-          <el-input v-model="formModel.factLength" disabled />
+        <el-form-item label="长度(m)">
+          <el-input v-model="formModel.lengthFact" disabled />
         </el-form-item>
       </el-form>
       <el-row justify="center" style="margin-top: 50px">
@@ -54,7 +54,7 @@ export default {
                 sectionName: '',
                 stationName: '',
                 kmPost: '',
-                factLength: ''
+                lengthFact: ''
             }
         };
     },
@@ -83,8 +83,8 @@ export default {
             // 如果不是因为断点激活则需要，初始化菜单初始值
             if (!this.dialogShow) {
                 if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                    this.formModel.sectionName = selected.name;
-                    this.formModel.factLength = '';
+                    this.formModel.sectionName = selected.parentCode ? selected.parentName + '-' + selected.name : selected.name;
+                    this.formModel.lengthFact = selected.lengthFact;
                     const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
                     if (station) {
                         this.formModel.stationName = station.name;
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index 9b2dc3c53..da0fc8655 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu" style="height: 45px;" :style="{left: point.x+'px', top: point.y+'px' }">
+  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height: 45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button :id="Signal.arrangementRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.arrangementRoute.button.operation, ['Signal'])">
       <span style="color: black">
         <center><b>排</b><b>列</b></center>
@@ -127,8 +127,8 @@ export default {
     data() {
         return {
             point: {
-                x: -1000,
-                y: -1000
+                x: 0,
+                y: 15
             },
             operation: '0',
             buttonName: '',
@@ -243,11 +243,6 @@ export default {
         },
         resetPosition() {
             this.$nextTick(() => {
-                const canvasOffset = this.$store.state.config.canvasOffset;
-                this.point = {
-                    x: canvasOffset.x + 20,
-                    y: canvasOffset.y + this.$store.state.config.height - 65
-                };
                 this.$store.dispatch('training/tipReload');
             });
         },
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
index d2e25418a..9029a62ec 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
@@ -162,35 +162,16 @@ export default {
         },
         // 故障解锁
         fault() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Section.fault.menu.operation,
-                param: {
-                    sectionCode: `${this.selected.code}`
-                }
-            };
-
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Section.fault, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(step, this.selected);
+                    this.$refs.sectionControl.doShow(operate, this.selected);
                 }
             });
         },
         detail() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Section.detail.menu.operation,
-                param: {
-                    sectionCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Section.detail, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionDetail.doShow(step, this.selected);
+                    this.$refs.sectionDetail.doShow(operate, this.selected);
                 }
             });
         },
@@ -218,20 +199,11 @@ export default {
                 }
             });
         },
+        // 新建计划车(开发专用)
         createPlanTrain() {
-            const step = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Train.createPlanTrain.menu.operation,
-                param: {
-                    sectionCode: this.selected.code
-                }
-            };
-
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Train.createPlanTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAddPlan.doShow(step);
+                    this.$refs.trainAddPlan.doShow(operate);
                 }
             });
         }
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index e43dc5796..0f5c9f8ff 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -58,6 +58,11 @@ export const menuOperate = {
             // 取消限速
             operation: OperationEvent.Section.cancelSpeed.menu.operation,
             cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
+        },
+        detail:{
+            // 区段详情
+            operation: OperationEvent.Section.detail.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_DETAILS
         }
     },
     Signal:{

From 47186e0948a1029f4a75d12fab29b694ea2a6fb5 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 1 Jul 2020 16:56:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/chengdu_03/menus/index.vue  |   4 +
 .../theme/chengdu_03/menus/menuSignal.vue     | 190 +++---------------
 .../theme/chengdu_03/menus/menuStation.vue    |  15 +-
 .../chengdu_03/menus/menuStationControl.vue   |  27 ++-
 4 files changed, 67 insertions(+), 169 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/index.vue b/src/jmapNew/theme/chengdu_03/menus/index.vue
index a8d3e5806..29faf4093 100644
--- a/src/jmapNew/theme/chengdu_03/menus/index.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/index.vue
@@ -109,6 +109,10 @@ export default {
         line-height: 22px;
     }
 
+    .chengdou-03__systerm .el-dialog span .el-icon-arrow-up{
+        line-height: 18px;
+    }
+
     .chengdou-03__systerm .el-dialog .el-dialog__footer {
         background: #ECE9D8;
         opacity: 1;
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
index 625c04e36..33f3c6e11 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
@@ -212,21 +212,10 @@ export default {
         },
         // 信号关灯
         signalClose() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.signalClose.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.signalClose, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(step, this.selected);
+                    this.$refs.routeControl.doShow(operate, this.selected);
                 }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置故障
@@ -245,208 +234,93 @@ export default {
                 }
             });
         },
+        // 获取进路列表
+        getRouteList(selectType) {
+            const routes = [];
+            this.routeList.forEach(elem => {
+                if (elem.startSignalCode === selectType.code) {
+                    routes.push(elem);
+                }
+            });
+            return routes;
+        },
         // 设置进路
         arrangementRoute() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.arrangementRoute.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            commitOperate(menuOperate.Signal.arrangementRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    const routes = [];
-                    this.routeList.forEach(elem => {
-                        if (elem.startSignalCode === this.selected.code) {
-                            routes.push(elem);
-                        }
-                    });
-                    this.$refs.routeSelection.doShow(step.operation, this.selected, routes);
+                    this.$refs.routeSelection.doShow(operate, this.selected, this.getRouteList(this.selected));
                 }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 进路引导
         guide() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.guide.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            commitOperate(menuOperate.Signal.guide, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    const routes = [];
-                    this.routeList.forEach(elem => {
-                        if (elem.startSignalCode === this.selected.code) {
-                            routes.push(elem);
-                        }
-                    });
-                    this.$refs.passwordBox.doShow({...step, ...{selected: this.selected}, ...{routesList: routes}});
+                    this.$refs.passwordBox.doShow({...operate, ...{selected: this.selected}, ...{routesList: this.getRouteList(this.selected)}});
                 }
             });
         },
         // 取消进路
         cancelTrainRoute() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            commitOperate(menuOperate.Signal.cancelTrainRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$refs.routeControl.doShow(step, this.selected);
+                    this.$refs.routeControl.doShow(operate, this.selected);
                 }
             });
         },
         // 总人解
         humanTrainRoute() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            commitOperate(menuOperate.Signal.humanTrainRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$refs.passwordBox.doShow({...step, ...{selected: this.selected}});
+                    this.$refs.passwordBox.doShow({...operate, ...{selected: this.selected}});
                 }
             });
         },
         // 信号重开
         reopenSignal() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.reopenSignal.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.reopenSignal, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(step, this.selected);
+                    this.$refs.routeControl.doShow(operate, this.selected);
                 }
             });
         },
         // 信号封锁
         lock() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.lock.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(step, this.selected);
+                    this.$refs.routeControl.doShow(operate, this.selected);
                 }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 信号解封
         unlock() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.unlock.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(step, this.selected);
+                    this.$refs.routeControl.doShow(operate, this.selected);
                 }
             });
         },
         // 进路交人工控
         humanControl() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.humanControl.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.humanControl, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    const routes = [];
-                    this.routeList.forEach(elem => {
-                        if (elem.startSignalCode === this.selected.code) {
-                            routes.push(elem);
-                        }
-                    });
-                    this.$refs.routeHandControl.doShow(step, this.selected, routes);
+                    this.$refs.routeHandControl.doShow(operate, this.selected, this.getRouteList(this.selected));
                 }
             });
         },
         // 查询进路状态
         detail() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.detail.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.detail, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    const routes = [];
-                    this.routeList.forEach(elem => {
-                        if (elem.startSignalCode === this.selected.code) {
-                            routes.push(elem);
-                        }
-                    });
-                    this.$refs.routeDetail.doShow(step, this.selected, routes);
+                    this.$refs.routeDetail.doShow(operate, this.selected, this.getRouteList(this.selected));
                 }
             });
         },
         // 进路交自动控
         atsAutoControl() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
-                param: {
-                    signalCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.atsAutoControl, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    const routes = [];
-                    this.routeList.forEach(elem => {
-                        if (elem.startSignalCode === this.selected.code) {
-                            routes.push(elem);
-                        }
-                    });
-                    this.$refs.routeHandControl.doShow(step, this.selected, routes);
+                    this.$refs.routeHandControl.doShow(operate, this.selected, this.getRouteList(this.selected));
                 }
             });
         },
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
index 2fab8edee..4b9d87511 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
@@ -7,6 +7,7 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
@@ -34,9 +35,9 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                 ],
-                central: [
+                Center: [
                 ]
             },
             menuForce: [
@@ -78,11 +79,11 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            if (this.selected.centralized) {
-                // 故障模式菜单列表
-                if (this.operatemode === OperateMode.FAULT) {
-                    this.menu = [...this.menuForce];
-                }
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue
index 63f082d73..569a15429 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue
@@ -5,6 +5,7 @@
 <script>
 import PopMenu from '@/components/PopMenu';
 import { mapGetters } from 'vuex';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 
 export default {
@@ -23,8 +24,12 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: [
-            ],
+            menuNormal: {
+                Local: [
+                ],
+                Center: [
+                ]
+            },
             menuForce: [
             ]
         };
@@ -54,9 +59,23 @@ export default {
                 self.doClose();
             };
         },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
         doShow(point) {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
+            // if (this.$refs && this.$refs.popMenu) {
+            //     this.$refs.popMenu.close();
+            // }
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
             }
         },
         doClose() {

From eef26afafa5d31b19ef593f88cbae77f43f2a890 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 1 Jul 2020 17:29:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chengdu_03/menus/menuStationStand.vue     | 102 +++---------------
 .../theme/chengdu_03/menus/menuSwitch.vue     |  89 ++-------------
 2 files changed, 22 insertions(+), 169 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
index f42ce9fee..d48054422 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
@@ -15,7 +15,6 @@ import StandDetail from './dialog/standDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
@@ -171,131 +170,58 @@ export default {
         },
         // 设置扣车
         setDetainTrain() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.setDetainTrain, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(step, this.selected);
+                    this.$refs.standControl.doShow(operate, this.selected);
                 }
             });
         },
         // 取消扣车
         cancelDetainTrain() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.cancelDetainTrain, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(step, this.selected);
+                    this.$refs.standControl.doShow(operate, this.selected);
                 }
             });
         },
         // 设置跳停
         setJumpStop() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.setJumpStop, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(step, this.selected);
+                    this.$refs.standControl.doShow(operate, this.selected);
                 }
             });
         },
         // 取消跳停
         cancelJumpStop() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.cancelJumpStop, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(step, this.selected);
+                    this.$refs.standControl.doShow(operate, this.selected);
                 }
             });
         },
         // 停站时间控制
         setStopTime() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.setStopTime, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    const tempData = [];
-                    this.$refs.standControl.doShow(step, this.selected, tempData);
+                    this.$refs.standControl.doShow(operate, this.selected, []);
                 }
-            }).catch((error) => {
-                this.$refs.noticeInfo.doShow(step, [error.message]);
             });
         },
         // 设置运行等级
         setRunLevel() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.setRunLevel, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    const tempData = [];
-                    this.$refs.standControl.doShow(step, this.selected, tempData);
+                    this.$refs.standControl.doShow(operate, this.selected, []);
                 }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 查询站台状态
         detail() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.detail.menu.operation,
-                param: {
-                    standCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            commitOperate(menuOperate.StationStand.detail, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    const tempData = [];
-                    this.$refs.standDetail.doShow(step, this.selected, tempData);
+                    this.$refs.standDetail.doShow(operate, this.selected, []);
                 }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
             });
         }
     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
index 43fe5441d..44e1fbb1c 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
@@ -17,7 +17,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@@ -170,136 +169,64 @@ export default {
         },
         // 道岔单锁
         lock() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.lock.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.lock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔解锁
         unlock() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.unlock.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.unlock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔封锁
         block() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.block.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔解封
         unblock() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.unblock.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.unblock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 道岔故障解锁/ 区故解
         fault() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.fault.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.fault, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 区段激活
         active() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.active.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.active, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 单操到定位
         locate() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.locate.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });
         },
         // 单操到反位
         reverse() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Switch.reverse.menu.operation,
-                param: {
-                    switchCode: this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.switchControl.doShow(operate, this.selected);
                 }
             });