diff --git a/src/api/chat.js b/src/api/chat.js
index 0fafefea0..7c0f69385 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -255,3 +255,20 @@ export function getRealDevices(group) {
         method: 'get'
     });
 }
+
+// 获取房间真实设备连接关系
+export function getRealDevicesNew(group) {
+    return request({
+        url: `/api/jointTraining/room/${group}/realDevice/connect`,
+        method: 'get'
+    });
+}
+
+// 更新真实设备的连接关系
+export function undateRealDevicesNew(group, data) {
+    return request({
+        url: `/api/jointTraining/room/${group}/realDevice`,
+        method: 'put',
+        data: data
+    });
+}
diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js
index 5db5a4c4e..276859659 100644
--- a/src/api/jmap/training.js
+++ b/src/api/jmap/training.js
@@ -120,6 +120,15 @@ export function sendCommand(group, command) {
     });
 }
 
+// 发送新的指令
+export function sendCommandNew(group, commandDefinitionId, command) {
+    return request({
+        url: `/simulation/${group}/operate/${commandDefinitionId}`,
+        method: 'post',
+        data: command
+    });
+}
+
 export function updateLesson(data) {
     return request({
         url: `/api/training/userTraining/${data.id}`,
diff --git a/src/api/management/dictionary.js b/src/api/management/dictionary.js
index 3d1990051..64170e64d 100644
--- a/src/api/management/dictionary.js
+++ b/src/api/management/dictionary.js
@@ -104,3 +104,11 @@ export function getCommandDetail(id) {
         method: 'get'
     });
 }
+
+// 获取指令列表
+export function getCmdList(lineCode) {
+    return request({
+        url: `/api/cmd/line/${lineCode}`,
+        method: 'get'
+    });
+}
diff --git a/src/api/project.js b/src/api/project.js
new file mode 100644
index 000000000..337853df6
--- /dev/null
+++ b/src/api/project.js
@@ -0,0 +1,71 @@
+import request from '@/utils/request';
+
+/** 新建项目设备*/
+export function createDevice(data) {
+    return request({
+        url: `/api/project/device`,
+        method: 'post',
+        data: data
+    });
+}
+/** 项目设备编码是否已存在 */
+export function deviceIsExist(projectCode, code) {
+    return request({
+        url: `/api/project/device/exist/${projectCode}/${code}`,
+        method: 'get'
+    });
+}
+/** 分页查询项目设备 */
+export function getProjectDeviceList(params) {
+    return request({
+        url: `/api/project/device/paging`,
+        method: 'get',
+        params:params
+    });
+}
+/** 删除项目设备 */
+export function deleteProjectDevice(id) {
+    return request({
+        url: `/api/project/device/${id}`,
+        method: 'delete'
+    });
+}
+/** 获取设备详情 */
+export function getDeviceDetail(id) {
+    return request({
+        url: `/api/project/device/${id}`,
+        method: 'get'
+    });
+}
+/** 添加/修改屏蔽门设备网关映射配置 */
+export function setPsdConfig(id, data) {
+    return request({
+        url: `/api/project/device/${id}/config/psd`,
+        method: 'put',
+        data: data
+    });
+}
+/** 添加/修改信号机设备网关映射配置 */
+export function setSignalConfig(id, data) {
+    return request({
+        url: `/api/project/device/${id}/config/signal`,
+        method: 'put',
+        data: data
+    });
+}
+/** 添加/修改信号机设备网关映射配置 */
+export function setSwitchConfig(id, data) {
+    return request({
+        url: `/api/project/device/${id}/config/switch`,
+        method: 'put',
+        data: data
+    });
+}
+/** 查询项目下的所有设备 */
+export function getAllDeviceInProject(params) {
+    return request({
+        url: `/api/project/device/project`,
+        method: 'get',
+        params
+    });
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 2ce57b204..71731e696 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -454,9 +454,18 @@ export function newMapOperate(group, operationId, data) {
     });
 }
 /** 新版地图根据group获取仿真运行图 */
-export function getRunPlanNew(group) {
+export function getEveryDayRunPlanNew(group) {
     return request({
         url: `/simulation/${group}/runPlan`,
         method: 'get'
     });
 }
+
+/** 查询进路信息*/
+export function querySignalStatus(group, params) {
+    return request({
+        url: `/api/simulation/${group}/status/signal`,
+        method: 'get',
+        params
+    });
+}
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index 9d1ef4c04..0e67d3636 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -53,6 +53,17 @@
       <template v-else-if="checkFieldType(item, 'number')">
         <el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required">
           <el-input-number
+            v-if="item.precisionFlag"
+            v-model="formModel[item.prop]"
+            :placeholder="item.placeholder"
+            :disabled="item.disabled"
+            :min="isNaN(item.min) ? -Infinity : item.min"
+            :max="isNaN(item.max)? Infinity : item.max"
+            :step="isNaN(item.step) ? -Infinity : item.step"
+            :precision="item.precision"
+          />
+          <el-input-number
+            v-else
             v-model="formModel[item.prop]"
             :placeholder="item.placeholder"
             :disabled="item.disabled"
diff --git a/src/i18n/langs/en/exam.js b/src/i18n/langs/en/exam.js
index 04656325b..be9029b9a 100644
--- a/src/i18n/langs/en/exam.js
+++ b/src/i18n/langs/en/exam.js
@@ -18,7 +18,7 @@ export default {
     courseName: 'Examination subject',
     permissionsDetails: 'Permission details',
     buy: 'buy',
-    distributePermission: 'Permission distribution (examination)',
+    distributePermission: 'Permission distribution',
     viewCoursePapers: 'View course papers',
     examStartTime: 'Start time',
     theExamIsReadyAnyTime: 'Anytime you are available',
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index 0ca93382f..4d3e0655b 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -71,5 +71,6 @@ export default {
     subsystemGeneration: 'Subsystem generation',
     newsBulletin: 'New bulletin',
     commandDictionary: 'Command dictionary',
-    configLine: 'Line management'
+    configLine: 'Line management',
+    deviceManage: 'Device management'
 };
diff --git a/src/i18n/langs/en/teach.js b/src/i18n/langs/en/teach.js
index 9726055e7..b0a9512a1 100644
--- a/src/i18n/langs/en/teach.js
+++ b/src/i18n/langs/en/teach.js
@@ -13,7 +13,7 @@ export default {
     free: 'free',
     permissionsDetails: 'Permissions for details',
     buy: 'buy',
-    permissionDistribute: 'Permission distribution (class)',
+    permissionDistribute: 'Permission distribution',
     authorityTransferred: 'Authority transferred',
     courseList: 'Course list',
     seconds: 'seconds',
diff --git a/src/i18n/langs/zh/exam.js b/src/i18n/langs/zh/exam.js
index a206bb3a0..1b088214a 100644
--- a/src/i18n/langs/zh/exam.js
+++ b/src/i18n/langs/zh/exam.js
@@ -18,7 +18,7 @@ export default {
     courseName: '课程名称',
     permissionsDetails: '权限详情',
     buy: '购买',
-    distributePermission: '权限分发(考试)',
+    distributePermission: '权限分发',
     viewCoursePapers: '查看课程试卷',
     nameOfTestPaper: '试卷名称',
     examStartTime: '考试时间',
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index a1e74a379..5438cb8c8 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -72,5 +72,6 @@ export default {
     subsystemGeneration: '子系统生成',
     newsBulletin: '消息公告',
     commandDictionary: '指令字典',
-    configLine: '线路管理'
+    configLine: '线路管理',
+    deviceManage: '设备管理'
 };
diff --git a/src/i18n/langs/zh/teach.js b/src/i18n/langs/zh/teach.js
index a5663050c..b52cd87ae 100644
--- a/src/i18n/langs/zh/teach.js
+++ b/src/i18n/langs/zh/teach.js
@@ -1,22 +1,22 @@
 export default {
-	title: '城市轨道交通教学系统',
-	describe: '该系统具备真实的业务逻辑，以地铁员工和培训点为要素的业务和流程驱动方式进行软件架构，从业务流程、标准作业、培训方式及开放原则等角度出发，力求打造最符合用户需求及快速响应变化的实训教学系统。',
-	trainingName: '实训名称：',
-	trainingTime: '完成实训最佳用时：',
-	trainingMaximum: '完成实训最大用时：',
-	trainingInstructions: '实训说明：',
-	startTraining: '开始实训',
+    title: '城市轨道交通教学系统',
+    describe: '该系统具备真实的业务逻辑，以地铁员工和培训点为要素的业务和流程驱动方式进行软件架构，从业务流程、标准作业、培训方式及开放原则等角度出发，力求打造最符合用户需求及快速响应变化的实训教学系统。',
+    trainingName: '实训名称：',
+    trainingTime: '完成实训最佳用时：',
+    trainingMaximum: '完成实训最大用时：',
+    trainingInstructions: '实训说明：',
+    startTraining: '开始实训',
 
-	courseName: '课程名称',
-	courseDescription: '课程说明',
-	courseDetails: '课程详情',
-	free: '免费',
-	permissionsDetails: '权限详情',
-	buy: '购买',
-	permissionDistribute: '权限分发(上课)',
-	authorityTransferred: '权限转赠',
-	courseList: '课程列表',
-	seconds: '秒',
-	enterTheCourse: '进入课程',
-	returnCourseList: '返回课程列表'
+    courseName: '课程名称',
+    courseDescription: '课程说明',
+    courseDetails: '课程详情',
+    free: '免费',
+    permissionsDetails: '权限详情',
+    buy: '购买',
+    permissionDistribute: '权限分发',
+    authorityTransferred: '权限转赠',
+    courseList: '课程列表',
+    seconds: '秒',
+    enterTheCourse: '进入课程',
+    returnCourseList: '返回课程列表'
 };
diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
index 230fc7be0..ea24c33c9 100644
--- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
+++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
@@ -518,13 +518,14 @@ export function menuFiltration(menuObj) {
     } else {
         control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
     }
-
+    console.log('============', control);
     if (control) {
         if (store.state.training.prdType != '') {
             const type = SystemType[store.state.training.prdType];
             const status = StationControlType[control.status];
             menu = [...menuObj[type]];
             if (menu.constructor === Array) {
+                console.log('============1', menu);
                 menu.forEach(elem => {
                     if (elem.type === 'separator') {
                         elem.show = true;
@@ -536,6 +537,7 @@ export function menuFiltration(menuObj) {
                         if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
                             elem.show = false;
                         }
+                        console.log('222222222', elem);
                         elem.defaultDisabled = !elem.auth[status];
                     }
                 });
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue
index 85c64832c..277f503a8 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'NoticeInfo',
@@ -74,4 +74,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
index bbb3a2587..b7d3c2351 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
@@ -1,355 +1,138 @@
 <template>
-    <el-dialog class="chengdou-03__systerm confirm-control" :title="title" :visible.sync="show" width="360px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div class="context">
-            <template v-for="message in messages">
-                <span>{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm confirm-control"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="message in messages">
+        <span>{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import NoticeInfo from './childDialog/noticeInfo'
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
-    export default {
-        name: 'ConfirmControl',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                operate: {},
-                messages: '',
-                operation: null
+export default {
+    name: 'ConfirmControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: {},
+            messages: '',
+            operation: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                return '信号关灯';
             }
         },
-        components: {
-            NoticeInfo
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
-                    return '进路设置';
-                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                    return '信号关灯';
-                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                    return '信号重开';
-                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    return '取消进路';
-                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                    return '进路交人工控';
-                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                    return '进路交ATS自动控'
-                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                    return '设置运行等级';
-                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                    return '停站时间';
-                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                    return '设置折返策略';
-                }
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                if (this.dialogShow) {
-                    if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
-                        /** 进路设置*/
-                        return OperationEvent.Signal.arrangementRoute.confirm.domId
-                    } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                        /** 信号关灯*/
-                        return OperationEvent.Signal.signalClose.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                        /** 信号重开*/
-                        return OperationEvent.Signal.reopenSignal.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                        /** 取消进路*/
-                        return OperationEvent.Signal.cancelTrainRoute.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                        /** 进路交人工控*/
-                        return OperationEvent.Signal.humanControl.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                        /** 进路交ATS自动控*/
-                        return OperationEvent.Signal.atsAutoControl.confirm.domId;
-                    } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                        /** 设置运行等级*/
-                        return OperationEvent.StationStand.setRunLevel.confirm.domId;
-                    } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                        /** 设置停战时间*/
-                        return OperationEvent.StationStand.setStopTime.confirm.domId;
-                    } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                        /** 设置折返策略*/
-                        return OperationEvent.StationStand.setBackStrategy.confirm.domId;
-                    }
-                }
-            },
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.messages = operate.messages;
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
-                    /** 进路设置*/
-                    this.routeSetting();
-                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
                     /** 信号关灯*/
-                    this.signalClose();
-                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                    /** 信号重开*/
-                    this.reopenSignal();
-                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    /** 取消进路*/
-                    this.cancelTrainRoute();
-                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                    /** 进路交人工控*/
-                    this.humanControl();
-                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                    /** 进路交ATS自动控*/
-                    this.atsAutoControl();
-                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                    /** 设置运行等级*/
-                    this.setRunLevel();
-                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                    /** 停站时间*/
-                    this.setStopTime();
-                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                    /** 设置折返策略*/
-                    this.setBackStrategy();
+                    return OperationEvent.Signal.signalClose.confirm.domId;
                 }
-            },
-            //进路设置
-            routeSetting() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.arrangementRoute.confirm.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //信号关灯
-            signalClose() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.signalClose.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //信号重开
-            reopenSignal() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.reopenSignal.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //取消进路
-            cancelTrainRoute() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //进路交人工控
-            humanControl() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.humanControl.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //进路交ATS自动控
-            atsAutoControl() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.atsAutoControl.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //设置运行等级
-            setRunLevel() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
-                    val: this.operate.val
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //停站时间
-            setStopTime() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.StationStand.setStopTime.confirm.operation,
-                    val: this.operate.val,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //设置折返策略
-            setBackStrategy() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
-                    val: this.operate.val,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
             }
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.messages = operate.messages;
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            }
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.signalClose.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => {
+                this.doClose();
+            });
+        }
     }
+};
 
 </script>
 <style>
@@ -357,4 +140,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
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 31d4587e0..f7d3c615d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -1,148 +1,158 @@
 <template>
-    <el-dialog class="chengdou-03__systerm confirm-control-speed" :title="title" :visible.sync="show" width="540px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="height: 60px; padding-left: 20px">
-            <span style="font-size: 18px">{{message}}</span>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="6" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm confirm-control-speed"
+    :title="title"
+    :visible.sync="show"
+    width="540px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="height: 60px; padding-left: 20px">
+      <span style="font-size: 18px">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="6" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ConfirmControlSpeed',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                type: '',
-                operation: '',
-                message: '',
-            }
+export default {
+    name: 'ConfirmControlSpeed',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            type: '',
+            operation: '',
+            message: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                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 "道岔取消限速";
-                    }
-                }
-            },
-            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;
-                    }
+        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 '道岔取消限速';
                 }
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                if (!this.dialogShow) {
-                    this.type = operate.type;
-                    this.operation = operate.operation;
-                    this.message = operate.message;
-                }
-
-                this.loading = false;
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.type
-                }
-
+        domIdConfirm() {
+            if (this.dialogShow) {
                 if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
                     /** 区段设置限速*/
-                    operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
+                    return OperationEvent.Section.setSpeed.confirm.domId;
                 } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
                     /** 区段取消限速*/
-                    operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
+                    return OperationEvent.Section.cancelSpeed.confirm.domId;
                 } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
                     /** 道岔设置限速*/
-                    operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
+                    return OperationEvent.Switch.setSpeed.confirm.domId;
                 } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
                     /** 道岔取消限速*/
-                    operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
+                    return OperationEvent.Switch.cancelSpeed.confirm.domId;
                 }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setOperate', { step: 1, success: true });
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.$emit('setOperate', { step: 0, success: false });
-                    this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setOperate', { step: 0, success: false });
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
             }
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.type = operate.type;
+                this.operation = operate.operation;
+                this.message = operate.message;
+            }
+
+            this.loading = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                type: this.type
+            };
+
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
+            }
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 1, success: true });
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.$emit('setOperate', { step: 0, success: false });
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 0, success: false });
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            }).catch(error => {
+                this.doClose();
+            });
+        }
     }
+};
 
 </script>
 <style>
@@ -150,4 +160,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue
deleted file mode 100644
index c6f069ffe..000000000
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__systerm route-unlock-confirm" :title="title" :visible.sync="show" width="500px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="height: 60px; padding-left: 20px">
-            <span>在{{stationName}}【{{signalName}}】信号机，信号解锁，确认下达吗？</span>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="6" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
-</template>
-
-<script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
-    export default {
-        name: 'RouteUnlockConfirm',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                signalName: '',
-                stationName: ''
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                return '信号解封'
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : '';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.stationName = ''
-                this.signalName = '';
-                if (selected) {
-                    this.signalName = selected.name;
-                    let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-
-                this.loading = false;
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.unlock.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setOperate', { step: 1, success: true });
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.$emit('setOperate', { step: 0, success: false });
-                    this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setOperate', { step: 0, success: false });
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            }
-        }
-    }
-
-</script>
-<style>
-    .route-unlock-confirm .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
\ No newline at end of file
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 6917c9a94..9ff15f636 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTip.vue
@@ -1,59 +1,69 @@
 <template>
-    <el-dialog class="chengdou-03__systerm confirm-control-speed" :title="title" :visible.sync="show" width="340px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="height: 60px; padding-left: 20px">
-            <span style="font-size: 18px">{{message}}</span>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="11">
-                <el-button type="primary" :id="confirmId" @click="confirm">确定</el-button>
-            </el-col>
-            <el-col :span="11" :offset="2">
-                <el-button @click="doClose">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm confirm-control-speed"
+    :title="title"
+    :visible.sync="show"
+    width="340px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="height: 60px; padding-left: 20px">
+      <span style="font-size: 18px">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="11">
+        <el-button :id="confirmId" type="primary" @click="confirm">确定</el-button>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-button @click="doClose">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ConfirmTip',
-        data() {
-            return {
-                dialogShow: false,
-                message: '',
-                confirmId: '',
-            }
+export default {
+    name: 'ConfirmTip',
+    data() {
+        return {
+            dialogShow: false,
+            message: '',
+            confirmId: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                if (this.dialogShow) {
-                    return "提示";
-                }
-            }
-        },
-        mounted() {
-
-        },
-        methods: {
-            doShow(operate) {
-                this.message = operate.message;
-                this.dialogShow = true;
-                this.confirmId = operate.confirmId;
-            },
-            confirm() {
-                this.$emit('close');
-            },
-            doClose() {
-                this.dialogShow = false;
+        title() {
+            if (this.dialogShow) {
+                return '提示';
             }
         }
+    },
+    mounted() {
+
+    },
+    methods: {
+        doShow(operate) {
+            this.message = operate.message;
+            this.dialogShow = true;
+            this.confirmId = operate.confirmId;
+        },
+        confirm() {
+            this.$emit('close');
+        },
+        doClose() {
+            this.dialogShow = false;
+        }
     }
+};
 
 </script>
 <style scoped>
@@ -65,4 +75,4 @@
         display: block;
         margin: 0 auto;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
index ccfcf9036..bd52f38bd 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
     import NoticeInfo from './childDialog/noticeInfo'
 
     export default {
@@ -131,7 +131,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -148,7 +148,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -165,4 +165,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/password.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/password.vue
deleted file mode 100644
index e69de29bb..000000000
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 b706da32d..fc3053829 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -76,110 +76,111 @@
 </template>
 
 <script>
-import { OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
-	name: 'PasswordBox',
-	data() {
-		return {
-			/* 写死的初始密码*/
-			correctPassword: '123456',
-			dialogShow: false,
-			operation: null,
-			checkHasInput: false,
-			/* 输入值*/
-			passwordCheck: '',
-			/* 输入值替换为对应长度的星号*/
-			encryptionPassword: '',
-			loading: false,
-			showMistake: false
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel: {
-			get: function () {
-				return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
-			},
-			set: function () {
-			}
-		},
-		domIdConfirm() {
-			return this.dialogShow ? getDomIdByOperation(this.operate.operateNext) : '';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate) {
-			this.operate = operate || {};
-			this.dialogShow = true;
-			this.checkHasInput = false;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.showMistake = false;
-			this.$store.dispatch('training/emitTipFresh');
-		},
-		commit() {
-			if (this.passwordCheck === this.correctPassword) {
-				this.$emit('checkOver', this.operate);
-				this.doClose();
-				this.inputClear();
-			} else {
-				this.showMistake = true;
-			}
-		},
-		/* 软键盘输入*/
-		inputNum(e) {
-			this.showMistake = false;
-			this.passwordCheck += e.path[0].innerText;
-			this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
-		},
-		/* 软键盘清除*/
-		inputClear() {
-			this.showMistake = false;
-			this.passwordCheck = '';
-			this.encryptionPassword = '';
-		},
-		/* 软键盘回退*/
-		backSpace() {
-			this.showMistake = false;
-			const password = this.passwordCheck;
-			if (password !== '') {
-				this.passwordCheck = password.substring(0, password.length - 1);
-				this.encryptionPassword = this.passwordCheck;
-			}
-		},
+    name: 'PasswordBox',
+    data() {
+        return {
+            /* 写死的初始密码*/
+            correctPassword: '123456',
+            dialogShow: false,
+            operation: null,
+            checkHasInput: false,
+            /* 输入值*/
+            passwordCheck: '',
+            /* 输入值替换为对应长度的星号*/
+            encryptionPassword: '',
+            loading: false,
+            showMistake: false
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel: {
+            get: function () {
+                return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
+            },
+            set: function () {
+            }
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operate.operateNext) : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.dialogShow = true;
+            this.checkHasInput = false;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.showMistake = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() { // 确定
+            if (this.passwordCheck === this.correctPassword) {
+                this.$emit('checkOver', this.operate);
+                this.doClose();
+                this.inputClear();
+            } else {
+                this.showMistake = true;
+            }
+        },
+        /* 软键盘输入*/
+        inputNum(e) {
+            this.showMistake = false;
+            this.passwordCheck += e.path[0].innerText;
+            this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
+        },
+        /* 软键盘清除*/
+        inputClear() {
+            this.showMistake = false;
+            this.passwordCheck = '';
+            this.encryptionPassword = '';
+        },
+        /* 软键盘回退*/
+        backSpace() {
+            this.showMistake = false;
+            const password = this.passwordCheck;
+            if (password !== '') {
+                this.passwordCheck = password.substring(0, password.length - 1);
+                this.encryptionPassword = this.passwordCheck;
+            }
+        },
 
-		cancel() {
-			const operate = {
-				send: false,
-				type: this.operate.type,
-				operation: OperationEvent.Command.close.password.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-					this.inputClear();
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
-			});
-		}
-	}
+        cancel() {
+            const operate = {
+                send: false,
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.password.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.inputClear();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
+            });
+        }
+    }
 };
 
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
index e3375f76f..5694754dd 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
@@ -1,85 +1,95 @@
 <template>
-    <el-dialog class="chengdou-03__systerm popup-alarm" :title="title" :visible.sync="show" width="500px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <el-row>
-            <el-col :offset="2">
-                <span v-for="message in messages">{{message}}</span><br>
-            </el-col>
-        </el-row>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="8">
-                <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
-            </el-col>
-        </el-row>
-        </span>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm popup-alarm"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <el-row>
+      <el-col :offset="2">
+        <span v-for="message in messages">{{ message }}</span><br>
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'Popup-Alarm',
-        data() {
-            return {
-                dialogShow: false,
-                messages: [],
-                operate: null,
-                operation: '',
-            }
+export default {
+    name: 'PopupAlarm',
+    data() {
+        return {
+            dialogShow: false,
+            messages: [],
+            operate: null,
+            operation: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                return '弹出式告警';
-            },
-            domIdSure() {
-                return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-            }
+        title() {
+            return '弹出式告警';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, messages) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.dialogShow = true;
-                this.messages = messages || [];
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, messages) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+            this.dialogShow = true;
+            this.messages = messages || [];
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    // 确认计轴有效
-                    this.alxeEffective();
-                }
-
-            },
-            alxeEffective() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.alarm.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.doClose();
-                    }
-                })
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                // 确认计轴有效
+                this.alxeEffective();
             }
+
+        },
+        alxeEffective() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            });
         }
     }
+};
 
 </script>
 <style>
@@ -87,4 +97,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue
index 6af5a13b5..dff94e5ba 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue
@@ -33,280 +33,252 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import ConfirmControl from './childDialog/confirmControl';
 import PasswordBox from './childDialog/passwordInputBox';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'RouteControl',
-	components: {
-		ConfirmControl,
-		PasswordBox,
-		NoticeInfo
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			tempdata: [],
-			operation: null,
-			stationName: '',
-			signalName: '',
-			operateCode: ''
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-				return '取消列车进路';
-			} else if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
-				return '总人解';
-			} else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-				return '重开信号';
-			} else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
-				return '信号封锁';
-			} else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-				return '信号解封';
-			} else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-				return '信号关灯';
-			}
-			return '';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected, tempdata) {
-			this.selected = selected;
-			this.tempdata = tempdata;
-			if (!this.dialogShow) {
-				this.signalName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-					this.signalName = selected.name;
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
-				this.operation = operate.operation;
-				this.operateCode = operate.code;
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		commit() {
-			if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-				/** 取消列车进路*/
-				this.cancelTrainRoute();
-			} else if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
-				/** 总人解*/
-				this.humanTrainRoute();
-			} else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-				/** 信号重开*/
-				this.reopenSignal();
-			} else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
-				/** 信号封锁*/
-				this.lock();
-			} else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-				/** 信号解封*/
-				this.unlock();
-			} else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-				/** 信号关灯*/
-				this.signalClose();
-			}
-		},
-		passWordCommit(data) {
-			const operate = {
-				send: true,
-				type: data.type,
-				operation: data.operateNext
-			};
+    name: 'RouteControl',
+    components: {
+        ConfirmControl,
+        PasswordBox,
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            tempdata: [],
+            operation: null,
+            stationName: '',
+            signalName: '',
+            operateCode: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                return '取消列车进路';
+            } else if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                return '总人解';
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                return '重开信号';
+            } else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
+                return '信号封锁';
+            } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                return '信号解封';
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                return '信号关灯';
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempdata) {
+            this.selected = selected;
+            this.tempdata = tempdata;
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.operation = operate.operation;
+                this.operateCode = operate.code;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                /** 取消列车进路*/
+                this.cancelTrainRoute();
+            } else if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                /** 总人解*/
+                this.humanTrainRoute();
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                /** 信号重开*/
+                this.reopenSignal();
+            } else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
+                /** 信号封锁*/
+                this.lock();
+            } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 信号解封*/
+                this.unlock();
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            }
+        },
+        passWordCommit(data) {
+            const operate = {
+                over: true,
+                operation: data.operateNext,
+                cmdType: data.cmdType
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) { this.doClose(); }
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) { this.doClose(); }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
 
-		},
-		// 取消列车进路
-		cancelTrainRoute() {
-			if (this.$store.state.training.prdType == '01') {
-				/** 现地工作站*/
-				this.cancelTrainRouteByLocal();
-			} else if (this.$store.state.training.prdType == '02') {
-				/** 行调工作站*/
-				this.cancelTrainRouteByCentral();
-			}
-		},
-		// 现地工作站取消进路
-		cancelTrainRouteByLocal() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-			};
+        },
+        // 取消列车进路
+        cancelTrainRoute() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            };
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 行调工作站取消进路
-		cancelTrainRouteByCentral() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-			};
+        // 总人解
+        humanTrainRoute() {
+            const operate = {
+                operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
+                operateNext: OperationEvent.Signal.humanTrainRoute.confirm.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
+                    this.$refs.password.doShow(operate);
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 总人解
-		humanTrainRoute() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
-				operateNext: OperationEvent.Signal.humanTrainRoute.confirm.operation
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号封锁
+        lock() {
+            const operate = {
+                operation: OperationEvent.Signal.lock.menu.operation,
+                operateNext: OperationEvent.Signal.lock.confirm.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 信号重开
-		reopenSignal() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.reopenSignal.menu.operation
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_BLOCK;
+                    this.$refs.password.doShow(operate);
+                }
+            }).catch(() => {
+            });
+        },
+        // 信号解封
+        unlock() {
+            const operate = {
+                operation: OperationEvent.Signal.unlock.menu.operation,
+                operateNext: OperationEvent.Signal.unlock.confirm.operation
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 信号封锁
-		lock() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.lock.menu.operation,
-				operateNext: OperationEvent.Signal.lock.confirm.operation
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
+                    this.$refs.password.doShow(operate);
+                }
+            }).catch(() => {
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                messages: [`信号关灯: ${this.signalName}`]
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).catch(() => {
-			});
-		},
-		// 信号解封
-		unlock() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.unlock.menu.operation,
-				operateNext: OperationEvent.Signal.unlock.confirm.operation
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 取消
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).catch(() => {
-			});
-		},
-		// 信号关灯
-		signalClose() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.signalClose.menu.operation,
-				messages: [`信号关灯: ${this.signalName}`]
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.confirmControl.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-			});
-		},
-		// 取消
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Command.close.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
index 1450d834a..c9323a246 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
@@ -67,89 +67,90 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
-	name: 'RouteDetail',
-	components: {
-		NoticeInfo
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			tempData: [],
-			stationName: '',
-			signalName: ''
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'signalList'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? OperationEvent.Signal.detail.menu.domId : '';
-		},
-		title() {
-			return '查询进路状态';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected, tempData) {
-			this.selected = selected;
-			// 如果不是因为断点激活则需要，初始化菜单初始值
-			if (!this.dialogShow) {
-				this.signalName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-					this.signalName = selected.name;
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
-				this.tempData = tempData || [];
-			}
+    name: 'RouteDetail',
+    components: {
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            tempData: [],
+            stationName: '',
+            signalName: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.detail.menu.domId : '';
+        },
+        title() {
+            return '查询进路状态';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempData) {
+            this.selected = selected;
+            // 如果不是因为断点激活则需要，初始化菜单初始值
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.tempData = tempData || [];
+            }
 
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
index 847ab9fd2..009b1d5db 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
@@ -50,189 +50,200 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic.js';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import PasswordBox from './childDialog/passwordInputBox.vue';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'RouteSelection',
-	components: {
-		NoticeInfo,
-		PasswordBox
-	},
-	data() {
-		return {
-			tempData: [],
-			beforeSectionList: [],
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			operation: '',
-			display: true,
-			stationName: '',
-			signalName: '',
-			tableStyle: {
-				'border-bottom': 'none'
-			},
-			controlTypeNameMap: {
-				'01': '折返',
-				'02': '直通'
-			}
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdChoose() {
-			return this.dialogShow ? OperationEvent.Signal.guide.choose.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? OperationEvent.Signal.guide.menu.domId : '';
-		},
-		title() {
-			return '办理引导进路';
-		},
-		commitDisabled() {
-			let disabled = true;
-			if (this.row) {
-				disabled = !this.row.canSetting;
-			}
-			return disabled;
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		getProtectedSectionName(row) {
-			let name = '';
-			if (row &&
+    name: 'RouteSelection',
+    components: {
+        NoticeInfo,
+        PasswordBox
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            tempData: [],
+            beforeSectionList: [],
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: '',
+            display: true,
+            stationName: '',
+            signalName: '',
+            tableStyle: {
+                'border-bottom': 'none'
+            },
+            controlTypeNameMap: {
+                '01': '折返',
+                '02': '直通'
+            },
+            row: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.Signal.guide.choose.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.guide.menu.domId : '';
+        },
+        title() {
+            return '办理引导进路';
+        },
+        commitDisabled() {
+            let disabled = true;
+            if (this.row) {
+                disabled = !this.row.canSetting;
+            }
+            return disabled;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        getProtectedSectionName(row) {
+            let name = '';
+            if (row &&
                     row.overlapSectionList &&
                     row.overlapSectionList &&
                     row.overlapSectionList.length > 0) {
 
-				const protect = row.overlapSectionList[0];
-				name = `${protect.name}`;
-				const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
-				if (station) {
-					name = `${name}(${station.name})`;
-				}
-			}
-			return name;
-		},
-		doShow(operate, selected, tempData) {
-			this.selected = selected;
-			// 如果不是断点激活，而是第一次显示，则需要设置初始值
-			if (!this.dialogShow) {
-				this.signalName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-					this.signalName = selected.name;
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
+                const protect = row.overlapSectionList[0];
+                name = `${protect.name}`;
+                const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
+                if (station) {
+                    name = `${name}(${station.name})`;
+                }
+            }
+            return name;
+        },
+        doShow(operate, selected, tempData) {
+            this.selected = selected;
+            // 如果不是断点激活，而是第一次显示，则需要设置初始值
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
 
-				this.tempData = tempData || [];
-				this.operation = operate.operation;
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		passWordCommit(data) {
-			const operate = {
-				send: true,
-				type: data.type,
-				operation: data.operateNext
-			};
+                this.tempData = tempData || [];
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        passWordCommit(data) {
+            const operate = {
+                over: true,
+                operation: data.operateNext,
+                cmdType: data.cmdType,
+                val: data.val,
+                param: data.param
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$refs.table.setCurrentRow();
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		clickEvent(row, event, column) {
-			if (row) {
-				const operate = {
-					repeat: true,
-					type: MapDeviceType.Signal.type,
-					operation: OperationEvent.Signal.guide.choose.operation,
-					val: row.code,
-					selection: row
-				};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$refs.table.setCurrentRow();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        clickEvent(row, event, column) {
+            this.computedCommitDisabled(row);
+            this.row = row;
+            if (row) {
+                const operate = {
+                    operation: OperationEvent.Signal.guide.choose.operation
+                };
 
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}
-				});
-			}
-		},
-		// 办理引导进路
-		commit() {
-			if (this.row && this.row.canSetting) {
-				const operate = {
-					type: MapDeviceType.Signal.type,
-					operation: OperationEvent.Signal.guide.menu.operation,
-					operateNext: OperationEvent.Signal.guide.confirm.operation
-				};
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            }
+        },
+        // 办理引导进路
+        commit() {
+            if (this.row && this.row.canSetting) {
+                const operate = {
+                    operation: OperationEvent.Signal.guide.menu.operation,
+                    operateNext: OperationEvent.Signal.guide.confirm.operation
+                };
 
-				this.loading = true;
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					this.loading = false;
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						this.$refs.passwordBox.doShow(operate);
-					} else {
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					}
-				}).catch(() => {
-					this.loading = false;
-					this.doClose();
-					this.$refs.noticeInfo.doShow(operate);
-				});
-			}
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+                this.loading = true;
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        operate.cmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
+                        operate.val = this.row.code;
+                        operate.param = {
+                            Route_Code: this.row.code
+                        };
+                        this.$refs.passwordBox.doShow(operate);
+                    } else {
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            }
+        },
+        cancel() {
+            const operate = {
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        computedCommitDisabled(row) {
+            this.commitDisabled = !row.canSetting;
+        }
+    }
 };
 </script>
 <style scoped>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
index 1d0b730c5..d0ba6168a 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
@@ -53,233 +53,233 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'RouteHandControl',
-	components: {
-		ConfirmControl,
-		NoticeInfo
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			tempData: [],
-			operation: null,
-			selection: [],
-			stationName: '',
-			signalName: '',
-			allSelect: false,
-			highlight: true
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'signalList'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdChoose() {
-			if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				return OperationEvent.Signal.humanControl.choose.domId;
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				return OperationEvent.Signal.atsAutoControl.choose.domId;
-			}
-			return '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				return '进路交人工控';
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				return '进路交自动控';
-			}
-			return '';
-		},
-		commitDisabled() {
-			let disabled = true;
-			if (this.selection && this.selection.length) {
-				disabled = false;
-			}
+    name: 'RouteHandControl',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            tempData: [],
+            operation: null,
+            selection: [],
+            stationName: '',
+            signalName: '',
+            allSelect: false,
+            highlight: true,
+            row: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                return OperationEvent.Signal.humanControl.choose.domId;
+            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                return OperationEvent.Signal.atsAutoControl.choose.domId;
+            }
+            return '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                return '进路交人工控';
+            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                return '进路交自动控';
+            }
+            return '';
+        },
+        commitDisabled() {
+            let disabled = true;
+            if (this.selection && this.selection.length) {
+                disabled = false;
+            }
 
-			return disabled;
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected, tempData) {
-			this.selected = selected;
-			// 如果不是断点激活，而是第一次显示则初始化
-			if (!this.dialogShow) {
-				this.signalName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-					this.signalName = selected.name;
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
+            return disabled;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempData) {
+            this.selected = selected;
+            // 如果不是断点激活，而是第一次显示则初始化
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
 
-				if (tempData && tempData.length > 0) {
-					tempData.forEach(elem => {
-						elem.check = false;
-						elem.disabled = false;
-						// 设置禁用状态
-						if (operate.operation === OperationEvent.Signal.humanControl.menu.operation && elem.controlType == '01') {
-							elem.disabled = true;
-						} if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation && elem.controlType == '02') {
-							elem.disabled = true;
-						}
-					});
-				}
+                if (tempData && tempData.length > 0) {
+                    tempData.forEach(elem => {
+                        elem.check = false;
+                        elem.disabled = false;
+                        // 设置禁用状态
+                        if (operate.operation === OperationEvent.Signal.humanControl.menu.operation && elem.controlType == '01') {
+                            elem.disabled = true;
+                        } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation && elem.controlType == '02') {
+                            elem.disabled = true;
+                        }
+                    });
+                }
 
-				this.tempData = tempData || [];
-				this.operation = operate.operation;
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$refs.tempTable.setCurrentRow();
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		allSelectChange() {
-			if (this.allSelect) {
-				this.tempData.forEach(item => {
-					if (!item.disabled) {
-						item.check = true;
-					}
-				});
-			} else {
-				this.tempData.forEach(item => {
-					if (!item.disabled) {
-						item.check = false;
-					}
-				});
-			}
-		},
-		// 多个进路code并列
-		serializeCodeListWithSeparator(sep) {
-			const codeList = [];
-			if (this.selection && this.selection.length) {
-				this.selection.forEach(elem => {
-					codeList.push(elem.code);
-				});
-			}
-			return codeList.join(sep);
-		},
-		clickEvent(row, event, column) {
-			this.highlight = false;
-			if (row && !row.disabled) {
-				this.highlight = true;
-				this.selection = [row];
-				this.beforeSectionList = row.containSectionList || [];
+                this.tempData = tempData || [];
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$refs.tempTable.setCurrentRow();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        allSelectChange() {
+            if (this.allSelect) {
+                this.tempData.forEach(item => {
+                    if (!item.disabled) {
+                        item.check = true;
+                    }
+                });
+            } else {
+                this.tempData.forEach(item => {
+                    if (!item.disabled) {
+                        item.check = false;
+                    }
+                });
+            }
+        },
 
-				// 设置选中指令
-				const operate = {
-					repeat: true,
-					type: MapDeviceType.Signal.type,
-					operation: '',
-					val: row.code,
-					selection: row
-				};
-				if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-					/** 进路交人工控*/
-					operate.operation = OperationEvent.Signal.humanControl.choose.operation;
-				} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-					/** 进路交自动控*/
-					operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
-				}
+        clickEvent(row, event, column) {
+            this.highlight = false;
+            if (row && !row.disabled) {
+                this.highlight = true;
+                this.selection = [row];
+                this.beforeSectionList = row.containSectionList || [];
+                this.row = row;
+                // 设置选中指令
+                const operate = {
+                    operation: ''
+                };
+                if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                    /** 进路交人工控*/
+                    operate.operation = OperationEvent.Signal.humanControl.choose.operation;
+                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    /** 进路交自动控*/
+                    operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
+                }
 
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}
-				});
-			}
-		},
-		commit() {
-			if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				/** 进路交人工控*/
-				this.humanControl();
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				/** 进路交自动控*/
-				this.atsAutoControl();
-			}
-		},
-		// 进路交人工控
-		humanControl() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.humanControl.menu.operation
-			};
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            }
+        },
+        commit() {
+            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                /** 进路交人工控*/
+                this.humanControl();
+            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                /** 进路交自动控*/
+                this.atsAutoControl();
+            }
+        },
+        // 进路交人工控
+        humanControl() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                val: this.row.code,
+                param: {
+                    Route_Code: this.row.code
+                }
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 进路交自动控
-		atsAutoControl() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.atsAutoControl.menu.operation
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 进路交自动控
+        atsAutoControl() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                val: this.row.code,
+                param: {
+                    Route_Code: this.row.code
+                }
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => { this.doClose(); });
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
index 549952d84..136265e24 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
@@ -61,190 +61,194 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'RouteSelection',
-	components: {
-		NoticeInfo
-	},
-	data() {
-		return {
-			tempData: [],
-			beforeSectionList: [],
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			row: null,
-			operation: '',
-			display: true,
-			stationName: '',
-			signalName: '',
-			tableStyle: {
-				'border-bottom': 'none'
-			},
-			controlTypeNameMap: {
-				'01': '折返',
-				'02': '直通'
-			}
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdChoose() {
-			return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
-		},
-		title() {
-			return '办理进路';
-		},
-		commitDisabled() {
-			let disabled = true;
-			if (this.row) {
-				disabled = !this.row.canSetting;
-			}
-			return disabled;
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		getProtectedSectionName(row) {
-			let name = '';
-			if (row &&
+    name: 'RouteSelection',
+    components: {
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            tempData: [],
+            beforeSectionList: [],
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            row: null,
+            operation: '',
+            display: true,
+            stationName: '',
+            signalName: '',
+            tableStyle: {
+                'border-bottom': 'none'
+            },
+            controlTypeNameMap: {
+                '01': '折返',
+                '02': '直通'
+            }
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+        },
+        title() {
+            return '办理进路';
+        },
+        commitDisabled() {
+            let disabled = true;
+            if (this.row) {
+                disabled = !this.row.canSetting;
+            }
+            return disabled;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        getProtectedSectionName(row) {
+            let name = '';
+            if (row &&
                     row.overlapSectionList &&
                     row.overlapSectionList &&
                     row.overlapSectionList.length > 0) {
 
-				const protect = row.overlapSectionList[0];
-				name = `${protect.name}`;
-				const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
-				if (station) {
-					name = `${name}(${station.name})`;
-				}
-			}
-			return name;
-		},
-		doShow(operate, selected, tempData) {
-			this.selected = selected;
-			// 如果不是断点激活，而是第一次显示，则需要设置初始值
-			if (!this.dialogShow) {
-				this.signalName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-					this.signalName = selected.name;
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
+                const protect = row.overlapSectionList[0];
+                name = `${protect.name}`;
+                const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
+                if (station) {
+                    name = `${name}(${station.name})`;
+                }
+            }
+            return name;
+        },
+        doShow(operate, selected, tempData) {
+            this.selected = selected;
+            // 如果不是断点激活，而是第一次显示，则需要设置初始值
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
 
-				this.tempData = tempData || [];
-				this.operation = operate.operation;
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.restoreBeforeDevices();
-			this.$refs.table.setCurrentRow();
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		restoreBeforeDevices() {
-			// 恢复之前选中设备
-			if (this.beforeSectionList && this.beforeSectionList.length) {
-				this.beforeSectionList.forEach(elem => {
-					elem.cutOff = false;
-				});
-			}
+                this.tempData = tempData || [];
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.restoreBeforeDevices();
+            this.$refs.table.setCurrentRow();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        restoreBeforeDevices() {
+            // 恢复之前选中设备
+            if (this.beforeSectionList && this.beforeSectionList.length) {
+                this.beforeSectionList.forEach(elem => {
+                    elem.cutOff = false;
+                });
+            }
 
-			this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
-			this.beforeSectionList = [];
-		},
-		clickEvent(row, event, column) {
-			this.row = row;
-			if (row) {
-				// 恢复进路区段的切除状态
-				this.restoreBeforeDevices();
-				row.canSetting = true;
-				// 设置选中区段为切除状态
-				if (row.containSectionList && row.containSectionList.length) {
-					// 设置新选的进路区段为切除状态
-					row.containSectionList.forEach(elem => {
-						elem.cutOff = true;
-					});
-				}
+            this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
+            this.beforeSectionList = [];
+        },
+        clickEvent(row, event, column) {
+            this.row = row;
+            if (row) {
+                // 恢复进路区段的切除状态
+                this.restoreBeforeDevices();
+                row.canSetting = true;
+                // 设置选中区段为切除状态
+                if (row.containSectionList && row.containSectionList.length) {
+                    // 设置新选的进路区段为切除状态
+                    row.containSectionList.forEach(elem => {
+                        elem.cutOff = true;
+                    });
+                }
 
-				this.$store.dispatch('training/updateMapState', [...row.containSectionList]);
-				this.beforeSectionList = row.containSectionList || [];
+                this.$store.dispatch('training/updateMapState', [...row.containSectionList]);
+                this.beforeSectionList = row.containSectionList || [];
 
-				// 设置选中指令
-				const operate = {
-					type: MapDeviceType.Signal.type,
-					operation: OperationEvent.Signal.arrangementRoute.choose.operation,
-					val: row.code
-				};
+                // 设置选中指令
+                const operate = {
+                    operation: OperationEvent.Signal.arrangementRoute.choose.operation
+                };
 
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}
-				});
-			}
-		},
-		commit() {
-			if (this.row && this.row.canSetting) {
-				const operate = {
-					send: true,
-					type: MapDeviceType.Signal.type,
-					operation: OperationEvent.Signal.arrangementRoute.menu.operation
-				};
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            }
+        },
+        commit() {
+            if (this.row && this.row.canSetting) {
+                const operate = {
+                    over: true,
+                    operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    val: this.row.code,
+                    param: {
+                        Route_Code: this.row.code
+                    }
+                };
 
-				this.loading = true;
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					this.loading = false;
-					if (valid) {
-						this.doClose();
-					}
-				}).catch(() => {
-					this.loading = false;
-					this.doClose();
-					this.$refs.noticeInfo.doShow(operate);
-				});
-			}
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+                this.loading = true;
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            }
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
 <style scoped>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionControl.vue
index ddf690e1e..3cb5fde7a 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionControl.vue
@@ -32,214 +32,136 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import PasswordBox from './childDialog/passwordInputBox';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'SectionControl',
-	components: {
-		NoticeInfo,
-		PasswordBox
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			operation: '',
-			stationName: '',
-			sectionName: ''
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.Section.lock.menu.operation) {
-				return '区段封锁';
-			} else if (this.operation == OperationEvent.Section.split.menu.operation) {
-				return '区段控制';
-			} else if (this.operation == OperationEvent.Section.active.menu.operation) {
-				return '区段控制';
-			} else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-				return '区故解';
-			}
-			return '';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected) {
-			this.selected = selected;
-			if (!this.dialogShow) {
-				this.sectionName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-					if (selected.type === '02') {
-						const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-						if (section) {
-							this.sectionName += section.name;
-						}
-					}
-					this.sectionName += selected.name;
+    name: 'SectionControl',
+    components: {
+        NoticeInfo,
+        PasswordBox
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: '',
+            stationName: '',
+            sectionName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                return '区故解';
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.sectionName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                    if (selected.type === '02') {
+                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                        if (section) {
+                            this.sectionName += section.name;
+                        }
+                    }
+                    this.sectionName += selected.name;
 
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
-				this.operation = operate.operation || '';
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		commit() {
-			if (this.operation == OperationEvent.Section.lock.menu.operation) {
-				/** 区段封锁*/
-				this.lock();
-			} else if (this.operation == OperationEvent.Section.split.menu.operation) {
-				/** 轨道区段切除*/
-				this.split();
-			} else if (this.operation == OperationEvent.Section.active.menu.operation) {
-				/** 轨道区段激活*/
-				this.active();
-			} else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-				/** 区故解*/
-				this.fault();
-			}
-		},
-		passWordCommit(data) {
-			const operate = {
-				send: true,
-				type: data.type,
-				operation: data.operateNext
-			};
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.operation = operate.operation || '';
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区故解*/
+                this.fault();
+            }
+        },
+        passWordCommit(data) {
+            const operate = {
+                over: true,
+                operation: data.operateNext,
+                cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔单锁
-		lock() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Section.lock.menu.operation
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 区故解
+        fault() {
+            const operate = {
+                operation: OperationEvent.Section.fault.menu.operation,
+                operateNext: OperationEvent.Section.fault.confirm.operation
+            };
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 轨道区段切除
-		split() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Section.split.menu.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 轨道区段激活
-		active() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Section.active.menu.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 区故解
-		fault() {
-			const operate = {
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Section.fault.menu.operation,
-				operateNext: OperationEvent.Section.fault.confirm.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.passwordBox.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
index 21c0c7e13..32afee0f2 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
@@ -1,115 +1,121 @@
 <template>
-    <div>
-        <el-dialog class="chengdou-03__systerm section-detail" :title="title" :visible.sync="show" width="320px"
-            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-            <el-form ref="form" label-position="left" :model="formModel" label-width="100px">
-                <el-form-item label="区段名称">
-                    <el-input v-model="formModel.sectionName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="车站名称">
-                    <el-input v-model="formModel.stationName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="公里标(Km)">
-                    <el-input v-model="formModel.kmPost" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="长度(Km)">
-                    <el-input v-model="formModel.factLength" disabled></el-input>
-                </el-form-item>
-            </el-form>
-            <el-row justify="center" style="margin-top: 50px">
-                <el-col :span="7" :offset="17">
-                    <el-button :id="domIdConfirm" @click="commit">确定</el-button>
-                </el-col>
-            </el-row>
-            <notice-info ref="noticeInfo"></notice-info>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="chengdou-03__systerm section-detail"
+      :title="title"
+      :visible.sync="show"
+      width="320px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" label-position="left" :model="formModel" label-width="100px">
+        <el-form-item label="区段名称">
+          <el-input v-model="formModel.sectionName" disabled />
+        </el-form-item>
+        <el-form-item label="车站名称">
+          <el-input v-model="formModel.stationName" disabled />
+        </el-form-item>
+        <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>
+      </el-form>
+      <el-row justify="center" style="margin-top: 50px">
+        <el-col :span="7" :offset="17">
+          <el-button :id="domIdConfirm" @click="commit">确定</el-button>
+        </el-col>
+      </el-row>
+      <notice-info ref="noticeInfo" />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'RouteDetail',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                selected: null,
-                formModel: {
-                    sectionName: '',
-                    stationName: '',
-                    kmPost: '',
-                    factLength: '',
-                },
+export default {
+    name: 'RouteDetail',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            formModel: {
+                sectionName: '',
+                stationName: '',
+                kmPost: '',
+                factLength: ''
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'signalList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Section.detail.menu.domId : '';
-            },
-            title() {
-                return '无岔区段属性对话框'
-            }
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Section.detail.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是因为断点激活则需要，初始化菜单初始值
-                if (!this.dialogShow) {
-                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                        this.formModel.sectionName = selected.name;
-                        this.formModel.factLength = '';
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.formModel.stationName = station.name;
-                            this.formModel.kmPost = station.kmPost;
-                        }
+        title() {
+            return '无岔区段属性对话框';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是因为断点激活则需要，初始化菜单初始值
+            if (!this.dialogShow) {
+                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                    this.formModel.sectionName = selected.name;
+                    this.formModel.factLength = '';
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.formModel.stationName = station.name;
+                        this.formModel.kmPost = station.kmPost;
                     }
                 }
+            }
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Section.detail.menu.operation,
-                }
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                operation: OperationEvent.Section.detail.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
                     this.doClose();
-                });
-            }
+                }
+            }).catch(error => {
+                this.doClose();
+            });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
index 2c4e47ce4..456b76358 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
@@ -241,482 +241,491 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'StandDetainTrain',
-	components: {
-		NoticeInfo
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			standName: '',
-			stationName: '',
-			selected: null,
-			operation: null,
-			radio: '01',
-			radio1: '1',
-			radio2: '1',
-			DetainTrain: false,
-			JumpStop: false,
-			RunLevel: false,
-			trainList: [],
-			runLevelList: [
-				{ value: '01', label: '常速' },
-				{ value: '02', label: '低速' },
-				{ value: '03', label: '高速' }
-			],
-			tripNumber: '',
-			effective: '01',
-			trainStopTime: 0,
-			trainRunlevel: '01'
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'map'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-		},
-		domIdDetainCar() {
-			return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
-		},
-		domIdChoose() {
-			if (this.radio1 == '1') { // 跳停
-				return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
-			} else { // 取消跳停
-				return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.select.domId : '';
-			}
-		},
-		domIdJumpStop() {
-			return this.dialogShow ? OperationEvent.StationStand.setJumpStop.choose.domId : '';
-		},
-		domIdCancelJumpStop() {
-			return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.choose.domId : '';
-		},
-		domIdChoose1() {
-			if (this.radio2 == '1') { // 设置停站时间
-				return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
-			} else { // 设置站间运行等级
-				return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose1.domId : '';
-			}
-		},
-		domIdChoose2() {
-			if (this.radio2 == '1') { // 设置停站时间
-				return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
-			} else { // 设置站间运行等级
-				return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose2.domId : '';
-			}
-		},
-		domIdStopTime() {
-			return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
-		},
-		domIdRunLevel() {
-			return this.dialogShow ? OperationEvent.StationStand.setRunLevel.chooseTrain.domId : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-				return '扣车';
-			} else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-				return '取消扣车';
-			} else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-				return '设置跳停';
-			} else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-				return '取消跳停';
-			} else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
-				return '设置停站时间';
-			} else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
-				return '设置站间运行等级';
-			}
-			return '';
-		}
-	},
-	watch: {
-		operation(data) {
-			this.JumpStop = false;
-			this.RunLevel = false;
-			this.DetainTrain = false;
-			this.radio = '01';
-			this.radio1 = '1';
-			this.radio2 = '1';
-			this.trainStopTime = 0;
-			this.effective = '01';
-			if (data == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-				this.radio1 = '1';
-				this.radio = '01';
-				this.DetainTrain = true;
-			} else if (data == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-				this.radio1 = '2';
-				this.radio = '01';
-				this.DetainTrain = true;
-			} else if (data == OperationEvent.StationStand.setJumpStop.menu.operation) {
-				this.JumpStop = true;
-				this.radio1 = '1';
-			} else if (data == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-				this.JumpStop = true;
-				this.radio1 = '2';
-			} else if (data == OperationEvent.StationStand.setStopTime.menu.operation) {
-				this.RunLevel = true;
-				this.radio2 = '1';
-			} else if (data == OperationEvent.StationStand.setRunLevel.menu.operation) {
-				this.RunLevel = true;
-				this.radio2 = '2';
-			}
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected, tempDate = null) {
-			this.selected = selected;
-			if (!this.dialogShow) {
-				this.tripNumber = '';
-				this.standName = '';
-				this.stationName = '';
-				if (selected) {
-					this.standName = selected.direction == '01' ? '下行' : '上行';
-				}
-				if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-					this.standName = selected.direction == '01' ? '下行' : '上行';
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
-				if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation || this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-					this.radio = selected.direction;
-				} else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
-					this.trainStopTime = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
-					this.radio = Number(tempDate.parkingTime) === -1 ? '01' : '02';
-					this.effective = tempDate.parkingValidStatus ? '01' : '02';
-				}
-				this.operation = operate.operation;
-				this.trainList = this.map.trainList; // 加载列车数据
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			this.operation = '';
-			mouseCancelState(this.selected);
-		},
-		choose(upDown) {
-			// 取消扣车 请求code码
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
-				val: `${upDown}`
-			};
+    name: 'StandDetainTrain',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            standName: '',
+            stationName: '',
+            selected: null,
+            operation: null,
+            radio: '01',
+            radio1: '1',
+            radio2: '1',
+            DetainTrain: false,
+            JumpStop: false,
+            RunLevel: false,
+            trainList: [],
+            runLevelList: [
+                { value: '01', label: '常速' },
+                { value: '02', label: '低速' },
+                { value: '03', label: '高速' }
+            ],
+            tripNumber: '',
+            effective: '01',
+            trainStopTime: 0,
+            trainRunlevel: '01'
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        domIdDetainCar() {
+            return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
+        },
+        domIdChoose() {
+            if (this.radio1 == '1') { // 跳停
+                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
+            } else { // 取消跳停
+                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.select.domId : '';
+            }
+        },
+        domIdJumpStop() {
+            return this.dialogShow ? OperationEvent.StationStand.setJumpStop.choose.domId : '';
+        },
+        domIdCancelJumpStop() {
+            return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.choose.domId : '';
+        },
+        domIdChoose1() {
+            if (this.radio2 == '1') { // 设置停站时间
+                return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
+            } else { // 设置站间运行等级
+                return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose1.domId : '';
+            }
+        },
+        domIdChoose2() {
+            if (this.radio2 == '1') { // 设置停站时间
+                return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
+            } else { // 设置站间运行等级
+                return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose2.domId : '';
+            }
+        },
+        domIdStopTime() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
+        },
+        domIdRunLevel() {
+            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.chooseTrain.domId : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                return '扣车';
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                return '取消扣车';
+            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                return '设置跳停';
+            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                return '取消跳停';
+            } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
+                return '设置停站时间';
+            } else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
+                return '设置站间运行等级';
+            }
+            return '';
+        }
+    },
+    watch: {
+        operation(data) {
+            this.JumpStop = false;
+            this.RunLevel = false;
+            this.DetainTrain = false;
+            this.radio = '01';
+            this.radio1 = '1';
+            this.radio2 = '1';
+            this.trainStopTime = 0;
+            this.effective = '01';
+            if (data == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                this.radio1 = '1';
+                this.radio = '01';
+                this.DetainTrain = true;
+            } else if (data == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                this.radio1 = '2';
+                this.radio = '01';
+                this.DetainTrain = true;
+            } else if (data == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                this.JumpStop = true;
+                this.radio1 = '1';
+            } else if (data == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                this.JumpStop = true;
+                this.radio1 = '2';
+            } else if (data == OperationEvent.StationStand.setStopTime.menu.operation) {
+                this.RunLevel = true;
+                this.radio2 = '1';
+            } else if (data == OperationEvent.StationStand.setRunLevel.menu.operation) {
+                this.RunLevel = true;
+                this.radio2 = '2';
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempDate = null) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.tripNumber = '';
+                this.standName = '';
+                this.stationName = '';
+                if (selected) {
+                    this.standName = selected.direction == '01' ? '下行' : '上行';
+                }
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.direction == '01' ? '下行' : '上行';
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation || this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                    this.radio = selected.direction;
+                } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
+                    this.trainStopTime = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
+                    this.radio = Number(tempDate.parkingTime) === -1 ? '01' : '02';
+                    this.effective = tempDate.parkingValidStatus ? '01' : '02';
+                }
+                this.operation = operate.operation;
+                this.trainList = this.map.trainList; // 加载列车数据
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.operation = '';
+        },
+        choose(upDown) {
+            // 取消扣车 请求code码
+            console.log(upDown, this.radio);
+            const operate = {
+                operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		handleTrainNoBlur() { // 设置跳停 填写车组号
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
-				val: `${this.tripNumber}`
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        handleTrainNoBlur() { // 设置跳停 填写车组号
+            const operate = {
+                operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		trainNoSelectChange(upDown) { // 取消跳停 选择车组号
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
-				val: `${upDown}`
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainNoSelectChange(upDown) { // 取消跳停 选择车组号
+            const operate = {
+                operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		chooseJumpStop(upDown) {
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: '',
-				val: `${upDown}`
-			};
-			if (this.radio1 == '1') { // 跳停选择
-				operate.operation = OperationEvent.StationStand.setJumpStop.select.operation;
-			} else { // 取消跳停选择
-				operate.operation = OperationEvent.StationStand.cancelJumpStop.select.operation;
-			}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        chooseJumpStop(upDown) {
+            const operate = {
+                operation: ''
+            };
+            if (this.radio1 == '1') { // 跳停选择
+                operate.operation = OperationEvent.StationStand.setJumpStop.select.operation;
+            } else { // 取消跳停选择
+                operate.operation = OperationEvent.StationStand.cancelJumpStop.select.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		chooseEffective(effective) {
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: '',
-				val: `${effective}`
-			};
-			if (this.radio2 == '1') { // 设置停站时间
-				operate.operation = OperationEvent.StationStand.setStopTime.choose2.operation;
-			} else { // 设置站间运行等级
-				operate.operation = OperationEvent.StationStand.setRunLevel.choose2.operation;
-			}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        chooseEffective(effective) {
+            const operate = {
+                operation: ''
+            };
+            if (this.radio2 == '1') { // 设置停站时间
+                operate.operation = OperationEvent.StationStand.setStopTime.choose2.operation;
+            } else { // 设置站间运行等级
+                operate.operation = OperationEvent.StationStand.setRunLevel.choose2.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		chooseStopTime(upDown) {
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: '',
-				val: `${upDown}`
-			};
-			if (this.radio2 == '1') { // 设置停站时间
-				operate.operation = OperationEvent.StationStand.setStopTime.choose1.operation;
-			} else { // 设置站间运行等级
-				operate.operation = OperationEvent.StationStand.setRunLevel.choose1.operation;
-			}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        chooseStopTime(upDown) {
+            const operate = {
+                operation: ''
+            };
+            if (this.radio2 == '1') { // 设置停站时间
+                operate.operation = OperationEvent.StationStand.setStopTime.choose1.operation;
+            } else { // 设置站间运行等级
+                operate.operation = OperationEvent.StationStand.setRunLevel.choose1.operation;
+            }
+            if (this.radio === '01') {
+                this.trainStopTime = 0;
+                this.trainRunlevel = '01';
+            }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        stopTimeBlur() {
+            const operate = {
+                operation: OperationEvent.StationStand.setStopTime.input.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		stopTimeBlur() {
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.setStopTime.input.operation,
-				val: `${this.trainStopTime}`
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainNoSelectLevel(upDown) {
+            const operate = {
+                operation: OperationEvent.StationStand.setRunLevel.chooseTrain.operation,
+                val: `${upDown}`,
+                param: {
+                    Stand_RunLevel: `${upDown}`
+                }
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		trainNoSelectLevel(upDown) {
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.setRunLevel.chooseTrain.operation,
-				val: `${upDown}`
-			};
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                this.setDetainTrain(); /** 设置扣车*/
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                this.cancelDetainTrain(); /** 取消扣车*/
+            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                this.setJumpStop(); /** 设置跳停*/
+            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                this.cancelJumpStop(); /** 取消跳停*/
+            } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
+                this.setStopTime(); /** 设置停站时间*/
+            } else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
+                this.setRunLevel(); /** 设置站间运行等级*/
+            }
+        },
+        // 设置扣车
+        setDetainTrain() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		commit() {
-			if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-				this.setDetainTrain(); /** 设置扣车*/
-			} else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-				this.cancelDetainTrain(); /** 取消扣车*/
-			} else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-				this.setJumpStop(); /** 设置跳停*/
-			} else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-				this.cancelJumpStop(); /** 取消跳停*/
-			} else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
-				this.setStopTime(); /** 设置停站时间*/
-			} else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
-				this.setRunLevel(); /** 设置站间运行等级*/
-			}
-		},
-		// 设置扣车
-		setDetainTrain() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.setDetainTrain.menu.operation
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                val: `${this.radio}`,
+                param: {
+                    Stand_AllLine: `${this.radio}`
+                }
+            };
+            if (this.radio == '02') {
+                operate.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
+                operate['val'] = '02';
+            } else if (this.radio == '03') {
+                operate.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
+                operate['val'] = '01';
+            }
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				this.doClose();
-				if (!valid) {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消扣车
-		cancelDetainTrain() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
-			};
-			if (this.radio == '02') {
-				operate.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
-				operate['val'] = '02';
-			} else if (this.radio == '03') {
-				operate.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
-				operate['val'] = '01';
-			}
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置跳停
+        setJumpStop() {
+            let val = this.radio;
+            if (this.radio == '02') {
+                val = this.radio + '::' + this.tripNumber;
+            }
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                val: val,
+                param: {
+                    Stand_JumpStop_Range: `${this.radio}`,
+                    Train_GroupNo: `${this.tripNumber}`
+                }
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				this.doClose();
-				if (!valid) {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置跳停
-		setJumpStop() {
-			let val = this.radio;
-			if (this.radio == '02') {
-				val = this.radio + '::' + this.tripNumber;
-			}
-			const operate = {
-				send: true,
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-				val: val
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                val: this.radio + '::' + this.tripNumber,
+                param: {
+                    Stand_JumpStop_Range: `${this.radio}`,
+                    Train_GroupNo: `${this.tripNumber}`
+                }
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消跳停
-		cancelJumpStop() {
-			let val = this.radio;
-			if (this.radio == '02') {
-				val = this.radio + '::' + this.tripNumber;
-			}
-			const operate = {
-				send: true,
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-				val: val // 站台的上下行方向, 01:下行 /02:上行
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置停站时间
+        setStopTime() {
+            const forver = this.effective == '02';
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                val: [`${this.radio}`, this.trainStopTime, forver].join('::'),
+                param: {
+                    Stand_StopControl: `${this.radio}`,
+                    Stand_StopTime: this.trainStopTime,
+                    Stand_AlwaysValid: forver
+                }
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置停站时间
-		setStopTime() {
-			const forver = this.effective == '02';
-			const operate = {
-				send: true,
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.setStopTime.menu.operation,
-				val: [`${this.radio}`, this.trainStopTime, forver].join('::')
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        // 设置运行速度
+        setRunLevel() {
+            const forver = this.effective == '02';
+            let val = this.radio;
+            if (this.radio == '02') {
+                val = `${this.radio}::${this.trainRunlevel}::${forver}`;
+            } else {
+                val = `${this.radio}::01::${forver}`;
+            }
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                val: val,
+                param: {
+                    Stand_StopControl: `${this.radio}`,
+                    Stand_RunLevel: this.radio === '02' ? `${this.trainRunlevel}` : '01',
+                    Stand_AlwaysValid: `${forver}`
+                }
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-			});
-		},
-		// 设置运行速度
-		setRunLevel() {
-			const forver = this.effective == '02';
-			let val = this.radio;
-			if (this.radio == '02') {
-				val = `${this.radio}::${this.trainRunlevel}::${forver}`;
-			} else {
-				val = `${this.radio}::01::${forver}`;
-			}
-			const operate = {
-				send: true,
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.StationStand.setRunLevel.menu.operation,
-				val: val
-			};
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.StationStand.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
-
-			this.loading = false;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.loading = false;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
 <style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
index f5656c12b..d0ac2ed7e 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
@@ -64,148 +64,151 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
-    export default {
-        name: 'StandDetail',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                tempData: [],
-                stationName: '',
-                standName: '',
-                strategyMap: {
-                    '01': '无折返',
-                    '02': '无人折返',
-                    '03': '自动换端',
-                    '04': '默认'
-                },
-                modelData: {
-                    stopTime: '自动',
-                    runLevel: '自动',
-                    detainCar: '无扣车',
-                    jumpStop: '无跳停',
-                },
+export default {
+    name: 'StandDetail',
+    components: {
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            stationName: '',
+            standName: '',
+            strategyMap: {
+                '01': '无折返',
+                '02': '无人折返',
+                '03': '自动换端',
+                '04': '默认'
+            },
+            modelData: {
+                stopTime: '自动',
+                runLevel: '自动',
+                detainCar: '无扣车',
+                jumpStop: '无跳停'
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationList',
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '站台信息';
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            loadInitData(selected, opts) {
-                this.tempData = [];
+        title() {
+            return '站台信息';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(selected, opts) {
+            this.tempData = [];
 
-                let stationList = this.stationList.slice();
-                let index = this.stationList.findIndex(n => n.code == selected.stationCode);
-                let stationStand, station;
-                if (selected.direction == '01') {  // 下行
-                    //下行时，此站不是最后一站
-                    if (index != 0) {
-                        stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index - 1].code);
-                        station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
-                    }
-                } else {
-                    //上行时，此站不是最后一站
-                    if (index != this.stationList.length - 1) {
-                        stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index + 1].code);
-                        station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+            const stationList = this.stationList.slice();
+            const index = this.stationList.findIndex(n => n.code == selected.stationCode);
+            let stationStand, station;
+            if (selected.direction == '01') { // 下行
+                // 下行时，此站不是最后一站
+                if (index != 0) {
+                    stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index - 1].code);
+                    station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+                }
+            } else {
+                // 上行时，此站不是最后一站
+                if (index != this.stationList.length - 1) {
+                    stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index + 1].code);
+                    station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+                }
+            }
+
+            this.modelData = {
+                stopTime: opts.parkingTime != -1 ? opts.parkingTime : '自动',
+                runLevel: opts.intervalRunTime > 0 ? '常速' : '自动',
+                detainCar: opts.holdStatus == '02' || opts.holdStatus == '04' ? '已设置' : '无扣车',
+                jumpStop: opts.jumpStopStatus != '01' ? '已设置' : '无跳停'
+            };
+        },
+        doShow(operate, selected, opts) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.direction == '01' ? '下行' : '上行';
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
                     }
                 }
-
-                this.modelData = {
-                    stopTime: opts.parkingTime != -1 ? opts.parkingTime : '自动',
-                    runLevel: opts.intervalRunTime > 0 ? '常速': '自动',
-                    detainCar: opts.holdStatus == '02' || opts.holdStatus == '04' ? '已设置' : '无扣车',
-                    jumpStop: opts.jumpStopStatus != '01' ? '已设置' : '无跳停',
-                };
-            },
-            doShow(operate, selected, opts) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.standName = '';
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                        this.standName = selected.direction == '01' ? '下行' : '上行';
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.stationName = station.name;
-                        }
-                    }
-                    this.loadInitData(selected, opts);
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+                this.loadInitData(selected, opts);
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.Command.close.confirm.operation,
-                }
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Command.close.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
+            };
 
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(error => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
                     this.doClose();
-                });
-            }
+                }
+            }).catch(error => {
+                this.doClose();
+            });
         }
     }
+};
 </script>
 <style>
     .content {
         margin-top: 20px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/stationCmdControl.vue
deleted file mode 100644
index 4680847c6..000000000
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/stationCmdControl.vue
+++ /dev/null
@@ -1,389 +0,0 @@
-<template>
-    <div>
-        <el-dialog class="chengdou-03__systerm station-cmd-control" :title="title" :visible.sync="show" width="800px"
-            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-            <div style="padding: 10px 20px; border: 1px solid lightgray;">
-                <span class="base-label">命令信息</span>
-                <el-form label-position="center" size="mini">
-                    <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="类型" label-width="40px">
-                                <el-select v-model="operation" size="small" disabled>
-                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
-                                        :value="option.code">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="车站名称" label-width="100px">
-                                <el-input v-model="stationName" size="small" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-            </div>
-            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
-                highlight-current-row height="200">
-                <el-table-column prop="order" :width="50" label="序号">
-                </el-table-column>
-                <el-table-column prop="date" :width="160" label="时间">
-                </el-table-column>
-                <el-table-column prop="context" :width="180" label="执行过程">
-                </el-table-column>
-                <el-table-column prop="result" label="执行结果">
-                </el-table-column>
-            </el-table>
-            <span class="notice">{{message}}</span>
-            <el-row class="button-group">
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
-                            v-show="timeCountCommand>0">({{timeCountCommand}})</span></el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
-                    </el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
-                            v-show="timeCountConfirm>0">({{timeCountConfirm}})</span></el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdClose" @click="close">关闭</el-button>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-<script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { now } from '@/utils/date';
-
-    export default {
-        name: 'StationCmdControl',
-        data() {
-            return {
-                dialogShow: false,
-                backOperate: '',
-                selected: null,
-                order: 0,
-                row: null,
-                timer: null,
-                operation: '',
-                cmdDisabled: [true, true, true],
-                stpDisabled: true,
-                tempData: [],
-                message: '',
-                timeCountCommand: -1,
-                timeCountConfirm: -1,
-                stationName: ''
-            }
-        },
-        computed: {
-            typeList() {
-                return [
-                    { code: OperationEvent.Station.powerUnLock.menu.operation, name: '上电解锁' },
-                    { code: OperationEvent.Station.execKeyOperationTest.menu.operation, name: '执行关键操作测试' }
-                ]
-            },
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCommand() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                        /** 上电解锁*/
-                        return OperationEvent.Station.powerUnLock.order.domId;
-                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                        /** 执行关键操作测试*/
-                        return OperationEvent.Station.execKeyOperationTest.order.domId;
-                    }
-                }
-            },
-            domIdConfirm1() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                        /** 上电解锁*/
-                        return OperationEvent.Station.powerUnLock.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                        /** 执行关键操作测试*/
-                        return OperationEvent.Station.execKeyOperationTest.confirm1.domId;
-                    }
-                }
-            },
-            domIdConfirm2() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                        /** 上电解锁*/
-                        return OperationEvent.Station.powerUnLock.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                        /** 执行关键操作测试*/
-                        return OperationEvent.Station.execKeyOperationTest.confirm2.domId;
-                    }
-                }
-            },
-            domIdStop() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                        /** 上电解锁*/
-                        return OperationEvent.Station.powerUnLock.stop.domId;
-                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                        /** 执行关键操作测试*/
-                        return OperationEvent.Station.execKeyOperationTest.stop.domId;
-                    }
-                }
-            },
-            domIdClose() {
-                if (this.dialogShow) {
-                    return OperationEvent.Command.close.menu.domId;
-                }
-            },
-            title() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                        return '信号解封';
-                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                        return '执行关键操作测试';
-                    }
-                }
-            }
-        },
-        watch: {
-            cmdDisabled: {
-                handler(val, oldVal) {
-                    this.stpDisabled = true;
-                    val.forEach((elem, index) => {
-                        // 在确定1之前的操作才可以终止
-                        if (elem == false && 1 <= index && index <= 2) {
-                            this.stpDisabled = false;
-                        }
-                    });
-                },
-                deep: true
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-            this.timer = setInterval(() => {
-                if (!this.$store.state.menuOperation.break) {
-                    if (this.timeCountCommand > 0) {
-                        this.timeCountCommand--;
-                    } else if (this.timeCountCommand == 0) {
-                        this.setButtonEnable({ step: 0 });
-                        this.timeCountCommand = -1;
-                    }
-                    if (this.timeCountConfirm > 0) {
-                        this.timeCountConfirm--;
-                    } else if (this.timeCountConfirm == 0) {
-                        this.setButtonEnable({ step: 0 });
-                        this.timeCountConfirm = -1;
-                    }
-                }
-            }, 1000)
-        },
-        beforeDestroy() {
-            clearInterval(this.timer);
-            this.timer = null;
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                        this.stationName = selected.name
-                    }
-
-                    this.order = 0;
-                    this.operation = operate.operation;
-                    this.tempData = [];
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.cmdDisabled = [false, true, true];
-                }
-                this.stpDisabled = true;
-                this.dialogShow = true;
-                this.setMessage('请点击“下达”按钮，下达命令！');
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            command() {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation ||
-                    this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 第一步不带弹框处理*/
-                    this.commandNoPopUp();
-                } else {
-                    /** 第一步带弹框处理*/
-                    this.commandHasPopUp();
-                }
-            },
-            commandHasPopUp() {
-            },
-            commandNoPopUp() {
-                let operate = {
-                    type: MapDeviceType.Station.type
-                }
-
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    operate.operation = OperationEvent.Station.powerUnLock.order.operation
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    operate.operation = OperationEvent.Station.execKeyOperationTest.order.operation
-                }
-
-                this.setMessage('请点击“确认1”按钮，确认命令！');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.setButtonEnable({ step: 1 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
-                })
-            },
-            confirm1() {
-                let operate = {
-                    type: MapDeviceType.Station.type,
-                }
-
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    operate.operation = OperationEvent.Station.powerUnLock.confirm1.operation;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    operate.operation = OperationEvent.Station.execKeyOperationTest.confirm1.operation;
-                }
-
-                this.setMessage('请点击“确认2”按钮，确认命令！');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.timeCountCommand = -1;
-                        this.timeCountConfirm = 10;
-                        this.setButtonEnable({ step: 2 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
-                })
-            },
-            confirm2() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Station.type
-                }
-
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
-                }
-
-                this.setMessage('');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.setButtonEnable({ step: -1 });
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.setButtonEnable({ step: -1 });
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
-                })
-            },
-            stop() {
-                let operate = {
-                    type: MapDeviceType.Station.type,
-                }
-
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    operate.operation = OperationEvent.Station.powerUnLock.stop.operation;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    operate.operation = OperationEvent.Station.execKeyOperationTest.stop.operation;
-                }
-
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.setButtonEnable({ step: 0 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
-                    }
-                }).catch(error => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
-                })
-            },
-            close() {
-                let operate = {
-                    type: MapDeviceType.Station.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            },
-            getOperate(operate) {
-                /** 弹框返回值处理*/
-            },
-            setButtonEnable(param) {
-                this.cmdDisabled = [true, true, true];
-                if (param && param.step >= 0) {
-                    this.cmdDisabled[param.step] = false;
-                }
-            },
-            setMessage(message) {
-                this.message = message;
-            },
-            writeRecord(param) {
-                this.tempData.push(param);
-            },
-            editRecord(param) {
-                this.tempData.forEach(elem => {
-                    if (elem.order == param.order) {
-                        for (var prop in param) {
-                            elem[prop] = param[prop];
-                        }
-                    }
-                })
-            }
-        }
-    }
-</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/switchCmdControl.vue
deleted file mode 100644
index ae66d1d28..000000000
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/switchCmdControl.vue
+++ /dev/null
@@ -1,459 +0,0 @@
-<template>
-    <div>
-        <el-dialog class="chengdou-03__systerm switch-cmd-control" :title="title" :visible.sync="show" width="800px"
-            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-            <div style="padding: 10px 20px; border: 1px solid lightgray;">
-                <span class="base-label">命令信息</span>
-                <el-form label-position="center" size="mini">
-                    <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="类型" label-width="40px">
-                                <el-select v-model="operation" size="small" disabled>
-                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
-                                        :value="option.code">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="车站名称" label-width="80px">
-                                <el-input v-model="stationName" size="small" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="道岔名称" label-width="80px">
-                                <el-input v-model="switchName" size="small" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-            </div>
-            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
-                highlight-current-row height="200">
-                <el-table-column prop="order" :width="50" label="序号">
-                </el-table-column>
-                <el-table-column prop="date" :width="160" label="时间">
-                </el-table-column>
-                <el-table-column prop="context" :width="180" label="执行过程">
-                </el-table-column>
-                <el-table-column prop="result" label="执行结果">
-                </el-table-column>
-            </el-table>
-            <span class="notice">{{message}}</span>
-            <el-row class="button-group">
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
-                            v-show="timeCountCommand>0">({{timeCountCommand}})</span></el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
-                    </el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
-                            v-show="timeCountConfirm>0">({{timeCountConfirm}})</span></el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdClose" @click="close">关闭</el-button>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-<script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { now } from '@/utils/date';
-
-    export default {
-        name: 'SwitchCmdControl',
-        data() {
-            return {
-                dialogShow: false,
-                backOperate: '',
-                selected: '',
-                order: 0,
-                row: null,
-                timer: null,
-                operation: '',
-                cmdDisabled: [true, true, true],
-                stpDisabled: true,
-                tempData: [],
-                message: '',
-                timeCountCommand: -1,
-                timeCountConfirm: -1,
-                stationName: '',
-                switchName: ''
-            }
-        },
-        computed: {
-            typeList() {
-                return [
-                    { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔单解' },
-                    { code: OperationEvent.Switch.unblock.menu.operation, name: '道岔解封' },
-                    { code: OperationEvent.Switch.fault.menu.operation, name: '道岔故障解锁' },
-                    { code: OperationEvent.Switch.axlePreReset.menu.operation, name: '道岔计轴预复位' },
-                ]
-            },
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCommand() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                        /** 道岔单解*/
-                        return OperationEvent.Switch.unlock.order.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.order.domId;
-                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                        /** 道岔故障解锁*/
-                        return OperationEvent.Switch.fault.order.domId;
-                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                        /** 道岔计轴复位*/
-                        return OperationEvent.Switch.axlePreReset.order.domId;
-                    }
-                }
-            },
-            domIdConfirm1() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                        /** 道岔单解*/
-                        return OperationEvent.Switch.unlock.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                        /** 道岔故障解锁*/
-                        return OperationEvent.Switch.fault.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                        /** 道岔计轴复位*/
-                        return OperationEvent.Switch.axlePreReset.confirm1.domId;
-                    }
-                }
-            },
-            domIdConfirm2() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                        /** 道岔单解*/
-                        return OperationEvent.Switch.unlock.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                        /** 道岔故障解锁*/
-                        return OperationEvent.Switch.fault.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                        /** 道岔计轴复位*/
-                        return OperationEvent.Switch.axlePreReset.confirm2.domId;
-                    }
-                }
-            },
-            domIdStop() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                        /** 道岔单解*/
-                        return OperationEvent.Switch.unlock.stop.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.stop.domId;
-                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                        /** 道岔故障解锁*/
-                        return OperationEvent.Switch.fault.stop.domId;
-                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                        /** 道岔计轴复位*/
-                        return OperationEvent.Switch.axlePreReset.stop.domId;
-                    }
-                }
-            },
-            domIdClose() {
-                if (this.dialogShow) {
-                    return OperationEvent.Command.close.menu.domId;
-                }
-            },
-            title() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                        return '道岔单解';
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        return '道岔解封';
-                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                        return '道岔故障解锁';
-                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                        return '道岔计轴复位';
-                    }
-                }
-            }
-        },
-        watch: {
-            cmdDisabled: {
-                handler(val, oldVal) {
-                    this.stpDisabled = true;
-                    val.forEach((elem, index) => {
-                        // 在确定1之前的操作才可以终止
-                        if (elem == false && 1 <= index && index <= 2) {
-                            this.stpDisabled = false;
-                        }
-                    });
-                },
-                deep: true
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-            this.timer = setInterval(() => {
-                if (!this.$store.state.menuOperation.break) {
-                    if (this.timeCountCommand > 0) {
-                        this.timeCountCommand--;
-                    } else if (this.timeCountCommand == 0) {
-                        this.setButtonEnable({ step: 0 });
-                        this.timeCountCommand = -1;
-                    }
-                    if (this.timeCountConfirm > 0) {
-                        this.timeCountConfirm--;
-                    } else if (this.timeCountConfirm == 0) {
-                        this.setButtonEnable({ step: 0 });
-                        this.timeCountConfirm = -1;
-                    }
-                }
-            }, 1000)
-        },
-        beforeDestroy() {
-            clearInterval(this.timer);
-            this.timer = null;
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.switchName = '';
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                        this.switchName = selected.name
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.stationName = station.name;
-                        }
-                    }
-
-                    this.order = 0;
-                    this.operation = operate.operation;
-                    this.dialogShow = true;
-                    this.tempData = [];
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.cmdDisabled = [false, true, true];
-                }
-                this.stpDisabled = true;
-                this.setMessage('请点击“下达”按钮，下达命令！');
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            command() {
-                /** 道岔单解/道岔解封/道岔故障解锁/道岔计轴复位*/
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation ||
-                    this.operation == OperationEvent.Switch.unblock.menu.operation ||
-                    this.operation == OperationEvent.Switch.fault.menu.operation ||
-                    this.operation == OperationEvent.Switch.axlePreReset.menu.operation ||
-                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                    /** 第一步不带弹框处理*/
-                    this.commandNoPopUp();
-                } else {
-                    /** 第一步带弹框处理*/
-                    this.commandHasPopUp();
-                }
-            },
-            commandHasPopUp() {
-
-            },
-            commandNoPopUp() {
-                let operate = {
-                    type: MapDeviceType.Switch.type
-                }
-
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    operate.operation = OperationEvent.Switch.unlock.order.operation
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.order.operation
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.order.operation
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    operate.operation = OperationEvent.Switch.axlePreReset.order.operation;
-                }
-
-                this.setMessage('请点击“确认1”按钮，确认命令！');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.setButtonEnable({ step: 1 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
-                })
-            },
-            confirm1() {
-                let operate = {
-                    type: MapDeviceType.Switch.type,
-                }
-
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    operate.operation = OperationEvent.Switch.unlock.confirm1.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.confirm1.operation;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.confirm1.operation
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    operate.operation = OperationEvent.Switch.axlePreReset.confirm1.operation;
-                }
-
-                this.setMessage('请点击“确认2”按钮，确认命令！');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.timeCountCommand = -1;
-                        this.timeCountConfirm = 10;
-                        this.setButtonEnable({ step: 2 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
-                })
-            },
-            confirm2() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Switch.type,
-                }
-
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.confirm2.operation
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-                }
-
-                this.setMessage('');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.setButtonEnable({ step: -1 });
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.setButtonEnable({ step: -1 });
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
-                })
-            },
-            stop() {
-                let operate = {
-                    type: MapDeviceType.Switch.type,
-                }
-
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    operate.operation = OperationEvent.Switch.unlock.stop.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.stop.operation;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.stop.operation
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    operate.operation = OperationEvent.Switch.axlePreReset.stop.operation;
-                }
-
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.setButtonEnable({ step: 0 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
-                    }
-                }).catch(error => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
-                })
-            },
-            close() {
-                let operate = {
-                    type: MapDeviceType.Switch.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            },
-            getOperate(operate) {
-                /** 弹框返回值处理*/
-            },
-            setButtonEnable(param) {
-                this.cmdDisabled = [true, true, true];
-                if (param && param.step >= 0) {
-                    this.cmdDisabled[param.step] = false;
-                }
-            },
-            setMessage(message) {
-                this.message = message;
-            },
-            writeRecord(param) {
-                this.tempData.push(param);
-            },
-            editRecord(param) {
-                this.tempData.forEach(elem => {
-                    if (elem.order == param.order) {
-                        for (var prop in param) {
-                            elem[prop] = param[prop];
-                        }
-                    }
-                })
-            }
-        }
-    }
-</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/switchControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/switchControl.vue
index 911e471b5..1c909ea93 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/switchControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/switchControl.vue
@@ -1,15 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm switch-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="chengdou-03__systerm switch-control" :title="title" :visible.sync="show" width="300px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row class="header">
       <el-col :span="11"><span>车站名称</span></el-col>
       <el-col :span="11" :offset="2"><span>道岔</span></el-col>
@@ -36,341 +26,224 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import PasswordBox from './childDialog/passwordInputBox';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'SwitchControl',
-	components: {
-		NoticeInfo,
-		PasswordBox
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			selected: null,
-			operation: '',
-			stationName: '',
-			switchName: ''
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.Switch.lock.menu.operation) {
-				return '道岔单锁';
-			} else if (this.operation == OperationEvent.Switch.block.menu.operation) {
-				return '道岔封锁';
-			} else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
-				return '道岔转动';
-			} else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
-				return '道岔强扳';
-			} else if (this.operation == OperationEvent.Switch.split.menu.operation) {
-				return '区段切除';
-			} else if (this.operation == OperationEvent.Switch.active.menu.operation) {
-				return '区段激活';
-			} else if (this.operation == OperationEvent.Switch.locate.menu.operation) {
-				return '单操到定位';
-			} else if (this.operation == OperationEvent.Switch.reverse.menu.operation) {
-				return '单操到反位';
-			} else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-				return '区故解';
-			} else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-				return '道岔解锁';
-			} else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-				return '道岔解封';
-			}
-			return '';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected) {
-			this.selected = selected;
-			if (!this.dialogShow) {
-				this.switchName = '';
-				this.stationName = '';
-				if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-					this.switchName = selected.name;
-					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-					if (station) {
-						this.stationName = station.name;
-					}
-				}
-				this.operation = operate.operation;
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		commit() {
-			// debugger;
-			if (this.operation == OperationEvent.Switch.lock.menu.operation) {
-				/** 道岔单锁*/
-				this.lock();
-			} else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-				/* 道岔解锁*/
-				this.unlock();
-			} else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
-				/** 道岔强扳*/
-				this.turnoutForce();
-			} else if (this.operation == OperationEvent.Switch.locate.menu.operation) {
-				/* 单操到正位*/
-				this.locate();
-			} else if (this.operation == OperationEvent.Switch.reverse.menu.operation) {
-				/* 单操到反位*/
-				this.reverse();
-			} else if (this.operation == OperationEvent.Switch.block.menu.operation) {
-				/** 道岔封锁*/
-				this.openPasswordBox(this.operation, OperationEvent.Switch.block.confirm.operation);
-			} else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-				/* 道岔解封*/
-				this.openPasswordBox(this.operation, OperationEvent.Switch.unblock.confirm.operation);
-			} else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-				/* 区故解*/
-				this.openPasswordBox(this.operation, OperationEvent.Switch.fault.confirm.operation);
-			}
-		},
-		passWordCommit(data) {
-			const operate = {
-				send: true,
-				type: data.type,
-				operation: data.operateNext
-			};
+    name: 'SwitchControl',
+    components: {
+        NoticeInfo,
+        PasswordBox
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: '',
+            stationName: '',
+            switchName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Switch.locate.menu.operation) {
+                return '单操到定位';
+            } else if (this.operation == OperationEvent.Switch.reverse.menu.operation) {
+                return '单操到反位';
+            } else if (this.operation == OperationEvent.Switch.lock.menu.operation) {
+                return '道岔单锁';
+            } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                return '道岔解锁';
+            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                return '道岔封锁';
+            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                return '区故解';
+            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                return '道岔解封';
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.switchName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                    this.switchName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Switch.locate.menu.operation) {
+                this.locate(); // 单操到正位
+            } else if (this.operation == OperationEvent.Switch.reverse.menu.operation) {
+                this.reverse(); // 单操到反位
+            } else if (this.operation == OperationEvent.Switch.lock.menu.operation) {
+                this.lock(); // 道岔单锁
+            } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                this.unlock(); // 道岔解锁
+            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                this.openPasswordBox(this.operation, OperationEvent.Switch.block.confirm.operation); // 道岔封锁
+            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                this.openPasswordBox(this.operation, OperationEvent.Switch.unblock.confirm.operation); // 道岔解封
+            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                this.openPasswordBox(this.operation, OperationEvent.Switch.fault.confirm.operation); // 区故解
+            }
+        },
+        passWordCommit(data) { // 密码窗确认
+            if (data.operation === OperationEvent.Switch.fault.menu.operation) {
+                this.fault();
+            } else if (data.operation === OperationEvent.Switch.block.menu.operation) {
+                this.block();
+            } else if (data.operation === OperationEvent.Switch.unblock.menu.operation) {
+                this.unblock();
+            }
+        },
+        // 道岔单锁
+        lock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.lock.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+            };
+            this.sendCommand(operate);
+        },
+        // 道岔解锁
+        unlock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.unlock.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+            };
+            this.sendCommand(operate);
+        },
+        // 道岔封锁
+        block() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.block.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_BLOCK
+            };
+            this.sendCommand(operate);
+        },
+        // 道岔解封
+        unblock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.unblock.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
+            };
+            this.sendCommand(operate);
+        },
+        // 单操到正位
+        locate() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.locate.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_TURN
+            };
+            this.sendCommand(operate);
+        },
+        // 单操到反位
+        reverse() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.reverse.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_TURN
+            };
+            this.sendCommand(operate);
+        },
+        // 区故解
+        fault() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.fault.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
+            };
+            this.sendCommand(operate);
+        },
+        // 打开密码输入框
+        openPasswordBox(operation, operateNext) {
+            const operate = {
+                operation: operation,
+                operateNext: operateNext
+            };
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        sendCommand(operate) { // 发送指令
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔单锁
-		lock() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.lock.menu.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔解锁
-		unlock() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.unlock.menu.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-
-		},
-		// 道岔封锁
-		block() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.block.menu.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔解封
-		unblock() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.unblock.menu.operation
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔强扮
-		turnoutForce() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.turnoutForce.menu.operation
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 单操到正位
-		locate() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.locate.menu.operation
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = true;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 单操到反位
-		reverse() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.reverse.menu.operation
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = true;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 区故解
-		fault() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Switch.fault.menu.operation
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 打开密码输入框
-		openPasswordBox(operation, operateNext) {
-			const operate = {
-				type: MapDeviceType.Switch.type,
-				operation: operation,
-				operateNext: operateNext
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.passwordBox.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 密码输入正确会回调
-		toSwitchControl(operation) {
-			if (operation === OperationEvent.Switch.fault.menu.operation) {
-				this.fault();
-			} else if (operation === OperationEvent.Switch.block.menu.operation) {
-				this.block();
-			} else if (operation === OperationEvent.Switch.unblock.menu.operation) {
-				this.unblock();
-			}
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Switch.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
index e4e95d303..c93791038 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
@@ -96,8 +96,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
@@ -107,6 +107,9 @@ export default {
         ConfirmTrain,
         NoticeInfo
     },
+    mixins: [
+        CancelMouseState
+    ],
     data() {
         return {
             trainList: [],
@@ -226,7 +229,7 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
+            this.mouseCancelState(this.selected);
         },
         commit() {
             if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation ) {
@@ -242,13 +245,13 @@ export default {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.destinationTrainId.menu.operation,
                         message: [`设目的地车：成功`],
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -266,13 +269,13 @@ export default {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.setPlanTrainId.menu.operation,
                         message: [`设计划车：成功`],
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -290,13 +293,13 @@ export default {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.artificialTrainId.menu.operation,
                         message: [`设人工车：成功`],
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -311,11 +314,11 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
index 7f603d961..a0f637cea 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
@@ -32,9 +32,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteCreate',
@@ -86,13 +86,9 @@ export default {
         });
     },
     methods: {
-        loadInitData(map) {
-        },
         doShow(operate, selected) {
             this.dialogShow = true;
             this.selected = selected;
-            /** 加载列车数据*/
-            this.loadInitData(this.map);
 
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
@@ -104,17 +100,16 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
         },
         commit() {
             const operate = {
                 send: true,
-                type: MapDeviceType.Section.type,
                 operation: OperationEvent.Section.newtrain.menu.operation,
+                cmdType: CMD.Section.CMD_NEW_TRAIN,
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -127,11 +122,10 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Section.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
index ccf9241d2..7ea4b6347 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
@@ -55,13 +55,14 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
 export default {
     name: 'TrainCreateNumber',
-    components: {
-    },
+    mixins: [
+        CancelMouseState
+    ],
     data() {
         return {
             trainNoList: [],
@@ -127,19 +128,19 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
+            this.mouseCancelState(this.selected);
         },
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.createTrainNo.menu.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -156,11 +157,11 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
index 109e1c918..29d0c395f 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
@@ -30,9 +30,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
@@ -41,7 +41,10 @@ export default {
 	components: {
 		ConfirmControl,
 		NoticeInfo
-	},
+    },
+    mixins: [
+        CancelMouseState
+    ],
 	data() {
 		return {
 			trainNoList: [],
@@ -115,12 +118,12 @@ export default {
 				if (valid) {
 					const operate = {
 						send: true,
-						type: MapDeviceType.Train.type,
+
 						operation: OperationEvent.Train.delTrainId.menu.operation
 					};
 
 					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 						this.loading = false;
 						if (valid) {
 							this.doClose();
@@ -137,11 +140,11 @@ export default {
 		},
 		cancel() {
 			const operate = {
-				type: MapDeviceType.Train.type,
+
 				operation: OperationEvent.Command.cancel.menu.operation
 			};
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				if (valid) {
 					this.doClose();
 				}
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
index bf186229d..17c1060de 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
@@ -55,13 +55,14 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
 export default {
     name: 'TrainDeleteNumber',
-    components: {
-    },
+    mixins: [
+        CancelMouseState
+    ],
     data() {
         return {
             trainNoList: [],
@@ -122,19 +123,19 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
+            this.mouseCancelState(this.selected);
         },
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.deleteTrainNo.menu.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,11 +152,11 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
index 43efab3d2..83172f4f8 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
@@ -232,13 +232,14 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import CancelMouseState from '@/mixin/CancelMouseState';
 
     export default {
         name: 'TrainDetailInfo',
-        components: {
-        },
+        mixins: [
+            CancelMouseState
+        ],
         data() {
             return {
                 trainNoList: [],
@@ -339,18 +340,18 @@
                 this.dialogShow = false;
                 this.$store.dispatch('training/emitTipFresh');
                 this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
+                this.mouseCancelState(this.selected);
             },
             handleClick() {
 
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
index 57b2d5a64..58014f945 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
@@ -47,13 +47,14 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
 export default {
     name: 'TrainEditNumber',
-    components: {
-    },
+    mixins: [
+        CancelMouseState
+    ],
     data() {
         return {
             trainNoList: [],
@@ -121,19 +122,19 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
+            this.mouseCancelState(this.selected);
         },
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.editTrainNo.menu.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,11 +150,11 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
index 83f886708..a5b016431 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
@@ -57,13 +57,14 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import CancelMouseState from '@/mixin/CancelMouseState';
 
     export default {
         name: 'TrainMove',
-        components: {
-        },
+        mixins: [
+            CancelMouseState
+        ],
         data() {
             return {
                 trainNoList: [],
@@ -136,19 +137,19 @@
                 this.dialogShow = false;
                 this.$store.dispatch('training/emitTipFresh');
                 this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
+                this.mouseCancelState(this.selected);
             },
             commit() {
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Train.moveTrainId.menu.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -165,11 +166,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -187,4 +188,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
index 913491341..950ae8292 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
@@ -69,13 +69,14 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
 export default {
     name: 'TrainMoveNumber',
-    components: {
-    },
+    mixins: [
+        CancelMouseState
+    ],
     data() {
         return {
             trainNoList: [],
@@ -139,19 +140,19 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
+            this.mouseCancelState(this.selected);
         },
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+
                         operation: OperationEvent.Train.moveTrainNo.menu.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -168,11 +169,11 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
index 9299e92d3..061b741a2 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
@@ -58,13 +58,14 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import CancelMouseState from '@/mixin/CancelMouseState';
 
     export default {
         name: 'TrainSwitch',
-        components: {
-        },
+        mixins: [
+            CancelMouseState
+        ],
         data() {
             return {
                 trainNoList: [],
@@ -141,19 +142,19 @@
                 this.dialogShow = false;
                 this.$store.dispatch('training/emitTipFresh');
                 this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
+                this.mouseCancelState(this.selected);
             },
             commit() {
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Train.moveTrainId.menu.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -170,11 +171,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -192,4 +193,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/index.vue b/src/jmapNew/theme/chengdu_03/menus/index.vue
index 67d082909..6c8937b5d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/index.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/index.vue
@@ -37,53 +37,53 @@ import PassiveContorl from './passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
 
 export default {
-	name: 'Menus',
-	components: {
-		MenuBar,
-		MenuButton,
-		MenuCancel,
-		MenuSignal,
-		MenuSwitch,
-		MenuSection,
-		MenuStationControl,
-		MenuStationStand,
-		MenuStation,
-		MenuTrain,
-		PassiveAlarm,
-		PassiveContorl,
-		PassiveTimeout
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	computed: {
-		...mapGetters('config', [
-			'width'
-		]),
-		isShowAll() {
-			return this.$route.params.mode !== 'dp' &&
+    name: 'Menus',
+    components: {
+        MenuBar,
+        MenuButton,
+        MenuCancel,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationControl,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        isShowAll() {
+            return this.$route.params.mode !== 'dp' &&
                     this.$route.params.mode !== 'plan' &&
                     this.$store.state.training.roles != 'BigScreen';
-		},
-		isShowBar() {
-			return this.$store.state.training.prdType;
-		}
-	},
-	watch: {
-		isShowBar(val) {
-			val && this.$store.dispatch('config/updateMenuBar');
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('config/updateMenuBar');
-		});
-	}
+        },
+        isShowBar() {
+            return this.$store.state.training.prdType;
+        }
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
 };
 </script>
 
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
index 6eda8c025..0a24c55e9 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
@@ -78,8 +78,10 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
-import { menuBarConvert, SystemType } from './utils/menuItemStatus';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import StationControlConvert from './menuDialog/stationControlConvert';
 import TrainAdd from './menuDialog/trainAdd';
 import TrainTranstalet from './menuDialog/trainTranstalet';
@@ -95,805 +97,800 @@ import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
-	name: 'MenuBar',
-	components: {
-		NoticeInfo,
-		StationControlConvert,
-		PasswordBox,
-		ViewTrainId,
-		ViewName,
-		ViewDevice,
-		TrainAdd,
-		TrainTranstalet,
-		TrainDelete,
-		ManageUser,
-		HelpAbout,
-		SetLimitSpeed
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			classA: -1,
-			classB: -1,
-			tempClassA: -1,
-			tempClassB: -1,
-			valid: true,
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						title: '系统',
-						operate: OperationEvent.Command.mBar.system,
-						children: [
-							{
-								title: '登录',
-								click: this.undeveloped
-							},
-							{
-								title: '注销',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '连接主用中心',
-								click: this.undeveloped
-							},
-							{
-								title: '连接备用中心',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '退出',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '临时限速',
-						operate: OperationEvent.Command.mBar.limitSpeed,
-						children: [
-							{
-								title: '设置临时限速',
-								operate: OperationEvent.Section.setLimitSpeed,
-								click: this.setLimitSpeed
-							},
-							{
-								title: '取消临时限速',
-								operate: OperationEvent.Section.cancelSpeed,
-								click: this.cancleLimitSpeed
-							}
-						]
-					},
-					{
-						title: '查看',
-						operate: OperationEvent.Command.mBar.check,
-						children: [
-							{
-								title: '运行图',
-								click: this.undeveloped
-							},
-							{
-								title: '报告分析',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '视图',
-								click: this.undeveloped,
-								operate: '',
-								children: [{
-									title: '报警',
-									click: this.undeveloped
-								},
-								{
-									title: '列车运行信息',
-									click: this.undeveloped
-								},
-								{
-									title: '设备状态',
-									click: this.undeveloped
-								},
-								{
-									title: '列车详细信息',
-									click: this.undeveloped
-								},
-								{
-									title: '站台详细信息',
-									click: this.undeveloped
-								}]
-							},
-							{
-								title: '终端站发车列表',
-								click: this.undeveloped
-							},
-							{
-								title: '详细设备状态',
-								click: this.undeveloped
-							},
-							{
-								title: '查找列车',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '显示目的地号',
-								click: this.undeveloped
-							},
-							{
-								title: '显示轨道名',
-								click: this.undeveloped
-							},
-							{
-								title: '显示道岔名',
-								click: this.undeveloped
-							},
-							{
-								title: '显示信号机名',
-								click: this.undeveloped
-							},
-							{
-								title: '显示车次窗位置',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '显示车次号',
-								click: this.undeveloped
-							},
-							{
-								title: '显示车组号',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '全屏',
-								click: this.undeveloped
-							},
-							{
-								title: '放大',
-								click: this.undeveloped
-							},
-							{
-								title: '缩小',
-								click: this.undeveloped
-							},
-							{
-								title: '恢复',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '车站定位',
-						operate: '',
-						children: [
-						]
-					},
-					{
-						title: '显示',
-						operate: OperationEvent.Command.mBar.view,
-						hide: true,
-						children: [
-							{
-								title: '设置列车识别号显示',
-								click: this.setTrainIdDisplay,
-								operate: OperationEvent.Command.view.setTrainIdDisplay
-							},
-							{
-								title: '设置名称显示',
-								click: this.setNameDisplay,
-								operate: OperationEvent.Command.view.setNameDisplay
-							},
-							{
-								title: '设置设备显示',
-								click: this.setDeviceDisplay,
-								operate: OperationEvent.Command.view.setDeviceDisplay
-							}
-						]
-					},
-					{
-						title: 'ATS终端操作',
-						operate: '',
-						children: [
-							{
-								title: '当天运行车计划',
-								click: this.undeveloped
-							},
-							{
-								title: '出入库预告',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '计划车操作',
-						operate: '',
-						children: [
-							{
-								title: '添加计划车',
-								click: this.undeveloped
-							},
-							{
-								title: '平移计划车',
-								click: this.undeveloped
-							},
-							{
-								title: '删除计划车',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '批处理命令',
-						operate: '',
-						children: [
-							{
-								title: '全线扣车',
-								click: this.undeveloped
-							},
-							{
-								title: '取消全线扣车',
-								click: this.undeveloped
-							},
-							{
-								title: '取消上行全线扣车',
-								click: this.undeveloped
-							},
-							{
-								title: '取消下行全线扣车',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '信息管理',
-						operate: '',
-						children: [
-							{
-								title: '调度日志',
-								click: this.undeveloped
-							},
-							{
-								title: '调度留言提醒',
-								click: this.undeveloped
-							},
-							{
-								title: '报警设置',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '帮助',
-						children: [
-							{
-								title: '关于ITS GPC 工作站',
-								click: this.about,
-								operate: OperationEvent.Command.help.about
-							}
-						]
-					}
-				],
-				central: [
-					{
-						title: '系统',
-						operate: OperationEvent.Command.mBar.system,
-						children: [
-							{
-								title: '登录',
-								click: this.undeveloped
-							},
-							{
-								title: '注销',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '连接主用中心',
-								click: this.undeveloped
-							},
-							{
-								title: '连接备用中心',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '退出',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '临时限速',
-						operate: OperationEvent.Command.mBar.limitSpeed,
-						children: [
-							{
-								title: '设置临时限速',
-								operate: OperationEvent.Section.setLimitSpeed,
-								click: this.setLimitSpeed
-							},
-							{
-								title: '取消临时限速',
-								operate: OperationEvent.Section.cancelSpeed,
-								click: this.cancleLimitSpeed
-							}
-						]
-					},
-					{
-						title: '查看',
-						operate: OperationEvent.Command.mBar.check,
-						children: [
-							{
-								title: '运行图',
-								click: this.undeveloped
-							},
-							{
-								title: '报告分析',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '视图',
-								click: this.undeveloped,
-								operate: '',
-								children: [{
-									title: '报警',
-									click: this.undeveloped
-								},
-								{
-									title: '列车运行信息',
-									click: this.undeveloped
-								},
-								{
-									title: '设备状态',
-									click: this.undeveloped
-								},
-								{
-									title: '列车详细信息',
-									click: this.undeveloped
-								},
-								{
-									title: '站台详细信息',
-									click: this.undeveloped
-								}]
-							},
-							{
-								title: '终端站发车列表',
-								click: this.undeveloped
-							},
-							{
-								title: '详细设备状态',
-								click: this.undeveloped
-							},
-							{
-								title: '查找列车',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '显示目的地号',
-								click: this.undeveloped
-							},
-							{
-								title: '显示轨道名',
-								click: this.undeveloped
-							},
-							{
-								title: '显示道岔名',
-								click: this.undeveloped
-							},
-							{
-								title: '显示信号机名',
-								click: this.undeveloped
-							},
-							{
-								title: '显示车次窗位置',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '显示车次号',
-								click: this.undeveloped
-							},
-							{
-								title: '显示车组号',
-								click: this.undeveloped
-							},
-							{
-								type: 'separator'
-							},
-							{
-								title: '全屏',
-								click: this.undeveloped
-							},
-							{
-								title: '放大',
-								click: this.undeveloped
-							},
-							{
-								title: '缩小',
-								click: this.undeveloped
-							},
-							{
-								title: '恢复',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '车站定位',
-						operate: '',
-						children: [
-						]
-					},
-					{
-						title: '显示',
-						operate: OperationEvent.Command.mBar.view,
-						hide: true,
-						children: [
-							{
-								title: '设置列车识别号显示',
-								click: this.setTrainIdDisplay,
-								operate: OperationEvent.Command.view.setTrainIdDisplay
-							},
-							{
-								title: '设置名称显示',
-								click: this.setNameDisplay,
-								operate: OperationEvent.Command.view.setNameDisplay
-							},
-							{
-								title: '设置设备显示',
-								click: this.setDeviceDisplay,
-								operate: OperationEvent.Command.view.setDeviceDisplay
-							}
-						]
-					},
-					{
-						title: 'ATS终端操作',
-						operate: '',
-						children: [
-							{
-								title: '当天运行车计划',
-								click: this.undeveloped
-							},
-							{
-								title: '出入库预告',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '计划车操作',
-						operate: '',
-						children: [
-							{
-								title: '添加计划车',
-								click: this.undeveloped
-							},
-							{
-								title: '平移计划车',
-								click: this.undeveloped
-							},
-							{
-								title: '删除计划车',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '批处理命令',
-						operate: '',
-						children: [
-							{
-								title: '全线扣车',
-								click: this.undeveloped
-							},
-							{
-								title: '取消全线扣车',
-								click: this.undeveloped
-							},
-							{
-								title: '取消上行全线扣车',
-								click: this.undeveloped
-							},
-							{
-								title: '取消下行全线扣车',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '信息管理',
-						operate: '',
-						children: [
-							{
-								title: '调度日志',
-								click: this.undeveloped
-							},
-							{
-								title: '调度留言提醒',
-								click: this.undeveloped
-							},
-							{
-								title: '报警设置',
-								click: this.undeveloped
-							}
-						]
-					},
-					{
-						title: '帮助',
-						children: [
-							{
-								title: '关于ITS GPC 工作站',
-								click: this.about,
-								operate: OperationEvent.Command.help.about
-							}
-						]
-					}
-				]
-			}
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'started',
-			'steps',
-			'order',
-			'mode'
-		]),
-		...mapGetters('map', [
-			'stationList'
-		])
-	},
-	watch: {
-		tempClassA() {
-			this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-		},
-		tempClassB() {
-			this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-		},
-		'$store.state.menuOperation.break': function (val) {
-			if (val) {
-				this.classA = this.classB = -1;
-			} else {
-				this.classA = this.tempClassA;
-				this.classB = this.tempClassB;
-			}
-		},
-		'$store.state.training.operatemode': function (mode) {
-			this.initMenu();
-		},
-		'$store.state.training.started': function (val) {
-			this.closeMenu(true);
-		},
-		'$store.state.training.prdType': function () {
-			this.initMenu();
-		}
-	},
-	mounted() {
-		this.initMenu();
-	},
-	methods: {
-		handleShow(item) {
-			if (item.hide) {
-				return false;
-			}
-			return true;
-		},
-		initStationList() {
-			const list = [];
-			this.stationList.forEach(station => {
-				if (station.visible) {
-					const node = {
-						title: station.name,
-						operate: station.code,
-						show: true,
-						click: this.mapLocation,
-						code: station.code
-					};
+    name: 'MenuBar',
+    components: {
+        NoticeInfo,
+        StationControlConvert,
+        PasswordBox,
+        ViewTrainId,
+        ViewName,
+        ViewDevice,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout,
+        SetLimitSpeed
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        title: '系统',
+                        operate: OperationEvent.Command.mBar.system,
+                        children: [
+                            {
+                                title: '登录',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '注销',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '连接主用中心',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '连接备用中心',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '退出',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '临时限速',
+                        operate: OperationEvent.Command.mBar.limitSpeed,
+                        children: [
+                            {
+                                title: '设置临时限速',
+                                operate: OperationEvent.Section.setLimitSpeed,
+                                click: this.setLimitSpeed
+                            },
+                            {
+                                title: '取消临时限速',
+                                operate: OperationEvent.Section.cancelSpeed,
+                                click: this.cancleLimitSpeed
+                            }
+                        ]
+                    },
+                    {
+                        title: '查看',
+                        operate: OperationEvent.Command.mBar.check,
+                        children: [
+                            {
+                                title: '运行图',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '报告分析',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '视图',
+                                click: this.undeveloped,
+                                operate: '',
+                                children: [{
+                                    title: '报警',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '列车运行信息',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '设备状态',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '列车详细信息',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '站台详细信息',
+                                    click: this.undeveloped
+                                }]
+                            },
+                            {
+                                title: '终端站发车列表',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '详细设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '查找列车',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '显示目的地号',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示轨道名',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示道岔名',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示信号机名',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示车次窗位置',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '显示车次号',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示车组号',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '全屏',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '放大',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '缩小',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '恢复',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '车站定位',
+                        operate: '',
+                        children: [
+                        ]
+                    },
+                    {
+                        title: '显示',
+                        operate: OperationEvent.Command.mBar.view,
+                        hide: true,
+                        children: [
+                            {
+                                title: '设置列车识别号显示',
+                                click: this.setTrainIdDisplay,
+                                operate: OperationEvent.Command.view.setTrainIdDisplay
+                            },
+                            {
+                                title: '设置名称显示',
+                                click: this.setNameDisplay,
+                                operate: OperationEvent.Command.view.setNameDisplay
+                            },
+                            {
+                                title: '设置设备显示',
+                                click: this.setDeviceDisplay,
+                                operate: OperationEvent.Command.view.setDeviceDisplay
+                            }
+                        ]
+                    },
+                    {
+                        title: 'ATS终端操作',
+                        operate: '',
+                        children: [
+                            {
+                                title: '当天运行车计划',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '出入库预告',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '计划车操作',
+                        operate: '',
+                        children: [
+                            {
+                                title: '添加计划车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '平移计划车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '删除计划车',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '批处理命令',
+                        operate: '',
+                        children: [
+                            {
+                                title: '全线扣车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '取消全线扣车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '取消上行全线扣车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '取消下行全线扣车',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '信息管理',
+                        operate: '',
+                        children: [
+                            {
+                                title: '调度日志',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '调度留言提醒',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '报警设置',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '帮助',
+                        children: [
+                            {
+                                title: '关于ITS GPC 工作站',
+                                click: this.about,
+                                operate: OperationEvent.Command.help.about
+                            }
+                        ]
+                    }
+                ],
+                Center: [
+                    {
+                        title: '系统',
+                        operate: OperationEvent.Command.mBar.system,
+                        children: [
+                            {
+                                title: '登录',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '注销',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '连接主用中心',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '连接备用中心',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '退出',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '临时限速',
+                        operate: OperationEvent.Command.mBar.limitSpeed,
+                        children: [
+                            {
+                                title: '设置临时限速',
+                                operate: OperationEvent.Section.setLimitSpeed,
+                                click: this.setLimitSpeed
+                            },
+                            {
+                                title: '取消临时限速',
+                                operate: OperationEvent.Section.cancelSpeed,
+                                click: this.cancleLimitSpeed
+                            }
+                        ]
+                    },
+                    {
+                        title: '查看',
+                        operate: OperationEvent.Command.mBar.check,
+                        children: [
+                            {
+                                title: '运行图',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '报告分析',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '视图',
+                                click: this.undeveloped,
+                                operate: '',
+                                children: [{
+                                    title: '报警',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '列车运行信息',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '设备状态',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '列车详细信息',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '站台详细信息',
+                                    click: this.undeveloped
+                                }]
+                            },
+                            {
+                                title: '终端站发车列表',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '详细设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '查找列车',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '显示目的地号',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示轨道名',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示道岔名',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示信号机名',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示车次窗位置',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '显示车次号',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '显示车组号',
+                                click: this.undeveloped
+                            },
+                            {
+                                type: 'separator'
+                            },
+                            {
+                                title: '全屏',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '放大',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '缩小',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '恢复',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '车站定位',
+                        operate: '',
+                        children: [
+                        ]
+                    },
+                    {
+                        title: '显示',
+                        operate: OperationEvent.Command.mBar.view,
+                        hide: true,
+                        children: [
+                            {
+                                title: '设置列车识别号显示',
+                                click: this.setTrainIdDisplay,
+                                operate: OperationEvent.Command.view.setTrainIdDisplay
+                            },
+                            {
+                                title: '设置名称显示',
+                                click: this.setNameDisplay,
+                                operate: OperationEvent.Command.view.setNameDisplay
+                            },
+                            {
+                                title: '设置设备显示',
+                                click: this.setDeviceDisplay,
+                                operate: OperationEvent.Command.view.setDeviceDisplay
+                            }
+                        ]
+                    },
+                    {
+                        title: 'ATS终端操作',
+                        operate: '',
+                        children: [
+                            {
+                                title: '当天运行车计划',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '出入库预告',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '计划车操作',
+                        operate: '',
+                        children: [
+                            {
+                                title: '添加计划车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '平移计划车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '删除计划车',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '批处理命令',
+                        operate: '',
+                        children: [
+                            {
+                                title: '全线扣车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '取消全线扣车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '取消上行全线扣车',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '取消下行全线扣车',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '信息管理',
+                        operate: '',
+                        children: [
+                            {
+                                title: '调度日志',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '调度留言提醒',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '报警设置',
+                                click: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        title: '帮助',
+                        children: [
+                            {
+                                title: '关于ITS GPC 工作站',
+                                click: this.about,
+                                operate: OperationEvent.Command.help.about
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.training.operatemode': function (mode) {
+            this.initMenu();
+        },
+        '$store.state.training.started': function (val) {
+            this.closeMenu(true);
+        },
+        '$store.state.training.prdType': function () {
+            this.initMenu();
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        handleShow(item) {
+            if (item.hide) {
+                return false;
+            }
+            return true;
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
 
-					list.push(node);
-				}
-			});
-			return list;
-		},
-		initMenu(menu) {
-			this.menu = menuBarConvert(this.menuNormal[SystemType[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
-			if (this.menu.length) {
-				this.menu[2].children = this.initStationList();
-				this.clickEvent();
-				this.closeMenu(true);
-			}
-		},
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				if (document.getElementById('menuBar')) {
-					self.closeMenu(false);
-				}
-			};
-		},
-		getDomId(item) {
-			if (item && item.operate) {
-				return item.operate.domId;
-			}
-			return '';
-		},
-		noShowingChildren(children) {
-			if (!children || children.length <= 0) {
-				return true;
-			}
-			return false;
-		},
-		hasShowingChildren(children) {
-			if (children && children.length > 0) {
-				return true;
-			}
-			return false;
-		},
-		closeMenu(flag) {
-			if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
-				this.classA = this.tempClassA = -1;
-				this.classB = this.tempClassB = -1;
-			}
-		},
-		hookClick(item, event) {
-			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-			if (item && typeof item.click == 'function') {
-				item.click(item.operate);
-			}
-		},
-		selectedClassA(item, index) {
-			const order = this.order || 0;
-			if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-				this.popupMenuA(item, index);
-			} else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-				this.popupMenuA(item, index);
-			}
-		},
-		// 弹出顶部菜单操作
-		popupMenuA(item, index) {
-			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-			this.clickEvent();
-			const operate = {
-				type: 'bar',
-				operation: item.operate
-			};
-			this.tempClassA = index;
-			this.tempClassB = -1;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		selectedClassB(item, index) {
-			const order = this.order || 0;
-			if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-				this.popupMenuB(item, index);
-			} else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-				this.popupMenuB(item, index);
-			}
-		},
-		popupMenuB(item, index) {
-			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-			const operate = {
-				type: 'bar',
-				operation: item.operate
-			};
-			this.tempClassB = index;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		// 设置地图定位
-		mapLocation(code) {
-			if (code) {
-				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
-				this.closeMenu(true);
-			}
-		},
-		// 关于
-		about(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operate
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.helpAbout.doShow(operate);
-				}
-			});
-		},
-		// 刷新
-		refresh() {
-			this.closeMenu(true);
-			EventBus.$emit('refresh');
-		},
-		getLoginResult(operate) {
-			/** 密码校验*/
-			if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-				if (operate.success) {
-					/** 校验成功*/
-					this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-				}
-			}
-		},
-		setLimitSpeed(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operate
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.setLimitSpeed.doShow(operate, true);
-				}
-			});
-		},
-		cancleLimitSpeed(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operate
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.setLimitSpeed.doShow(operate, false);
-				}
-			});
-		},
-		undeveloped() {
-			this.doClose();
-			this.$alert('实现中......', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-				}
-			});
-		},
-		doClose() {
-			this.$nextTick(() => {
-				EventBus.$emit('closeMenu');
-			});
-		}
-	}
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        initMenu(menu) {
+            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[State2SimulationMap[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
+            if (this.menu.length) {
+                this.menu[2].children = this.initStationList();
+                this.clickEvent();
+                this.closeMenu(true);
+            }
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                if (document.getElementById('menuBar')) {
+                    self.closeMenu(false);
+                }
+            };
+        },
+        getDomId(item) {
+            if (item && item.operate) {
+                return item.operate.domId;
+            }
+            return '';
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu(flag) {
+            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+                this.classA = this.tempClassA = -1;
+                this.classB = this.tempClassB = -1;
+            }
+        },
+        hookClick(item, event) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            if (item && typeof item.click == 'function') {
+                item.click(item.operate);
+            }
+        },
+        selectedClassA(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuA(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuA(item, index);
+            }
+        },
+        // 弹出顶部菜单操作
+        popupMenuA(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            this.clickEvent();
+            const operate = {
+                operation: item.operate
+            };
+            this.tempClassA = index;
+            this.tempClassB = -1;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        selectedClassB(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuB(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuB(item, index);
+            }
+        },
+        popupMenuB(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            const operate = {
+                operation: item.operate
+            };
+            this.tempClassB = index;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.closeMenu(true);
+            }
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        getLoginResult(operate) {
+            /** 密码校验*/
+            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+                if (operate.success) {
+                    /** 校验成功*/
+                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+                }
+            }
+        },
+        setLimitSpeed(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.setLimitSpeed.doShow(operate, true);
+                }
+            });
+        },
+        cancleLimitSpeed(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.setLimitSpeed.doShow(operate, false);
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        }
+    }
 };
 </script>
 
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index d361e118e..ba0058a91 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -1,18 +1,18 @@
 <template>
   <div v-if="isShowBtn" class="menu" style="height: 45px;" :style="{left: point.x+'px', top: point.y+'px' }">
-    <button :id="Signal.arrangementRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.arrangementRoute.button.operation)">
+    <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>
         <center><b>进</b><b>路</b></center>
       </span>
     </button>
-    <button :id="Signal.cancelTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.cancelTrainRoute.button.operation)">
+    <button :id="Signal.cancelTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.cancelTrainRoute.button.operation, 'Signal')">
       <span style="color: black">
         <center><b>总</b></center>
         <center><b>取</b><b>消</b></center>
       </span>
     </button>
-    <button :id="Signal.guide.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.guide.button.operation)">
+    <button :id="Signal.guide.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.guide.button.operation, 'Signal')">
       <span style="color: black">
         <center><b>引</b><b>导</b></center>
         <center><b>进</b><b>路</b></center>
@@ -25,55 +25,55 @@
         <center><b>总</b><b>锁</b></center>
       </span>
     </button> -->
-    <button :id="Signal.humanTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanTrainRoute.button.operation)">
+    <button :id="Signal.humanTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanTrainRoute.button.operation, 'Signal')">
       <span style="color: red">
         <center><b>总</b></center>
         <center><b>人</b><b>解</b></center>
       </span>
     </button>
-    <button :id="Section.fault.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Section.fault.button.operation)">
+    <button :id="Section.fault.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Section.fault.button.operation, 'Section')">
       <span style="color: black">
         <center><b>区</b></center>
         <center><b>故</b><b>解</b></center>
       </span>
     </button>
-    <button :id="Switch.locate.button.domId" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown(Switch.locate.button.operation)">
+    <button :id="Switch.locate.button.domId" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown(Switch.locate.button.operation, 'Switch')">
       <span style="color: black">
         <center><b>道</b><b>岔</b></center>
         <center><b>定</b><b>操</b></center>
       </span>
     </button>
-    <button :id="Switch.reverse.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.reverse.button.operation)">
+    <button :id="Switch.reverse.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.reverse.button.operation, 'Switch')">
       <span style="color: black">
         <center><b>道</b><b>岔</b></center>
         <center><b>反</b><b>操</b></center>
       </span>
     </button>
-    <button :id="Switch.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.lock.button.operation)">
+    <button :id="Switch.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.lock.button.operation, 'Switch')">
       <span style="color: black">
         <center><b>道</b><b>岔</b></center>
         <center><b>单</b><b>锁</b></center>
       </span>
     </button>
-    <button :id="Switch.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.unlock.button.operation)">
+    <button :id="Switch.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.unlock.button.operation, 'Switch')">
       <span style="color: red">
         <center><b>道</b><b>岔</b></center>
         <center><b>解</b><b>锁</b></center>
       </span>
     </button>
-    <button :id="MixinCommand.block.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.block.button.operation)">
+    <button :id="MixinCommand.block.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.block.button.operation, 'MixinCommand')">
       <span style="color: black">
         <center><b>封</b></center>
         <center><b>锁</b></center>
       </span>
     </button>
-    <button :id="MixinCommand.unblock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.unblock.button.operation)">
+    <button :id="MixinCommand.unblock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.unblock.button.operation, 'MixinCommand')">
       <span style="color: black">
         <center><b>解</b></center>
         <center><b>封</b></center>
       </span>
     </button>
-    <button :id="MixinCommand.functionButton.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.functionButton.button.operation)">
+    <button :id="MixinCommand.functionButton.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.functionButton.button.operation, 'MixinCommand')">
       <span style="color: black">
         <center>
           <b style="color:deepskyblue">功</b>
@@ -85,13 +85,13 @@
         </center>
       </span>
     </button>
-    <button :id="Signal.atsAutoControl.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.atsAutoControl.button.operation)">
+    <button :id="Signal.atsAutoControl.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.atsAutoControl.button.operation, 'Signal')">
       <span style="color: black">
         <center><b>自</b></center>
         <center><b>动</b><b>控</b></center>
       </span>
     </button>
-    <button :id="Signal.humanControl.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanControl.button.operation)">
+    <button :id="Signal.humanControl.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanControl.button.operation, 'Signal')">
       <span style="color: black">
         <center><b>人</b></center>
         <center><b>工</b><b>控</b></center>
@@ -108,187 +108,260 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import OperateHandler from '@/scripts/plugin/OperateHandler';
-import { deepAssign } from '@/utils/index';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import Handler from '@/scripts/cmdPlugin/Handler';
+// import { deepAssign } from '@/utils/index';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	name: 'MapButtonMenu',
-	components: {
-		PasswordBox
-	},
-	data() {
-		return {
-			point: {
-				x: -1000,
-				y: -1000
-			},
-			operation: '0',
-			buttonName: '',
-			buttonDownColor: '#A8A8A8',
-			buttonUpColor: '#DCDCDC',
-			width: 58,
-			tempData: null,
-			offset: {}
-		};
-	},
-	computed: {
-		Switch() {
-			return OperationEvent.Switch;
-		},
-		Section() {
-			return OperationEvent.Section;
-		},
-		Signal() {
-			return OperationEvent.Signal;
-		},
-		MixinCommand() {
-			return OperationEvent.MixinCommand;
-		},
-		Command() {
-			return OperationEvent.Command;
-		},
-		isShowBtn() {
-			return this.$store.state.training.prdType == '01';
-		}
-	},
-	watch: {
-		'$store.state.config.canvasOffsetCount': function (val) {
-			this.resetPosition();
-		},
-		'$store.state.menuOperation.buttonOperation': function (val, old) {
-			this.updateButtonShow(val, old);
-		},
-		'$store.state.menuOperation.selectedCount': function (val) {
-			this.selectedChange();
-		}
-	},
-	mounted() {
-		this.resetPosition();
-	},
-	methods: {
-		passWordCommit(data) {
-			const operate = {
-				type: 'mbm',
-				operation: data.operateNext
-			};
+    name: 'MapButtonMenu',
+    components: {
+        PasswordBox
+    },
+    data() {
+        return {
+            point: {
+                x: -1000,
+                y: -1000
+            },
+            operation: '0',
+            buttonName: '',
+            buttonDownColor: '#A8A8A8',
+            buttonUpColor: '#DCDCDC',
+            width: 58,
+            tempData: null,
+            offset: {},
+            commandType: '',
+            cmdTypeList: []
+        };
+    },
+    computed: {
+        Switch() {
+            return OperationEvent.Switch;
+        },
+        Section() {
+            return OperationEvent.Section;
+        },
+        Signal() {
+            return OperationEvent.Signal;
+        },
+        MixinCommand() {
+            return OperationEvent.MixinCommand;
+        },
+        Command() {
+            return OperationEvent.Command;
+        },
+        isShowBtn() {
+            return this.$store.state.training.prdType == '01';
+        },
+        CMD() {
+            return CMD;
+        },
+        cmdType() {
+            switch (this.operation) {
+            case this.Switch.lock.button.operation: // 道岔单锁
+                return CMD.Switch.CMD_SWITCH_SINGLE_LOCK;
+            case this.Switch.unlock.button.operation: // 道岔解锁
+                return CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
+            case this.Switch.locate.button.operation || this.Switch.reverse.button.operation: // 道岔定位/反位
+                return CMD.Switch.CMD_SWITCH_TURN;
+            case this.MixinCommand.block.button.operation: // 封锁
+                return {};
+            case this.MixinCommand.unblock.button.operation: // 解封
+                return {};
+            case this.Signal.atsAutoControl.button.operation: // 自动控
+                return CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING;
+            case this.Signal.humanControl.button.operation: // 人工控
+                return CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING;
+            case this.Section.fault.button.operation: // 区故解
+                return CMD.Section.CMD_SECTION_FAULT_UNLOCK;
+            case this.Signal.humanTrainRoute.button.operation: // 总人解 (取消引导进路)
+                return CMD.Section.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
+            case this.Signal.cancelTrainRoute.button.operation: // 总取消
+                return CMD.Section.CMD_SIGNAL_CANCEL_ROUTE;
+            case this.Signal.arrangementRoute.button.operation: // 排列进路
+                return CMD.Section.CMD_SIGNAL_SET_ROUTE;
+            case this.Signal.guide.button.operation: // 引导进路
+                return CMD.Section.CMD_SIGNAL_ROUTE_GUIDE;
+            }
+            return '';
+        }
+    },
+    watch: {
+        '$store.state.config.canvasOffsetCount': function (val) {
+            this.resetPosition();
+        },
+        '$store.state.menuOperation.buttonOperation': function (val, old) {
+            this.updateButtonShow(val, old);
+        },
+        '$store.state.menuOperation.selectedCount': function (val) {
+            this.selectedChange();
+        }
+    },
+    mounted() {
+        this.resetPosition();
+    },
+    methods: {
+        passWordCommit(data) {
+            const operate = {
+                type: 'mbm',
+                operation: data.operateNext
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		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');
-			});
-		},
-		updateButtonShow(val, old) {
-			if (old) {
-				// 恢复旧按钮显示
-				const domId = getDomIdByOperation(old);
-				const dom = document.getElementById(domId);
-				if (dom) {
-					dom.disabled = false;
-					dom.style.backgroundColor = this.buttonUpColor;
-				}
-			}
-			if (val) {
-				// 新按钮按下效果
-				const domId = getDomIdByOperation(val);
-				const dom = document.getElementById(domId);
-				if (dom) {
-					dom.disabled = true;
-					dom.style.backgroundColor = this.buttonDownColor;
-				}
-			}
-		},
-		buttonDown(operation) {
-			if (operation != this.Command.cancel.clearMbm.operation) {
-				const operate = {
-					type: 'mbm',
-					operation: operation
-				};
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					if (valid) {
-						this.operation = operation;
-						this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						if (operation == this.Signal.humanTrainRoute.button.operation) { // 总人解操作 显示密码窗
-							operate['operateNext'] = this.Command.close.password.operation;
-							this.$refs.password.doShow(operate);
-						} else if (operation == this.Section.fault.button.operation) { // 区故解操作 显示密码窗
-							operate['operateNext'] = this.Command.close.password.operation;
-							this.$refs.password.doShow(operate);
-						} else if (operation == this.Switch.unlock.button.operation) { // 道岔解锁操作 显示密码窗
-							operate['operateNext'] = this.Command.close.password.operation;
-							this.$refs.password.doShow(operate);
-						} else if (operation == this.MixinCommand.unblock.button.operation) { // 解封操作 显示密码窗
-							operate['operateNext'] = this.Command.close.password.operation;
-							this.$refs.password.doShow(operate);
-						}
-						this.$store.dispatch('training/emitTipFresh');
-					}
-				});
-			} else {
-				const operate = {
-					type: 'mbm',
-					operation: operation
-				};
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/setButtonOperation', null);
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						OperateHandler.cleanOperates(); // 清空操作组
-					}
-				});
-			}
-		},
-		selectedChange() {
-			// 按钮按下时
-			if (this.$store.state.menuOperation.buttonOperation) {
-				const model = this.$store.state.menuOperation.selected; // 选择设备
-				if (model._type) {
-					const deviceType = MapDeviceType[model._type];
-					const modelData = deepAssign({}, model);
-					const operate = {
-						send: true,
-						model: modelData,
-						code: model.code,
-						type: deviceType.type,
-						operation: this.$store.state.menuOperation.buttonOperation,
-						tempData: this.tempData
-					};
-
-					this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-						if (valid) {
-							if (response) {
-								this.tempData = response.data;
-							}
-							if (this.operation == this.Signal.guide.button.operation) { // 引导进路操作 显示密码窗
-								this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-								operate['operateNext'] = this.Command.close.password.operation;
-								this.operation = '0';
-								this.$refs.password.doShow(operate);
-							}
-						}
-					});
-				} else {
-					OperateHandler.cleanOperates(); // 清空操作组
-					this.$store.dispatch('menuOperation/setButtonOperation', null);
-				}
-			}
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        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');
+            });
+        },
+        updateButtonShow(val, old) {
+            if (old) {
+                // 恢复旧按钮显示
+                const domId = OperationHandler.getDomIdByOperation(old);
+                const dom = document.getElementById(domId);
+                if (dom) {
+                    dom.disabled = false;
+                    dom.style.backgroundColor = this.buttonUpColor;
+                }
+            }
+            if (val) {
+                // 新按钮按下效果
+                const domId = OperationHandler.getDomIdByOperation(val);
+                const dom = document.getElementById(domId);
+                if (dom) {
+                    dom.disabled = true;
+                    dom.style.backgroundColor = this.buttonDownColor;
+                }
+            }
+        },
+        buttonDown(operation, commandType) {
+            if (operation != this.Command.cancel.clearMbm.operation) {
+                const operate = {
+                    type: 'mbm',
+                    operation: operation
+                };
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.operation = operation;
+                        this.commandType = commandType;
+                        if (this.commandType == 'MixinCommand') {
+                            this.cmdTypeList = ['Switch', 'Signal'];
+                        } else {
+                            this.cmdTypeList = [commandType];
+                        }
+                        this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        if (operation == this.Signal.humanTrainRoute.button.operation) { // 总人解操作 显示密码窗
+                            operate['operateNext'] = this.Command.close.password.operation;
+                            this.$refs.password.doShow(operate);
+                        } else if (operation == this.Section.fault.button.operation) { // 区故解操作 显示密码窗
+                            operate['operateNext'] = this.Command.close.password.operation;
+                            this.$refs.password.doShow(operate);
+                        } else if (operation == this.Switch.unlock.button.operation) { // 道岔解锁操作 显示密码窗
+                            operate['operateNext'] = this.Command.close.password.operation;
+                            this.$refs.password.doShow(operate);
+                        } else if (operation == this.MixinCommand.unblock.button.operation) { // 解封操作 显示密码窗
+                            operate['operateNext'] = this.Command.close.password.operation;
+                            this.$refs.password.doShow(operate);
+                        }
+                        this.$store.dispatch('training/emitTipFresh');
+                    }
+                });
+            } else {
+                const operate = {
+                    start: true,
+                    type: 'mbm',
+                    operation: operation
+                };
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.commandType = '';
+                        this.$store.dispatch('menuOperation/setButtonOperation', null);
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        Handler.clear(); // 清空操作组
+                    }
+                });
+            }
+        },
+        selectedChange() {
+            // 按钮按下时
+            if (this.$store.state.menuOperation.buttonOperation) {
+                const model = this.$store.state.menuOperation.selected; // 选择设备
+                if (model._type) {
+                    const operate = this.handelOperate(model);
+                    if (this.cmdTypeList.indexOf(model._type) >= 0) {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                            if (valid) {
+                                if (this.operation == this.Signal.guide.button.operation) { // 引导进路操作 显示密码窗
+                                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                                    operate['operateNext'] = this.Command.close.password.operation;
+                                    this.operation = '0';
+                                    this.$refs.password.doShow(operate);
+                                }
+                            }
+                        });
+                    } else {
+                        Handler.clear(); // 清空操作组
+                        this.$store.dispatch('menuOperation/setButtonOperation', null);
+                    }
+                } else {
+                    Handler.clear(); // 清空操作组
+                    this.$store.dispatch('menuOperation/setButtonOperation', null);
+                }
+            }
+        },
+        handelOperate(model) { // 设置operate
+            const operate = {
+                send: true,
+                operation: this.$store.state.menuOperation.buttonOperation,
+                cmdType: this.cmdType,
+                param: {}
+            };
+            switch (this.commandType) {
+            case 'Switch':
+                operate.param['Switch_Code'] = model.code;
+                break;
+            case 'Signal':
+                operate.param['Signal_Code'] = model.code;
+                break;
+            case 'Section':
+                operate.param['Section_Code'] = model.code;
+                break;
+            case 'MixinCommand':
+                if (model._type == 'Switch') {
+                    if (this.operation == this.MixinCommand.block.button.operation) {
+                        operate.cmdType = CMD.Switch.CMD_SWITCH_BLOCK;
+                    } else if (this.operation == this.MixinCommand.unblock.button.operation) {
+                        operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
+                    }
+                    operate.param['Switch_Code'] = model.code;
+                } else if (model._type == 'Signal') {
+                    if (this.operation == this.MixinCommand.block.button.operation) {
+                        operate.cmdType = CMD.Signal.CMD_SIGNAL_BLOCK;
+                    } else if (this.operation == this.MixinCommand.unblock.button.operation) {
+                        operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
+                    }
+                    operate.param['Signal_Code'] = model.code;
+                }
+                break;
+            }
+            return operate;
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuCancel.vue b/src/jmapNew/theme/chengdu_03/menus/menuCancel.vue
index 5b20d2fd3..e2b4b8b85 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuCancel.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuCancel.vue
@@ -43,10 +43,6 @@ export default {
         ...mapGetters('map', [
             'stationList'
         ]),
-        isScreen() { // 大屏隐藏所有菜单
-            return this.$route.params.mode === 'dp' ||
-				this.$store.state.training.roles == 'BigScreen';
-        },
         group() {
             return this.$route.query.group;
         }
@@ -67,14 +63,8 @@ export default {
                 self.doClose();
             };
         },
-        initMenu() {
-            if (this.isScreen) {
-                this.menu = [...this.menuScreen];
-            }
-        },
         doShow(point) {
             this.clickEvent();
-            this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
                 this.$refs.popMenu.resetShowPosition(point);
             }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
index 747b7cbfc..37fa766cd 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -20,7 +20,8 @@
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+        import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
     import NoticeInfo from '../../dialog/childDialog/childDialog/noticeInfo'
 
     export default {
@@ -59,11 +60,11 @@
         methods: {
             doShow(operate) {
                 this.domIdConfirm = '';
-                if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
                     this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
-                } else if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
                     this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                     this.domIdConfirm = OperationEvent.StationControl.requestCentralControl.confirm.domId;
                 }
 
@@ -84,7 +85,7 @@
                 }
 
                 this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.doClose();
@@ -100,18 +101,18 @@
                         selection: this.operate.selection
                     }
 
-                    if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
                         operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
-                    } else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
+                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
                         operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
-                    } else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
+                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
                         operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
                     }
 
                     this.loading = true;
                     this.doClose();
                     this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                    this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                         if (valid) {
                             this.loading = false;
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -124,4 +125,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
index 2bea83e3e..15daf018a 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
@@ -31,7 +31,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'UserAdd',
@@ -119,7 +119,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 if (this.model.password === this.model.confirm) {
@@ -141,7 +141,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -159,4 +159,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
index 9316bb37b..3e2018158 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
@@ -20,7 +20,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'UserDelete',
@@ -96,7 +96,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -113,7 +113,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -131,4 +131,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
index 95e4e8fa8..6109d5510 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
@@ -34,7 +34,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'UserEdit',
@@ -132,7 +132,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid)
                                 if (this.selected.password !== this.model.oldPassword) {
@@ -157,7 +157,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -175,4 +175,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
index 698bd5429..1f19b5243 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'ManageUser',
@@ -94,7 +94,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -110,7 +110,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -128,4 +128,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
index 0ac49d4d4..6b24b8ff6 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
@@ -14,7 +14,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'TrainAdd',
@@ -30,7 +30,7 @@
                 rules: {
                     // groupNumber: [
                     //     { required: true, message: '请输入车次号', trigger: 'blur' }
-                    // ],                   
+                    // ],
                     // stationStandCode: [
                     //     { required: true, message: '请选择终端', trigger: 'change' }
                     // ],
@@ -86,12 +86,12 @@
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -110,11 +110,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -132,4 +132,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
index f7a2e1589..4be9889b0 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
@@ -52,7 +52,7 @@
     import UserAdd from './childDialog/userAdd';
     import UserEdit from './childDialog/userEdit';
     import UserDelete from './childDialog/userDelete';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'ManageUser',
@@ -135,7 +135,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userAdd.doShow(operate);
@@ -153,7 +153,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userEdit.doShow(operate, this.selected);
@@ -175,7 +175,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userDelete.doShow(operate, this.selected);
@@ -195,7 +195,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                 }).catch(error => {
                     this.loading = false;
@@ -209,7 +209,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     this.selected = row;
                 }).catch(error => {
@@ -223,7 +223,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -239,7 +239,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -287,4 +287,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
index 9feaf8232..cfbf79e2d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
@@ -48,7 +48,8 @@
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+        import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
     import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
     export default {
@@ -78,7 +79,7 @@
             },
             domIdConfirm() {
                 if (this.dialogShow) {
-                    if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                         /** 强制站控*/
                         return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
                     }
@@ -118,7 +119,7 @@
                     operation: OperationEvent.Command.close.password.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -129,14 +130,14 @@
                     type: this.operate.type,
                 }
 
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                     /** 强制站控*/
                     operate.operation = OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation
                 }
 
                 if (this.model.password == '123456') {
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 
@@ -218,4 +219,4 @@
         background: #F0F0F0;
         width: 80px !important;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
index 6f19587a8..a2aeb20b2 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
@@ -121,7 +121,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'TrainAdd',
@@ -205,12 +205,12 @@
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -229,11 +229,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -272,4 +272,4 @@
     .item-label {
         text-align: center;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
index dbf3d60ea..b722fc115 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
@@ -66,7 +66,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, TrainingMode, OperationEvent, getDomIdByOperation, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import TwoConfirmation from './childDialog/twoConfirmation';
 
 export default {
@@ -110,36 +112,28 @@ export default {
         },
         isFork() {
             if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
-            } else {
-                return '';
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
             }
         },
         isRequest() {
             if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
-            } else {
-                return '';
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
             }
         },
         isConter() {
             if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
-            } else {
-                return '';
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
             }
         },
         domIdChoose() {
             if (this.dialogShow) {
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                     return OperationEvent.StationControl.forcedStationControl.choose.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                     return OperationEvent.StationControl.requestStationControl.choose.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                     return OperationEvent.StationControl.requestCentralControl.choose.domId;
                 }
-            } else {
-                return '';
             }
         },
         domIdConter() {
@@ -204,9 +198,9 @@ export default {
                         row[prop] = result[prop];
                     }
                     if (success) {
-                        if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                        if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                             row.control = this.controlProps['02']; // 01:中控， 02:站控
-                        } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                        } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                             row.control = this.controlProps['01']; // 01:中控， 02:站控
                         }
                         row.disabled = true;
@@ -233,11 +227,11 @@ export default {
         },
         checkBoxDisabled(row) {
             const control = (this.$store.getters('map/getDeviceByCode')(row.code) || {});
-            if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                 if (control && control.status == '02') { // 01:中控， 02:站控
                     return true;
                 }
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                 if (control && control.status == '01') { // 01:中控， 02:站控
                     return true;
                 }
@@ -291,7 +285,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -317,22 +311,22 @@ export default {
             this.selection = selection;
             if (selection && selection.length) {
                 const operate = {
-                    type: MapDeviceType.StationControl.type,
+
                     operation: '',
                     val: this.serializeCodeListWithSeparator('::'),
                     selection: selection
                 };
 
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                     operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                     operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                     operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation;
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -344,7 +338,7 @@ export default {
         },
         requestCommit() {
             const operate = {
-                type: MapDeviceType.StationControl.type,
+
                 messages: ['确认将如下操作区域的控制模式由中控转为站控:'],
                 operation: OperationEvent.StationControl.requestStationControl.menu.operation,
                 val: this.serializeCodeListWithSeparator('::'),
@@ -357,21 +351,21 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch(() => {
+            }).catch((error) => {
                 this.disabledSure = false;
                 this.disabledClose = false;
             });
         },
         forkCommit() {
             const operate = {
-                type: MapDeviceType.StationControl.type,
+
                 messages: ['确认将如下操作区域的控制模式由中控转为站控:'],
                 operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
                 val: this.serializeCodeListWithSeparator('::'),
@@ -384,7 +378,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -398,7 +392,7 @@ export default {
         },
         conterCommit() { // 请求中控
             const operate = {
-                type: MapDeviceType.StationControl.type,
+
                 messages: ['确认将如下操作区域的控制模式由站控转为中控:'],
                 operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
                 val: this.serializeCodeListWithSeparator('::'),
@@ -411,7 +405,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
index 7ddcff22c..a4a379704 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
@@ -35,7 +35,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'TrainAdd',
@@ -113,12 +113,12 @@
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -137,11 +137,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -159,4 +159,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
index 398ccb370..333c279e3 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
@@ -26,7 +26,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'TrainAdd',
@@ -100,12 +100,12 @@
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Command.planTrain.delPlanTrain.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -124,11 +124,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -146,4 +146,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
index c82352003..f1b2dd1b0 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
@@ -35,7 +35,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'TrainTranstalet',
@@ -113,12 +113,12 @@
                     if (valid) {
                         let operate = {
                             send: true,
-                            type: MapDeviceType.Train.type,
+
                             operation: OperationEvent.Command.planTrain.translatPlanTrain.operation,
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 this.doClose();
@@ -137,11 +137,11 @@
             },
             cancel() {
                 let operate = {
-                    type: MapDeviceType.Train.type,
+
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -149,4 +149,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewDevice.vue
index dd4fc2e38..c78c6ca30 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewDevice.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewDevice.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 import deviceType from '@/jmap/constant/deviceType';
 
@@ -98,7 +98,7 @@ export default {
 				operation: OperationEvent.Command.cancel.menu.operation
 			};
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				if (valid) {
 					this.doClose();
 				}
@@ -113,7 +113,7 @@ export default {
 			};
 
 			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				this.loading = false;
 				if (valid) {
 					this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
index 8fdfe991f..a5b0d2079 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
 export default {
@@ -130,7 +130,7 @@ export default {
 				operation: OperationEvent.Command.cancel.menu.operation
 			};
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				if (valid) {
 					this.doClose();
 				}
@@ -145,7 +145,7 @@ export default {
 			};
 
 			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				this.loading = false;
 				if (valid) {
 					this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
index b21f46e0f..60515b91e 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
@@ -76,7 +76,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
 export default {
@@ -138,7 +139,7 @@ export default {
 				operation: OperationEvent.Command.cancel.menu.operation
 			};
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				if (valid) {
 					this.doClose();
 				}
@@ -153,7 +154,7 @@ export default {
 			};
 
 			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
 				this.loading = false;
 				if (valid) {
 					this.setTrainDispaly();
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
index 9e14a2b4d..48654d9fb 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
@@ -15,272 +15,248 @@ import SectionDetail from './dialog/sectionDetail';
 import TrainCreate from './dialog/trainCreate';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-import { mouseCancelState } from './utils/menuItemStatus';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
-	name: 'SectionMenu',
-	components: {
-		PopMenu,
-		SectionControl,
-		SectionDetail,
-		TrainCreate,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default: () => {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					// {
-					// 	label: '区故解',
-					// 	handler: this.fault,
-					// 	disabledCallback: MenuDisabledState.Section.fault,
-					// 	auth: { station: true, center: false }
-					// }
-				],
-				central: [
-					{
-						label: '区故解',
-						handler: this.fault,
-						disabledCallback: MenuDisabledState.Section.fault,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '设置临时限速',
-						handler: this.setSpeed,
-						disabledCallback: MenuDisabledState.Section.setSpeed,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '属性',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.Section.setSpeed,
-						auth: { station: false, center: true }
-					}
-				]
-			},
-			menuTrain: [
-				{
-					label: '新建列车',
-					handler: this.newTrain,
-					disabledCallback: MenuDisabledState.Section.newTrain
-				}
-			],
-			menuForce: [
-				{
-					label: '设置计轴失效',
-					handler: this.alxeFailure,
-					disabledCallback: MenuDisabledState.Section.alxeFailure
-				},
-				{
-					label: this.$t('menu.menuSection.setFault'),
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Section.setStoppage
-				},
-				{
-					label: this.$t('menu.menuSection.cancelFault'),
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Section.cancelStoppage
-				}
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce, ...this.menuTrain];
-			}
+    name: 'SectionMenu',
+    components: {
+        PopMenu,
+        SectionControl,
+        SectionDetail,
+        TrainCreate,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default: () => {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    // {
+                    // 	label: '区故解',
+                    // 	handler: this.fault,
+                    // 	disabledCallback: MenuDisabledState.Section.fault,
+                    // 	auth: { station: true, center: false }
+                    // }
+                ],
+                Center: [
+                    {
+                        label: '区故解',
+                        handler: this.fault,
+                        auth: { station: true, center: false },
+                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    },
+                    {
+                        label: '设置临时限速',
+                        handler: this.setSpeed,
+                        auth: { station: false, center: true },
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    },
+                    {
+                        label: '属性',
+                        handler: this.detail,
+                        auth: { station: false, center: true },
+                        cmdType:''
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置计轴失效',
+                    handler: this.alxeFailure,
+                    cmdType:''
+                },
+                {
+                    label: this.$t('menu.menuSection.setFault'),
+                    handler: this.setStoppage,
+                    cmdType: CMD.Section.CMD_SECTION_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuSection.cancelFault'),
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置计轴失效
+        alxeFailure() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.alxeFailure.menu.operation,
+                cmdType: '',
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 故障解锁
+        fault() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.fault.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置计轴失效
-		alxeFailure() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.alxeFailure.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 新建列车
-		newTrain() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.newtrain.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainCreate.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 故障解锁
-		fault() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.fault.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		detail() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.detail.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionDetail.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.stoppage.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.cancelStoppage.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置速度
-		setSpeed() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.setSpeed.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					// this.$refs.speedLimitControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		undeveloped() {
-			this.doClose();
-			this.$alert('实现中......', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-				}
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(step, this.selected);
+                }
+            });
+        },
+        detail() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.detail.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionDetail.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.stoppage.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_ADD_FAULT,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.cancelStoppage.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置速度
+        setSpeed() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.setSpeed.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
index 6be66a90a..9aa3b8f94 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
@@ -19,473 +19,442 @@ import RouteHandControl from './dialog/routeHandControl';
 import RouteGuide from './dialog/routeGuide';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-import { mouseCancelState } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { querySignalStatus } from '@/api/simulation';
 
 export default {
-	name: 'SignalMenu',
-	components: {
-		PopMenu,
-		RouteControl,
-		RouteSelection,
-		RouteHandControl,
-		RouteDetail,
-		RouteGuide,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default: () => {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						label: '办理进路',
-						handler: this.arrangementRoute,
-						disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '办理引导进路',
-						handler: this.guide,
-						disabledCallback: MenuDisabledState.Signal.guide,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '取消进路',
-						handler: this.cancelTrainRoute,
-						disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '总人解', // 取消引导进路
-						handler: this.humanTrainRoute,
-						disabledCallback: MenuDisabledState.Signal.humanTrainRoute,
-						auth: { station: true, center: false }
-					},
-					// {
-					// 	label: '信号重开',
-					// 	handler: this.reopenSignal,
-					// 	disabledCallback: MenuDisabledState.Signal.reopenSignal,
-					// 	auth: { station: true, center: false }
-					// },
-					// {
-					// 	label: '信号封锁',
-					// 	handler: this.lock,
-					// 	disabledCallback: MenuDisabledState.Signal.lock,
-					// 	auth: { station: true, center: false }
-					// },
-					// {
-					// 	label: '信号解封',
-					// 	handler: this.unlock,
-					// 	disabledCallback: MenuDisabledState.Signal.unlock,
-					// 	auth: { station: true, center: false }
-					// },
-					{
-						label: '进路收人工控',
-						handler: this.humanControl,
-						disabledCallback: MenuDisabledState.Signal.humanControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '进路交自动控',
-						handler: this.atsAutoControl,
-						disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-						auth: { station: false, center: true }
-					}
-				],
-				central: [
-					{
-						label: '办理进路',
-						handler: this.arrangementRoute,
-						disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '办理引导进路',
-						handler: this.guide,
-						disabledCallback: MenuDisabledState.Signal.guide,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '取消进路',
-						handler: this.cancelTrainRoute,
-						disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '总人解',
-						handler: this.humanTrainRoute,
-						disabledCallback: MenuDisabledState.Signal.humanTrainRoute,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '信号重开',
-						handler: this.reopenSignal,
-						disabledCallback: MenuDisabledState.Signal.reopenSignal,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '信号封锁',
-						handler: this.lock,
-						disabledCallback: MenuDisabledState.Signal.lock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '信号解封',
-						handler: this.unlock,
-						disabledCallback: MenuDisabledState.Signal.unlock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '进路收人工控',
-						handler: this.humanControl,
-						disabledCallback: MenuDisabledState.Signal.humanControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '进路交自动控',
-						handler: this.atsAutoControl,
-						disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '查询进路控制状态',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.Signal.detail,
-						auth: { station: true, center: true }
-					}
-				]
-			},
-			menuForce: [
-				{
-					label: '信号关灯',
-					handler: this.signalClose,
-					disabledCallback: ''
-				},
-				{
-					label: '设置故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Signal.setStoppage
-				},
-				{
-					label: '取消故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Signal.cancelStoppage
-				}
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce];
-			}
+    name: 'SignalMenu',
+    components: {
+        PopMenu,
+        RouteControl,
+        RouteSelection,
+        RouteHandControl,
+        RouteDetail,
+        RouteGuide,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default: () => {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: '办理进路',
+                        handler: this.arrangementRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    },
+                    {
+                        label: '办理引导进路',
+                        handler: this.guide,
+                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+                    },
+                    {
+                        label: '取消进路',
+                        handler: this.cancelTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    },
+                    {
+                        label: '总人解', // 取消引导进路
+                        handler: this.humanTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+                    },
+                    {
+                        label: '进路收人工控',
+                        handler: this.humanControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                    },
+                    {
+                        label: '进路交自动控',
+                        handler: this.atsAutoControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                    }
+                ],
+                Center: [
+                    {
+                        label: '办理进路',
+                        handler: this.arrangementRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    },
+                    {
+                        label: '办理引导进路',
+                        handler: this.guide,
+                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+                    },
+                    {
+                        label: '取消进路',
+                        handler: this.cancelTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    },
+                    {
+                        label: '总人解',
+                        handler: this.humanTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+                    },
+                    {
+                        label: '信号重开',
+                        handler: this.reopenSignal,
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+                    },
+                    {
+                        label: '信号封锁',
+                        handler: this.lock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+                    },
+                    {
+                        label: '信号解封',
+                        handler: this.unlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                    },
+                    {
+                        label: '进路收人工控',
+                        handler: this.humanControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                    },
+                    {
+                        label: '进路交自动控',
+                        handler: this.atsAutoControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                    },
+                    {
+                        label: '查询进路控制状态',
+                        handler: this.detail,
+                        cmdType: ''
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '信号关灯',
+                    handler: this.signalClose,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+                },
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 信号关灯
+        signalClose() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT,
+                operation: OperationEvent.Signal.stoppage.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
 
-			this.menu = menuConvert(this.menu);
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT,
+                operation: OperationEvent.Signal.cancelStoppage.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
 
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 信号关灯
-		signalClose() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.signalClose.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.stoppage.menu.operation
-			};
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置进路
+        arrangementRoute() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.cancelStoppage.menu.operation
-			};
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeSelection.doShow(step.operation, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 进路引导
+        guide() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.guide.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeGuide.doShow(step.operation, this.selected, tempData);
+                    });
+                }
+            });
+        },
+        // 取消进路
+        cancelTrainRoute() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 总人解
+        humanTrainRoute() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 信号封锁
+        lock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.lock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置进路
-		arrangementRoute() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.arrangementRoute.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					var tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$refs.routeSelection.doShow(operate.operation, this.selected, tempData);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 进路引导
-		guide() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.guide.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					var tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$refs.routeGuide.doShow(operate.operation, this.selected, tempData);
-				}
-			});
-		},
-		// 取消进路
-		cancelTrainRoute() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 总人解
-		humanTrainRoute() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.humanTrainRoute.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 信号重开
-		reopenSignal() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.reopenSignal.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 信号封锁
-		lock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.lock.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 信号解封
-		unlock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.unlock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 进路交人工控
-		humanControl() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.humanControl.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
-				}
-			});
-		},
-		// 进路交自动控
-		atsAutoControl() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.atsAutoControl.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
-				}
-			});
-		},
-		// 查询进路状态
-		detail() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.detail.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeDetail.doShow(operate, this.selected, response.data);
-				}
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 信号解封
+        unlock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.unlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 进路交人工控
+        humanControl() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeHandControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            });
+        },
+        // 进路交自动控
+        atsAutoControl() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeHandControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            });
+        },
+        // 查询进路状态
+        detail() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeDetail.doShow(step, this.selected, tempData);
+                    });
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
index f865e6cc3..a3ff53939 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
@@ -8,149 +8,146 @@
 <script>
 import PopMenu from '@/components/PopMenu';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-import { mouseCancelState } from './utils/menuItemStatus';
 
 export default {
-	name: 'StationMenu',
-	components: {
-		PopMenu,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default: () => {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-				],
-				central: [
-				]
-			},
-			menuForce: [
-				{
-					label: '设置ZC故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Station.setStoppage
-				},
-				{
-					label: '取消ZC故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Station.cancelStoppage
-				}
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			this.menu = [];
-			if (this.selected.concentrateStationCode == this.selected.code) {
-				// 编辑模式菜单列表
-				this.menu = menuFiltration(this.menuNormal);
-				if (this.operatemode === OperateMode.ADMIN) {
-					this.menu = [...this.menu, ...this.menuForce];
-				}
-			}
+    name: 'StationMenu',
+    components: {
+        PopMenu,
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    props: {
+        selected: {
+            type: Object,
+            default: () => {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                local: [
+                ],
+                central: [
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置ZC故障',
+                    handler: this.setStoppage,
+                    disabledCallback: MenuDisabledState.Station.setStoppage
+                },
+                {
+                    label: '取消ZC故障',
+                    handler: this.cancelStoppage,
+                    disabledCallback: MenuDisabledState.Station.cancelStoppage
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            this.menu = [];
+            if (this.selected.concentrateStationCode == this.selected.code) {
+                // 编辑模式菜单列表
+                this.menu = menuFiltration(this.menuNormal);
+            }
 
-			if (this.selected.centralized) {
-				// 故障模式菜单列表
-				if (this.operatemode === OperateMode.FAULT) {
-					this.menu = [...this.menuForce];
-				}
-			}
+            if (this.selected.centralized) {
+                // 故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = [...this.menuForce];
+                }
+            }
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.stoppage.menu.operation
-			};
+            this.menu = menuConvert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+                operation: OperationEvent.Station.stoppage.menu.operation
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.cancelStoppage.menu.operation
-			};
+            this.mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		}
-	}
+                operation: OperationEvent.Station.cancelStoppage.menu.operation
+            };
+
+            this.mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue
index 6e394cecd..63f082d73 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStationControl.vue
@@ -5,65 +5,65 @@
 <script>
 import PopMenu from '@/components/PopMenu';
 import { mapGetters } from 'vuex';
-import { DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 
 export default {
-	name: 'StationControlMenu',
-	components: {
-		PopMenu
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: [
-			],
-			menuForce: [
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		doShow(point) {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		}
-	}
+    name: 'StationControlMenu',
+    components: {
+        PopMenu
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: [
+            ],
+            menuForce: [
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        doShow(point) {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
index 1ca52fccf..6e2a69cca 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
@@ -13,333 +13,321 @@ import StandControl from './dialog/standControl';
 import StandDetail from './dialog/standDetail';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-import { mouseCancelState } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import Handler from '@/scripts/cmdPlugin/Handler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
-	name: 'StationStandMenu',
-	components: {
-		PopMenu,
-		StandControl,
-		StandDetail,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default: () => {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						label: '设置跳停',
-						handler: this.setJumpStop,
-						disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '取消跳停',
-						handler: this.cancelJumpStop,
-						disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-						auth: { station: true, center: true }
-					}
-				],
-				central: [
-					{
-						label: '设置扣车',
-						handler: this.setDetainTrain,
-						disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '取消扣车',
-						handler: this.cancelDetainTrain,
-						disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设置跳停',
-						handler: this.setJumpStop,
-						disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '取消跳停',
-						handler: this.cancelJumpStop,
-						disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设置停站时间',
-						handler: this.setStopTime,
-						disabledCallback: MenuDisabledState.StationStand.setStopTime,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设置站间运行等级',
-						handler: this.setRunLevel,
-						disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '属性',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.StationStand.detail,
-						auth: { station: true, center: true }
-					}
-				]
-			},
-			menuForce: [
-				{
-					label: '设置故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.StationStand.setStoppage
-				},
-				{
-					label: '取消故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.StationStand.cancelStoppage
-				}
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce];
-			}
+    name: 'StationStandMenu',
+    components: {
+        PopMenu,
+        StandControl,
+        StandDetail,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default: () => {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: '设置跳停',
+                        handler: this.setJumpStop,
+                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
+                    },
+                    {
+                        label: '取消跳停',
+                        handler: this.cancelJumpStop,
+                        cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+                    }
+                ],
+                Center: [
+                    {
+                        label: '设置扣车',
+                        handler: this.setDetainTrain,
+                        cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+                    },
+                    {
+                        label: '取消扣车',
+                        handler: this.cancelDetainTrain,
+                        cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    },
+                    {
+                        label: '设置跳停',
+                        handler: this.setJumpStop,
+                        cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+                    },
+                    {
+                        label: '取消跳停',
+                        handler: this.cancelJumpStop,
+                        cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+                    },
+                    {
+                        label: '设置停站时间',
+                        handler: this.setStopTime,
+                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+                    },
+                    {
+                        label: '设置站间运行等级',
+                        handler: this.setRunLevel,
+                        cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
+                    },
+                    {
+                        label: '属性',
+                        handler: this.detail,
+                        cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Stand.CMD_STAND_ADD_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.stoppage.menu.operation
-			};
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.stoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_ADD_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelStoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.cancelStoppage.menu.operation
-			};
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置扣车
+        setDetainTrain() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置扣车
-		setDetainTrain() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.setDetainTrain.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 取消扣车
-		cancelDetainTrain() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 设置跳停
-		setJumpStop() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.setJumpStop.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 取消跳停
-		cancelJumpStop() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.cancelJumpStop.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 停站时间控制
-		setStopTime() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.setStopTime.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempDate = null;
-					if (response) {
-						tempDate = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standControl.doShow(operate, this.selected, tempDate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置运行等级
-		setRunLevel() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.setRunLevel.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempDate = null;
-					if (response) {
-						tempDate = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standControl.doShow(operate, this.selected, tempDate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 查询站台状态
-		detail() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.StationStand.type,
-				label: MapDeviceType.StationStand.label,
-				operation: OperationEvent.StationStand.detail.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempDate = null;
-					if (response) {
-						tempDate = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.standDetail.doShow(operate, this.selected, tempDate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置跳停
+        setJumpStop() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 停站时间控制
+        setStopTime() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置运行等级
+        setRunLevel() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 查询站台状态
+        detail() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.detail.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standDetail.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
index e12a1e0ce..6a0a78562 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
@@ -12,442 +12,322 @@ import PopMenu from '@/components/PopMenu';
 import SectionControl from './dialog/sectionControl';
 import SwitchControl from './dialog/switchControl';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-import { mouseCancelState } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
-	name: 'SwitchMenu',
-	components: {
-		PopMenu,
-		SectionControl,
-		SwitchControl,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default: () => {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					// {
-					// 	label: '单操到定位',
-					// 	handler: this.locate,
-					// 	disabledCallback: MenuDisabledState.Switch.locate,
-					// 	auth: { station: true, center: true }
-					// },
-					// {
-					// 	label: '单操到反位',
-					// 	handler: this.reverse,
-					// 	disabledCallback: MenuDisabledState.Switch.reverse,
-					// 	auth: { station: true, center: true }
-					// },
-					// {
-					// 	label: '道岔单锁',
-					// 	handler: this.lock,
-					// 	disabledCallback: MenuDisabledState.Switch.lock,
-					// 	auth: { station: true, center: false }
-					// },
-					// {
-					// 	label: '道岔解锁',
-					// 	handler: this.unlock,
-					// 	disabledCallback: MenuDisabledState.Switch.unlock,
-					// 	auth: { station: true, center: true }
-					// },
-					// {
-					// 	label: '道岔封锁',
-					// 	handler: this.block,
-					// 	disabledCallback: MenuDisabledState.Switch.block,
-					// 	auth: { station: true, center: true }
-					// },
-					// {
-					// 	label: '道岔解封',
-					// 	handler: this.unblock,
-					// 	disabledCallback: MenuDisabledState.Switch.unblock,
-					// 	auth: { station: true, center: true }
-					// }
-				],
-				central: [
-					{
-						label: '单操到定位',
-						handler: this.locate,
-						disabledCallback: MenuDisabledState.Switch.locate,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '单操到反位',
-						handler: this.reverse,
-						disabledCallback: MenuDisabledState.Switch.reverse,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '道岔单锁',
-						handler: this.lock,
-						disabledCallback: MenuDisabledState.Switch.lock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '道岔解锁',
-						handler: this.unlock,
-						disabledCallback: MenuDisabledState.Switch.unlock,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '道岔封锁',
-						handler: this.block,
-						disabledCallback: MenuDisabledState.Switch.block,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '道岔解封',
-						handler: this.unblock,
-						disabledCallback: MenuDisabledState.Switch.unblock,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '区故解',
-						handler: this.fault,
-						disabledCallback: MenuDisabledState.Switch.fault,
-						auth: { station: true, center: true }
-					}
-					// {
-					// 	label: '属性',
-					// 	handler: this.undeveloped,
-					// 	disabledCallback: MenuDisabledState.Switch.property,
-					// 	auth: { station: true, center: true }
-					// }
-				]
-			},
-			menuForce: [
-				{
-					label: '设置故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Switch.setStoppage,
-					auth: {
+    name: 'SwitchMenu',
+    components: {
+        PopMenu,
+        SectionControl,
+        SwitchControl,
+        NoticeInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    props: {
+        selected: {
+            type: Object,
+            default: () => {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [],
+                Center: [
+                    {
+                        label: '单操到定位',
+                        handler: this.locate,
+                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                    },
+                    {
+                        label: '单操到反位',
+                        handler: this.reverse,
+                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                    },
+                    {
+                        label: '道岔单锁',
+                        handler: this.lock,
+                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: '道岔解锁',
+                        handler: this.unlock,
+                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+                    },
+                    {
+                        label: '道岔封锁',
+                        handler: this.block,
+                        cmdType: CMD.Switch.CMD_SWITCH_BLOCK
+                    },
+                    {
+                        label: '道岔解封',
+                        handler: this.unblock,
+                        cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
+                    },
+                    {
+                        label: '区故解',
+                        handler: this.fault,
+                        cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
+                    }
+                    // {
+                    // 	label: '属性',
+                    // 	handler: this.undeveloped,
+                    // 	auth: { station: true, center: true },
+                    //  cmdType: CMD.Switch.
+                    // }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
-					}
-				},
-				{
-					label: '取消故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Switch.cancelStoppage,
-					auth: {
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
 
-					}
-				}
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce];
-			}
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.stoppage.menu.operation,
+                cmdType: CMD.Switch.CMD_STOPPAGE,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
+            // mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.cancelStoppage.menu.operation,
+                cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.stoppage.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.cancelStoppage.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔单锁
-		lock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.lock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.unlock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.block.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.unblock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔强扳
-		switchTurnoutForce() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.turnoutForce.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔转动
-		switchTurnout() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.turnout.menu.operation
-			};
-
-			if (operate.operation) {
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.fault.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔取消速度
-		cancelSpeed() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.cancelSpeed.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					const tempData = response.data;
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
-				}
-			});
-		},
-
-		// 区段切除
-		split() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.split.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.active.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.locate.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.reverse.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		undeveloped() {
-			this.doClose();
-			this.$alert('实现中......', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-				}
-			});
-		}
-	}
+            // mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 道岔单锁
+        lock() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.lock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔解锁
+        unlock() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.unlock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔封锁
+        block() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.block.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔解封
+        unblock() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.unblock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔故障解锁/ 区故解
+        fault() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.fault.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段激活
+        active() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.active.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 单操到定位
+        locate() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.locate.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 单操到反位
+        reverse() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.Switch.reverse.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTool.vue b/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
index 8c96fd532..4048cba5d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
@@ -20,136 +20,136 @@
 </template>
 <script>
 // import { mapGetters } from 'vuex';
-// import { MapDeviceType, TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-// import { OperateMode } from '@/scripts/ConstDic';
+// import { TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+// import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
 import { prefixIntrger } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
 export default {
-	name: 'MenuTool',
-	components: {
-		SystemTime
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			logoImg: logo_,
-			time: '00:0000',
-			tools: [
-				{
-					title: '服务器1',
-					operate: '',
-					src: logo_,
-					click: this.undeveloped
-				},
-				{
-					title: '服务器2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '前置机1',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '前置机2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '主调',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台1',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台3',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '大屏',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '维护工作站',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '运行图显示人工站',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '跳停',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '扣车',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '列车报警',
-					operate: '',
-					src: logo_,
-					click: this.undeveloped
-				}
-			]
-		};
-	},
-	computed: {
-		isShowSystemTime() {
-			return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-		}
-	},
-	watch: {
-		'$store.state.training.initTime': function (initTime) {
-			const date = new Date(initTime);
-			this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
-		}
-	},
-	mounted() {
-		this.initTools();
-	},
-	methods: {
-		initTools() {
-			this.tools = [];
-		}
-	}
+    name: 'MenuTool',
+    components: {
+        SystemTime
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            logoImg: logo_,
+            time: '00:0000',
+            tools: [
+                {
+                    title: '服务器1',
+                    operate: '',
+                    src: logo_,
+                    click: this.undeveloped
+                },
+                {
+                    title: '服务器2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '前置机1',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '前置机2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '主调',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台1',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台3',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '大屏',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '维护工作站',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '运行图显示人工站',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '跳停',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '扣车',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '列车报警',
+                    operate: '',
+                    src: logo_,
+                    click: this.undeveloped
+                }
+            ]
+        };
+    },
+    computed: {
+        isShowSystemTime() {
+            return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
+        }
+    },
+    watch: {
+        '$store.state.training.initTime': function (initTime) {
+            const date = new Date(initTime);
+            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+        }
+    },
+    mounted() {
+        this.initTools();
+    },
+    methods: {
+        initTools() {
+            this.tools = [];
+        }
+    }
 };
 </script>
 
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index 0e9da652a..8a6ebf24d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -15,390 +15,376 @@
 import PopMenu from '@/components/PopMenu';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
 import TrainControl from './dialog/trainControl';
-// import TrainDelete from './dialog/trainDelete';
-// import TrainMove from './dialog/trainMove';
-// import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
 import TrainMoveNumber from './dialog/trainMoveNumber';
 import TrainCreateNumber from './dialog/trainCreateNumber';
 import TrainDeleteNumber from './dialog/trainDeleteNumber';
 import TrainDetailInfo from './dialog/trainDetailInfo';
-import { mouseCancelState } from './utils/menuItemStatus';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
 export default {
-	name: 'MenuTrain',
-	components: {
-		PopMenu,
-		NoticeInfo,
-		TrainControl,
-		TrainEditNumber,
-		TrainMoveNumber,
-		TrainCreateNumber,
-		TrainDeleteNumber,
-		TrainDetailInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [],
-				central: [
-					{
-						label: '新建车组号',
-						handler: this.createTrainNo,
-						disabledCallback: MenuDisabledState.Train.createTrainNo,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '移动车组号',
-						handler: this.moveTrainNo,
-						disabledCallback: MenuDisabledState.Train.moveTrainNo,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '删除车组号',
-						handler: this.deleteTrainNo,
-						disabledCallback: MenuDisabledState.Train.deleteTrainNo,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '修改车组号',
-						handler: this.editTrainNo,
-						disabledCallback: MenuDisabledState.Train.editTrainNo,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设计划车',
-						handler: this.setPlanTrainId,
-						disabledCallback: MenuDisabledState.Train.setPlanTrainId,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设目的地',
-						handler: this.destinationTrainId,
-						disabledCallback: MenuDisabledState.Train.destinationTrainId,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设人工车',
-						handler: this.artificialTrainId,
-						disabledCallback: MenuDisabledState.Train.artificialTrainId,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设特殊人工车',
-						handler: this.undeveloped,
-						disabledCallback: MenuDisabledState.Train.moveTrainId,
-						auth: { station: true, center: true}
-					},
-					{
-						label: '详细列车信息',
-						handler: this.detailTrainInfo,
-						disabledCallback: MenuDisabledState.Train.detailTrainInfo,
-						auth: { station: true, center: true}
-					},
-					{
-						label: '属性',
-						handler: this.undeveloped,
-						disabledCallback: MenuDisabledState.Train.moveTrainId,
-						auth: { station: true, center: true}
-					}
+    name: 'MenuTrain',
+    components: {
+        PopMenu,
+        NoticeInfo,
+        TrainControl,
+        TrainEditNumber,
+        TrainMoveNumber,
+        TrainCreateNumber,
+        TrainDeleteNumber,
+        TrainDetailInfo
+    },
+    mixins: [
+        CancelMouseState
+    ],
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                local: [],
+                central: [
+                    {
+                        label: '新建车组号',
+                        handler: this.createTrainNo,
+                        disabledCallback: MenuDisabledState.Train.createTrainNo,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '移动车组号',
+                        handler: this.moveTrainNo,
+                        disabledCallback: MenuDisabledState.Train.moveTrainNo,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '删除车组号',
+                        handler: this.deleteTrainNo,
+                        disabledCallback: MenuDisabledState.Train.deleteTrainNo,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '修改车组号',
+                        handler: this.editTrainNo,
+                        disabledCallback: MenuDisabledState.Train.editTrainNo,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '设计划车',
+                        handler: this.setPlanTrainId,
+                        disabledCallback: MenuDisabledState.Train.setPlanTrainId,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '设目的地',
+                        handler: this.destinationTrainId,
+                        disabledCallback: MenuDisabledState.Train.destinationTrainId,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '设人工车',
+                        handler: this.artificialTrainId,
+                        disabledCallback: MenuDisabledState.Train.artificialTrainId,
+                        auth: { station: true, center: true }
+                    },
+                    {
+                        label: '设特殊人工车',
+                        handler: this.undeveloped,
+                        disabledCallback: MenuDisabledState.Train.moveTrainId,
+                        auth: { station: true, center: true}
+                    },
+                    {
+                        label: '详细列车信息',
+                        handler: this.detailTrainInfo,
+                        disabledCallback: MenuDisabledState.Train.detailTrainInfo,
+                        auth: { station: true, center: true}
+                    },
+                    {
+                        label: '属性',
+                        handler: this.undeveloped,
+                        disabledCallback: MenuDisabledState.Train.moveTrainId,
+                        auth: { station: true, center: true}
+                    }
 
-				]
-			},
-			menuForce: [
-				{
-					label: '设置通信故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Train.setStoppage
-				},
-				{
-					label: '取消通信故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Train.cancelStoppage
-				}
-			],
-			menuSpeed: [
-				{
-					label: '确认运行至前方站',
-					handler: this.limitSpeed,
-					disabledCallback: MenuDisabledState.Train.limitSpeed
-				}
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function () {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = trainMenuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
-			}
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置通信故障',
+                    handler: this.setStoppage,
+                    disabledCallback: MenuDisabledState.Train.setStoppage
+                },
+                {
+                    label: '取消通信故障',
+                    handler: this.cancelStoppage,
+                    disabledCallback: MenuDisabledState.Train.cancelStoppage
+                }
+            ],
+            menuSpeed: [
+                {
+                    label: '确认运行至前方站',
+                    handler: this.limitSpeed,
+                    disabledCallback: MenuDisabledState.Train.limitSpeed
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function () {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = trainMenuFiltration(this.menuNormal);
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = [...this.menuForce, ...this.menuSpeed];
-			}
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = [...this.menuForce, ...this.menuSpeed];
+            }
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
+            this.menu = menuConvert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
 
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.stoppage.menu.operation
-			};
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.cancelStoppage.menu.operation
-			};
+                operation: OperationEvent.Train.stoppage.menu.operation
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 限速行驶
-		limitSpeed() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.limitSpeed.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设计划车
-		setPlanTrainId() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.setPlanTrainId.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainControl.doShow(operate, this.selected);
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			});
-		},
-		// 设目的地车
-		destinationTrainId() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.destinationTrainId.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainControl.doShow(operate, this.selected);
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			});
-		},
-		// 设人工车
-		artificialTrainId() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.artificialTrainId.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainControl.doShow(operate, this.selected);
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			});
-		},
-		// 详细列车信息
-		detailTrainInfo() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.detailTrainInfo.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainDetailInfo.doShow(operate, this.selected);
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			});
-		},
-		// 创建车组号
-		createTrainNo() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.createTrainNo.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainCreateNumber.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 删除车组号
-		deleteTrainNo() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.deleteTrainNo.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainDeleteNumber.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 修改车组号
-		editTrainNo() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.editTrainNo.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainEditNumber.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 移动车组号
-		moveTrainNo() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Train.type,
-				label: MapDeviceType.Train.label,
-				operation: OperationEvent.Train.moveTrainNo.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainMoveNumber.doShow(operate, this.selected);
-				}
-			});
-		},
-		undeveloped() {
-			this.doClose();
-			this.$alert('实现中......', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-				}
-			});
-		}
-	}
+            this.mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.cancelStoppage.menu.operation
+            };
+
+            this.mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 限速行驶
+        limitSpeed() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.limitSpeed.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设计划车
+        setPlanTrainId() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.setPlanTrainId.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainControl.doShow(operate, this.selected);
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            });
+        },
+        // 设目的地车
+        destinationTrainId() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.destinationTrainId.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainControl.doShow(operate, this.selected);
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            });
+        },
+        // 设人工车
+        artificialTrainId() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.artificialTrainId.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainControl.doShow(operate, this.selected);
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            });
+        },
+        // 详细列车信息
+        detailTrainInfo() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.detailTrainInfo.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDetailInfo.doShow(operate, this.selected);
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            });
+        },
+        // 创建车组号
+        createTrainNo() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.createTrainNo.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainCreateNumber.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 删除车组号
+        deleteTrainNo() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.deleteTrainNo.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDeleteNumber.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 修改车组号
+        editTrainNo() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.editTrainNo.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainEditNumber.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 移动车组号
+        moveTrainNo() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+
+                operation: OperationEvent.Train.moveTrainNo.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainMoveNumber.doShow(operate, this.selected);
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
index 268e5011f..593a2079d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
@@ -77,7 +77,7 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
     export default {
         name: 'AlarmDetail',
@@ -173,7 +173,7 @@
                     operation: OperationEvent.Command.close.alarm.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
                         this.doClose();
@@ -185,7 +185,7 @@
                     type: this.operate.type,
                     operation: OperationEvent.Command.close.alarm.operation,
                 }
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
                         this.doClose();
@@ -211,4 +211,4 @@
         padding-left: 12px;
         text-align: left;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue
index 1e0175452..e41fd259b 100644
--- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/control.vue
@@ -42,7 +42,9 @@
 
 <script>
     import { mapGetters } from 'vuex';
-    import { MapDeviceType, TrainingMode, OperationEvent, getDomIdByOperation, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import { TrainingMode } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+    import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
     import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
     export default {
@@ -179,12 +181,12 @@
 
                 let operate = {
                     start: true,
-                    type: MapDeviceType.StationControl.type,
+
                     operation: OperationEvent.StationControl.controlResponse.menu.operation,
                 };
 
                 this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -216,12 +218,12 @@
                 this.selection = selection;
                 if (selection && selection.length) {
                     let operate = {
-                        type: MapDeviceType.StationControl.type,
+
                         operation: OperationEvent.StationControl.controlResponse.choose.operation,
                         val: this.serializeCodeListWithSeparator('::'),
                     }
 
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -234,7 +236,7 @@
                 let operate = {
                     send: true,
                     over: true,
-                    type: MapDeviceType.StationControl.type,
+
                     operation: OperationEvent.StationControl.controlResponse.agree.operation,
                     val: this.selection[0].code,
                     prdType: this.$store.state.training.prdType
@@ -242,7 +244,7 @@
 
                 this.clearTimer();
                 this.disabledAgree = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.doClose();
@@ -255,7 +257,7 @@
                 let operate = {
                     send: true,
                     over: true,
-                    type: MapDeviceType.StationControl.type,
+
                     operation: OperationEvent.StationControl.controlResponse.refuse.operation,
                     val: this.tableData[0].code,
                     prdType: this.$store.state.training.prdType
@@ -263,7 +265,7 @@
 
                 this.clearTimer();
                 this.disabledAgree = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
@@ -282,4 +284,4 @@
         line-height: 30px;
         font-size: 18px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
index 91cb2849d..8f4b63599 100644
--- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
     export default {
         name: 'CmdNotice',
         data() {
@@ -78,7 +78,7 @@
                     operation: OperationEvent.Command.close.notice.operation,
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
                         this.doClose();
@@ -90,7 +90,7 @@
                     type: this.operate.type,
                     operation: OperationEvent.Command.close.notice.operation,
                 }
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
                         this.doClose();
@@ -103,4 +103,4 @@
         }
     }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js b/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js
index c1f62d7f4..bb63524dd 100644
--- a/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js
+++ b/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js
@@ -3,456 +3,456 @@ import deviceState from '@/jmap/constant/deviceState';
 import { OperateMode } from '@/scripts/ConstDic';
 
 export function getCurrentStateObject() {
-	return store.getters['menuOperation/selected'];
+    return store.getters['menuOperation/selected'];
 }
 
 /** 系统类型 */
-export const SystemType = {
-	'01': 'local',		// 现地工作站
-	'02': 'central'		// 中心调度工作站
+export const State2SimulationMap = {
+    '01': 'local',		// 现地工作站
+    '02': 'central'		// 中心调度工作站
 };
 
-export const StationControlType = {
-	'01': 'center', 	// 中控
-	'02': 'station',	// 站控
-	'03': 'station'
+export const State2ControlMap = {
+    '01': 'center', 	// 中控
+    '02': 'station',	// 站控
+    '03': 'station'
 };
 
 // 控制禁用
 export const MenuDisabledState = {
-	Section: {
-		// 故障解锁
-		fault() {
-		},
-		// 切除
-		split() {
-			const device = getCurrentStateObject();
-			if (device && device.cutOff != deviceState.Section.cutOff.Default) {
-				return true;
-			}
-		},
-		// 激活
-		active() {
-			const device = getCurrentStateObject();
-			if (device && device.cutOff == deviceState.Section.cutOff.Default) {
-				return true;
-			}
-		},
-		// 区段封锁
-		lock() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.Section.status.State06) {
-				return true;
-			}
-		},
-		// 区段解禁
-		unlock() {
-			const device = getCurrentStateObject();
-			if (device && device.status != deviceState.Section.status.State06) {
-				return true;
-			}
-		},
-		// 区段设置限速
-		setSpeed() {
-		},
-		// 区段取消限速
-		cancelSpeed() {
-			const device = getCurrentStateObject();
-			if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) {
-				return true;
-			}
-		},
-		// 新建列车
-		newTrain() {
-		},
-		// 计轴预复位
-		axlePreReset() {
-		},
-		// 设置计轴有效
-		alxeEffective() {
-		},
-		// 设置计轴失效
-		alxeFailure() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.Section.status.State13) {
-				return true;
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		}
-	},
-	Signal: {
-		// 进路选排
-		arrangementRoute() {
+    Section: {
+        // 故障解锁
+        fault() {
+        },
+        // 切除
+        split() {
+            const device = getCurrentStateObject();
+            if (device && device.cutOff != deviceState.Section.cutOff.Default) {
+                return true;
+            }
+        },
+        // 激活
+        active() {
+            const device = getCurrentStateObject();
+            if (device && device.cutOff == deviceState.Section.cutOff.Default) {
+                return true;
+            }
+        },
+        // 区段封锁
+        lock() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Section.status.State06) {
+                return true;
+            }
+        },
+        // 区段解禁
+        unlock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Section.status.State06) {
+                return true;
+            }
+        },
+        // 区段设置限速
+        setSpeed() {
+        },
+        // 区段取消限速
+        cancelSpeed() {
+            const device = getCurrentStateObject();
+            if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) {
+                return true;
+            }
+        },
+        // 新建列车
+        newTrain() {
+        },
+        // 计轴预复位
+        axlePreReset() {
+        },
+        // 设置计轴有效
+        alxeEffective() {
+        },
+        // 设置计轴失效
+        alxeFailure() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Section.status.State13) {
+                return true;
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Signal: {
+        // 进路选排
+        arrangementRoute() {
 
-		},
-		// 进路取消
-		cancelTrainRoute() {
-		},
-		// 信号封闭
-		lock() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.Signal.status.State05) {
-				return true;
-			}
-		},
-		// 信号解封
-		unlock() {
-			const device = getCurrentStateObject();
-			if (device && device.status != deviceState.Signal.status.State05) {
-				return true;
-			}
-		},
-		// 信号重开
-		reopenSignal() {
-		},
-		// 进路引导
-		guide() {
-		},
-		// 设置联锁自动进路
-		setAutoInterlock() {
-		},
-		// 取消联锁自动进路
-		cancelAutoInterlock() {
-		},
-		// 设置联锁自动触发
-		setAutoTrigger() {
-		},
-		// 取消联锁自动触发
-		cancelAutoTrigger() {
-		},
-		// 关灯
-		signalClose() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.Signal.status.State01) {
-				return true;
-			}
-		},
-		// 总人解
-		humanTrainRoute() {
-		},
-		// 人工控
-		humanControl() {
-		},
-		// ats自动控
-		atsAutoControl() {
-		},
-		// 查询进路状态
-		detail() {
-		},
-		// 设置故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		}
-	},
-	Station: {
-		// 全站设置联锁自动触发
-		setAutoTrigger() {
-		},
-		// 全站取消联锁自动触发
-		cancelAutoTrigger() {
-		},
-		// 上电解锁
-		powerUnLock() {
-		},
-		// 执行关键操作测试
-		execKeyOperationTest() {
-		},
-		// 所有进路自排开
-		atsAutoControlALL() {
-		},
-		// 所有进路自排关
-		humanControlALL() {
-		},
-		// 设置ZC故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消ZC故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		}
-	},
-	StationControl: {
-		// 紧急站控
-		emergencyStationControl() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.StationControl.status.State03) {
-				return true;
-			}
-		},
-		// 请求站控
-		requestStationControl() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.StationControl.status.State02) {
-				return true;
-			}
-		},
-		// 强行站控
-		forcedStationControl() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.StationControl.status.State02) {
-				return true;
-			}
-		},
-		// 请求中控
-		requestCentralControl() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.StationControl.status.State01) {
-				return true;
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		}
-	},
-	StationStand: {
-		// 设置扣车
-		setDetainTrain() {
-			const device = getCurrentStateObject();
-			if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) {
-				return true;
-			}
-		},
-		// 取消扣车
-		cancelDetainTrain() {
-			const device = getCurrentStateObject();
-			if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
-				return true;
-			}
-		},
-		// 强制取消扣车
-		cancelDetainTrainForce() {
-			const device = getCurrentStateObject();
-			if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
-				return true;
-			}
-		},
-		// 设置全站扣车
-		cancelDetainTrainAll() {
-		},
-		// 设置运行等级
-		setRunLevel() {
-		},
-		// 设置停站时间
-		setStopTime() {
-		},
-		// 设置跳停
-		setJumpStop() {
-			const device = getCurrentStateObject();
-			if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) {
-				return true;
-			}
-		},
-		// 取消跳停
-		cancelJumpStop() {
-			const device = getCurrentStateObject();
-			if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) {
-				return true;
-			}
-		},
-		// 提前发车
-		earlyDeparture() {
-		},
-		// 站台详细信息
-		detail() {
-		},
-		// 设置折返策略
-		setBackStrategy() {
-		},
-		// 设置故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		}
-	},
-	Switch: {
-		// 单锁
-		lock() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.Switch.status.State10) {
-				return true;
-			}
-		},
-		// 解锁
-		unlock() {
-			const device = getCurrentStateObject();
-			if (device && device.status != deviceState.Switch.status.State10) {
-				return true;
-			}
-		},
-		// 封锁
-		block() {
-			const device = getCurrentStateObject();
-			if (device && device.status == deviceState.Switch.status.State14) {
-				return true;
-			}
-		},
-		// 解封
-		unblock() {
-			const device = getCurrentStateObject();
-			if (device && device.status != deviceState.Switch.status.State14) {
-				return true;
-			}
-		},
-		// 强扳
-		switchTurnoutForce() {
-		},
-		// 转动
-		switchTurnout() {
-		},
-		// 道岔故障解锁
-		fault() {
-		},
-		// 计轴预复位
-		axlePreReset() {
-		},
-		// 道岔切除
-		split() {
-		},
-		// 道岔激活
-		active() {
-		},
-		// 道岔设置速度
-		setSpeed() {
-			// const device = getCurrentStateObject();
-		},
-		// 设置计轴有效
-		alxeEffective() {
-		},
-		// 道岔取消速度
-		cancelSpeed() {
-		},
-		// 设置故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		},
-		// 单操到定位
-		locate() {
-		},
-		// 单操到反位
-		reverse() {
-		},
-		// 属性
-		property() {
-		}
-	},
-	Train: {
-		// 添加列车识别号
-		addTrainId() {
-		},
-		// 删除列车识别号
-		delTrainId() {
-		},
-		// 修改列车识别号
-		editTrainId() {
-		},
-		// 修改车组号
-		editTrainNo() {
-		},
-		// 创建车组号
-		createTrainNo() {
-		},
-		// 移动车组号
-		moveTrainNo() {
-		},
-		// 删除车组号
-		deleteTrainNo() {
-		},
-		// 移动列车识别号
-		moveTrainId() {
-		},
-		// 交换列车识别号
-		switchTrainId() {
-		},
-		// 设计划车
-		setPlanTrainId() {
-		},
-		// 设目的地车
-		destinationTrainId() {
-		},
-		// 设人工车
-		artificialTrainId() {
-		},
-		// 详细列车信息
-		detailTrainInfo() {
-		},
-		// 设置限速
-		limitSpeed() {
-		},
-		// 设置通信故障
-		setStoppage() {
-			const device = getCurrentStateObject();
-			if (device && device.fault) {
-				return true;
-			}
-		},
-		// 取消通信故障
-		cancelStoppage() {
-			const device = getCurrentStateObject();
-			if (device && !device.fault) {
-				return true;
-			}
-		}
-	}
+        },
+        // 进路取消
+        cancelTrainRoute() {
+        },
+        // 信号封闭
+        lock() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Signal.status.State05) {
+                return true;
+            }
+        },
+        // 信号解封
+        unlock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Signal.status.State05) {
+                return true;
+            }
+        },
+        // 信号重开
+        reopenSignal() {
+        },
+        // 进路引导
+        guide() {
+        },
+        // 设置联锁自动进路
+        setAutoInterlock() {
+        },
+        // 取消联锁自动进路
+        cancelAutoInterlock() {
+        },
+        // 设置联锁自动触发
+        setAutoTrigger() {
+        },
+        // 取消联锁自动触发
+        cancelAutoTrigger() {
+        },
+        // 关灯
+        signalClose() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Signal.status.State01) {
+                return true;
+            }
+        },
+        // 总人解
+        humanTrainRoute() {
+        },
+        // 人工控
+        humanControl() {
+        },
+        // ats自动控
+        atsAutoControl() {
+        },
+        // 查询进路状态
+        detail() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Station: {
+        // 全站设置联锁自动触发
+        setAutoTrigger() {
+        },
+        // 全站取消联锁自动触发
+        cancelAutoTrigger() {
+        },
+        // 上电解锁
+        powerUnLock() {
+        },
+        // 执行关键操作测试
+        execKeyOperationTest() {
+        },
+        // 所有进路自排开
+        atsAutoControlALL() {
+        },
+        // 所有进路自排关
+        humanControlALL() {
+        },
+        // 设置ZC故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消ZC故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    StationControl: {
+        // 紧急站控
+        emergencyStationControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State03) {
+                return true;
+            }
+        },
+        // 请求站控
+        requestStationControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State02) {
+                return true;
+            }
+        },
+        // 强行站控
+        forcedStationControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State02) {
+                return true;
+            }
+        },
+        // 请求中控
+        requestCentralControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State01) {
+                return true;
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    StationStand: {
+        // 设置扣车
+        setDetainTrain() {
+            const device = getCurrentStateObject();
+            if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) {
+                return true;
+            }
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const device = getCurrentStateObject();
+            if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
+                return true;
+            }
+        },
+        // 强制取消扣车
+        cancelDetainTrainForce() {
+            const device = getCurrentStateObject();
+            if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
+                return true;
+            }
+        },
+        // 设置全站扣车
+        cancelDetainTrainAll() {
+        },
+        // 设置运行等级
+        setRunLevel() {
+        },
+        // 设置停站时间
+        setStopTime() {
+        },
+        // 设置跳停
+        setJumpStop() {
+            const device = getCurrentStateObject();
+            if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) {
+                return true;
+            }
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            const device = getCurrentStateObject();
+            if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) {
+                return true;
+            }
+        },
+        // 提前发车
+        earlyDeparture() {
+        },
+        // 站台详细信息
+        detail() {
+        },
+        // 设置折返策略
+        setBackStrategy() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Switch: {
+        // 单锁
+        lock() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Switch.status.State10) {
+                return true;
+            }
+        },
+        // 解锁
+        unlock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Switch.status.State10) {
+                return true;
+            }
+        },
+        // 封锁
+        block() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Switch.status.State14) {
+                return true;
+            }
+        },
+        // 解封
+        unblock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Switch.status.State14) {
+                return true;
+            }
+        },
+        // 强扳
+        switchTurnoutForce() {
+        },
+        // 转动
+        switchTurnout() {
+        },
+        // 道岔故障解锁
+        fault() {
+        },
+        // 计轴预复位
+        axlePreReset() {
+        },
+        // 道岔切除
+        split() {
+        },
+        // 道岔激活
+        active() {
+        },
+        // 道岔设置速度
+        setSpeed() {
+            // const device = getCurrentStateObject();
+        },
+        // 设置计轴有效
+        alxeEffective() {
+        },
+        // 道岔取消速度
+        cancelSpeed() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        },
+        // 单操到定位
+        locate() {
+        },
+        // 单操到反位
+        reverse() {
+        },
+        // 属性
+        property() {
+        }
+    },
+    Train: {
+        // 添加列车识别号
+        addTrainId() {
+        },
+        // 删除列车识别号
+        delTrainId() {
+        },
+        // 修改列车识别号
+        editTrainId() {
+        },
+        // 修改车组号
+        editTrainNo() {
+        },
+        // 创建车组号
+        createTrainNo() {
+        },
+        // 移动车组号
+        moveTrainNo() {
+        },
+        // 删除车组号
+        deleteTrainNo() {
+        },
+        // 移动列车识别号
+        moveTrainId() {
+        },
+        // 交换列车识别号
+        switchTrainId() {
+        },
+        // 设计划车
+        setPlanTrainId() {
+        },
+        // 设目的地车
+        destinationTrainId() {
+        },
+        // 设人工车
+        artificialTrainId() {
+        },
+        // 详细列车信息
+        detailTrainInfo() {
+        },
+        // 设置限速
+        limitSpeed() {
+        },
+        // 设置通信故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消通信故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    }
 };
 
 /**
@@ -460,21 +460,21 @@ export const MenuDisabledState = {
  * @param {Array} menu
  */
 export function menuConvert(menu) {
-	if (menu.constructor === Array) {
-		menu.forEach(elem => {
-			if (elem.type === 'separator') {
-				elem.show = true;
-				return;
-			}
-			if (elem.disabledCallback.constructor === Function) {
-				// elem.disabled = elem.defaultDisabled;
-				if (!elem.defaultDisabled) {
-					elem.disabled = elem.disabledCallback();
-				}
-			}
-		});
-	}
-	return menu;
+    if (menu.constructor === Array) {
+        menu.forEach(elem => {
+            if (elem.type === 'separator') {
+                elem.show = true;
+                return;
+            }
+            if (elem.disabledCallback.constructor === Function) {
+                // elem.disabled = elem.defaultDisabled;
+                if (!elem.defaultDisabled) {
+                    elem.disabled = elem.disabledCallback();
+                }
+            }
+        });
+    }
+    return menu;
 }
 
 /**
@@ -482,39 +482,39 @@ export function menuConvert(menu) {
  * @param {*} menuObj
  */
 export function menuBarConvert(menu, mode) {
-	if (menu) {
-		if (mode === OperateMode.NORMAL) {
-			menu.forEach(item => {
-				if (item.type === 'separator') {
-					item.show = true;
-					return;
-				}
+    if (menu) {
+        if (mode === OperateMode.NORMAL) {
+            menu.forEach(item => {
+                if (item.type === 'separator') {
+                    item.show = true;
+                    return;
+                }
 
-				item.show = false;
-				if (!item.click) {
-					item.click = () => { };
-				}
+                item.show = false;
+                if (!item.click) {
+                    item.click = () => { };
+                }
 
-				if (!item.froce) {
-					item.show = true;
-					if (item.children && item.children.length > 0) {
-						menuBarConvert(item.children, mode);
-					}
-				}
-			});
-		} else if (mode === OperateMode.ADMIN) {
-			menu.forEach(item => {
-				item.show = true;
-				if (!item.click) {
-					item.click = () => { };
-				}
-				if (item.children && item.children.length > 0) {
-					menuBarConvert(item.children, mode);
-				}
-			});
-		}
-	}
-	return menu || [];
+                if (!item.froce) {
+                    item.show = true;
+                    if (item.children && item.children.length > 0) {
+                        menuBarConvert(item.children, mode);
+                    }
+                }
+            });
+        } else if (mode === OperateMode.ADMIN) {
+            menu.forEach(item => {
+                item.show = true;
+                if (!item.click) {
+                    item.click = () => { };
+                }
+                if (item.children && item.children.length > 0) {
+                    menuBarConvert(item.children, mode);
+                }
+            });
+        }
+    }
+    return menu || [];
 }
 
 /**
@@ -522,80 +522,80 @@ export function menuBarConvert(menu, mode) {
  * @param {Array} menu
  */
 export function menuFiltration(menuObj) {
-	var selected = getCurrentStateObject();
-	var control;
-	var menu = [];
+    var selected = getCurrentStateObject();
+    var control;
+    var menu = [];
 
-	if (selected._type == 'StationStand') {
-		control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode);
-	} else if (selected._type == 'Station') {
-		control = store.getters['map/getStationControlByStationCode'](selected.code);
-	} else {
-		control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
-	}
+    if (selected._type == 'StationStand') {
+        control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode);
+    } else if (selected._type == 'Station') {
+        control = store.getters['map/getStationControlByStationCode'](selected.code);
+    } else {
+        control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
+    }
 
-	if (control) {
-		if (store.state.training.prdType != '') {
-			const type = SystemType[store.state.training.prdType];
-			const status = StationControlType[control.status];
-			menu = [...menuObj[type]];
-			if (menu.constructor === Array) {
-				menu.forEach(elem => {
-					if (elem.type === 'separator') {
-						elem.show = true;
-						return;
-					}
+    if (control) {
+        if (store.state.training.prdType != '') {
+            const type = State2SimulationMap[store.state.training.prdType];
+            const status = State2ControlMap[control.status];
+            menu = [...menuObj[type]];
+            if (menu.constructor === Array) {
+                menu.forEach(elem => {
+                    if (elem.type === 'separator') {
+                        elem.show = true;
+                        return;
+                    }
 
-					if (elem.auth.constructor === Object) {
-						elem.show = true;
-						if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
-							elem.show = false;
-						}
-						elem.defaultDisabled = !elem.auth[status];
-					}
-				});
-			}
-		}
-	}
-	return menu;
+                    if (elem.auth.constructor === Object) {
+                        elem.show = true;
+                        if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+                            elem.show = false;
+                        }
+                        elem.defaultDisabled = !elem.auth[status];
+                    }
+                });
+            }
+        }
+    }
+    return menu;
 }
 
 /**
  * 将train menu的show属性过滤返回
  */
 export function trainMenuFiltration(menuObj) {
-	var menu = [];
-	if (store.state.training.prdType != '') {
-		var type = SystemType[store.state.training.prdType];
-		menu = [...menuObj[type]];
-		if (menu.constructor === Array) {
-			menu.forEach(elem => {
-				if (elem.type === 'separator') {
-					elem.show = true;
-					return;
-				}
+    var menu = [];
+    if (store.state.training.prdType != '') {
+        var type = State2SimulationMap[store.state.training.prdType];
+        menu = [...menuObj[type]];
+        if (menu.constructor === Array) {
+            menu.forEach(elem => {
+                if (elem.type === 'separator') {
+                    elem.show = true;
+                    return;
+                }
 
-				if (elem.auth.constructor === Object) {
-					elem.show = true;
-					if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
-						elem.show = false;
-					}
-				}
-			});
-		}
-	}
-	return menu;
+                if (elem.auth.constructor === Object) {
+                    elem.show = true;
+                    if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+                        elem.show = false;
+                    }
+                }
+            });
+        }
+    }
+    return menu;
 }
 
 /**
  * 离开菜单以及执行完菜单取消选中状态
  */
 export function mouseCancelState(device) {
-	// Object.assign(device, { _selected: false });
-	// var viewInstance = store.state.map.jlmap.getViewInstanceByDevice({ _type: device._type, _code: device.code });
-	// if (viewInstance && viewInstance['mouseleave']) {
-	// 	viewInstance['selected'] = false;
-	// 	viewInstance['mouseleave'](store.state.map.jlmap._zr.curEvent);
-	// }
+    // Object.assign(device, { _selected: false });
+    // var viewInstance = store.state.map.jlmap.getViewInstanceByDevice({ _type: device._type, _code: device.code });
+    // if (viewInstance && viewInstance['mouseleave']) {
+    // 	viewInstance['selected'] = false;
+    // 	viewInstance['mouseleave'](store.state.map.jlmap._zr.curEvent);
+    // }
 }
 
diff --git a/src/jmapNew/theme/chengdu_03/planConvert.js b/src/jmapNew/theme/chengdu_03/planConvert.js
index ab02e8675..eb9d96a3b 100644
--- a/src/jmapNew/theme/chengdu_03/planConvert.js
+++ b/src/jmapNew/theme/chengdu_03/planConvert.js
@@ -127,7 +127,6 @@ export default {
                             /** 创建一条完成的服务数据*/
                             opt.name += j;
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
-
                             if (model) {
                                 models.push(model);
                                 opt = { name: '', markPointData: [], data: [] };
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
index c85893d53..bc5dd37fc 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'NoticeInfo',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
index b9216b44b..db0298ce5 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
@@ -1,16 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm confirm-control"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm confirm-control" :title="title" :visible.sync="show" width="360px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false" append-to-body>
     <div class="context">
       <template v-for="(message,index) in messages">
         <span :key="index">{{ message }}</span>
@@ -29,7 +18,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import NoticeInfo from './childDialog/noticeInfo';
 
 export default {
@@ -166,9 +156,9 @@ export default {
         // 进路设置
         routeSetting() {
             const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.arrangementRoute.confirm.operation
+                over: true,
+                operation: OperationEvent.Signal.arrangementRoute.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
             };
 
             this.loading = true;
@@ -186,9 +176,9 @@ export default {
         // 信号关灯
         signalClose() {
             const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.signalClose.confirm.operation
+                over: true,
+                operation: OperationEvent.Signal.signalClose.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
             };
 
             this.loading = true;
@@ -206,9 +196,9 @@ export default {
         // 信号重开
         reopenSignal() {
             const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.reopenSignal.confirm.operation
+                over: true,
+                operation: OperationEvent.Signal.reopenSignal.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
             };
 
             this.loading = true;
@@ -226,9 +216,9 @@ export default {
         // 取消进路
         cancelTrainRoute() {
             const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation
+                over: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
             };
 
             this.loading = true;
@@ -246,9 +236,9 @@ export default {
         // 进路交人工控
         humanControl() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.humanControl.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
             };
 
             this.loading = true;
@@ -266,9 +256,9 @@ export default {
         // 进路交ATS自动控
         atsAutoControl() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
             };
 
             this.loading = true;
@@ -286,9 +276,9 @@ export default {
         // 设置运行等级
         setRunLevel() {
             const operate = {
-                send: true,
-                type: this.operate.type,
+                over: true,
                 operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
                 val: this.operate.val
             };
 
@@ -307,9 +297,9 @@ export default {
         // 停站时间
         setStopTime() {
             const operate = {
-                send: true,
-                type: this.operate.type,
+                over: true,
                 operation: OperationEvent.StationStand.setStopTime.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
                 val: this.operate.val
             };
 
@@ -328,9 +318,9 @@ export default {
         // 设置折返策略
         setBackStrategy() {
             const operate = {
-                send: true,
-                type: this.operate.type,
+                over: true,
                 operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
                 val: this.operate.val
             };
 
@@ -348,7 +338,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue
index 1fd034f26..a7dbc79db 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -1,16 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm confirm-control-speed"
-    :title="title"
-    :visible.sync="show"
-    width="540px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm confirm-control-speed" :title="title" :visible.sync="show" width="540px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false" append-to-body>
     <div style="height: 60px; padding-left: 20px">
       <span style="font-size: 18px">{{ message }}</span>
     </div>
@@ -26,7 +15,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ConfirmControlSpeed',
@@ -34,7 +23,6 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            type: '',
             operation: '',
             message: ''
         };
@@ -63,17 +51,13 @@ export default {
         domIdConfirm() {
             if (this.dialogShow) {
                 if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.confirm.domId;
+                    return OperationEvent.Section.setSpeed.confirm.domId; // 区段设置限速
                 } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.confirm.domId;
+                    return OperationEvent.Section.cancelSpeed.confirm.domId; // 区段取消限速
                 } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.confirm.domId;
+                    return OperationEvent.Switch.setSpeed.confirm.domId; // 道岔设置限速
                 } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                    /** 道岔取消限速*/
-                    return OperationEvent.Switch.cancelSpeed.confirm.domId;
+                    return OperationEvent.Switch.cancelSpeed.confirm.domId; // 道岔取消限速
                 }
             }
             return '';
@@ -87,7 +71,6 @@ export default {
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {
-                this.type = operate.type;
                 this.operation = operate.operation;
                 this.message = operate.message;
             }
@@ -104,9 +87,7 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
-            const operate = {
-                type: this.type
-            };
+            const operate = {};
 
             if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
                 /** 区段设置限速*/
@@ -131,14 +112,12 @@ export default {
                     this.doClose();
                 }
             }).catch(() => {
-                this.loading = false;
                 this.$emit('setOperate', { step: 0, success: false });
                 this.doClose();
             });
         },
         cancel() {
             const operate = {
-                type: this.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index 7ee9783b4..c4fe8cf20 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',
@@ -82,7 +82,6 @@ export default {
         },
         commit() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Signal.unlock.confirm.operation
             };
 
@@ -102,7 +101,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
index 7a690368f..ac4e2b65e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
@@ -29,8 +29,9 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'ConfirmTrain',
@@ -137,9 +138,9 @@ export default {
         // 进路设置
         routeSetting() {
             const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Train.addTrainId.confirm.operation
+                over: true,
+                operation: OperationEvent.Train.addTrainId.confirm.operation,
+                cmdType: CMD.Train.CMD_ADD_TRAIN_ID
             };
 
             this.loading = true;
@@ -156,7 +157,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
index 330b23760..258096dfb 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
@@ -83,9 +83,10 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
 import ConfirmSignalUnlock from './childDialog/confirmSignalUnlock';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteCmdControl',
@@ -269,7 +270,6 @@ export default {
         },
         commandHasPopUp() {
             const operate = {
-                type: MapDeviceType.Signal.type
             };
 
             if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
@@ -290,7 +290,6 @@ export default {
         },
         commandNoPopUp() {
             const operate = {
-                type: MapDeviceType.Signal.type
             };
 
             if (this.operation == OperationEvent.Signal.guide.menu.operation) {
@@ -314,7 +313,6 @@ export default {
         },
         confirm1() {
             const operate = {
-                type: MapDeviceType.Signal.type
             };
 
             if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
@@ -343,16 +341,17 @@ export default {
         },
         confirm2() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type
+                over: true
             };
 
             if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
                 /** 信号解封*/
                 operate.operation = OperationEvent.Signal.unlock.confirm2.operation;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
             } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
                 /** 办理引导进路*/
                 operate.operation = OperationEvent.Signal.guide.confirm2.operation;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
@@ -375,7 +374,6 @@ export default {
         },
         stop() {
             const operate = {
-                type: MapDeviceType.Signal.type
             };
 
             if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
@@ -401,7 +399,6 @@ export default {
         },
         close() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue
index 0b5a45fe7..63e732f6b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue
@@ -36,9 +36,11 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteControl',
@@ -65,7 +67,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         title() {
             if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
@@ -153,9 +155,9 @@ export default {
         // 现地工作站取消进路
         cancelTrainRouteByLocal() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
             };
 
             this.loading = true;
@@ -173,8 +175,9 @@ export default {
         // 行调工作站取消进路
         cancelTrainRouteByCentral() {
             const operate = {
-                type: MapDeviceType.Signal.type,
+                over: true,
                 operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
                 messages: [this.$t('tip.signalModeToManualModeTipPrefix') + this.signalName + this.$t('tip.signalModeToManualModeTipSuffix')]
             };
 
@@ -193,7 +196,6 @@ export default {
         // 信号关灯
         signalClose() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Signal.signalClose.menu.operation,
                 messages: [this.$t('menu.menuSignal.signalOff') + this.$t('global.colon') + this.signalName]
             };
@@ -213,7 +215,6 @@ export default {
         // 信号重开
         reopenSignal() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Signal.reopenSignal.menu.operation,
                 messages: [this.$t('menu.menuSignal.signalReopen') + this.$t('global.colon') + this.signalName]
             };
@@ -233,8 +234,8 @@ export default {
         // 设置联锁自动进路
         setAutoInterlock() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
+                over: true,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
                 operation: OperationEvent.Signal.setAutoInterlock.menu.operation
             };
 
@@ -253,9 +254,9 @@ export default {
         // 取消联锁自动进路
         cancelAutoInterlock() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
             };
 
             this.loading = true;
@@ -273,9 +274,9 @@ export default {
         // 设置联锁自动触发
         setAutoTrigger() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.setAutoTrigger.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.setAutoTrigger.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
             };
 
             this.loading = true;
@@ -293,9 +294,9 @@ export default {
         // 取消联锁自动触发
         cancelAutoTrigger() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
             };
 
             this.doClose();
@@ -314,7 +315,6 @@ export default {
         // 取消
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue
index d9279fb05..19472e077 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue
@@ -62,8 +62,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteDetail',
@@ -129,9 +130,9 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.detail.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                cmdType: CMD.Signal.CMD_STAND_VIEW_STATUS
             };
 
             this.loading = true;
@@ -148,7 +149,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
index 019ea38fa..9b6715176 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
@@ -79,9 +79,11 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteHandControl',
@@ -121,7 +123,7 @@ export default {
             return '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         title() {
             if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
@@ -212,24 +214,14 @@ export default {
                 this.selection = selection;
             }
         },
-        serializeCodeListWithSeparator(sep) {
-            const codeList = [];
-            if (this.selection && this.selection.length) {
-                this.selection.forEach(elem => {
-                    codeList.push(elem.code);
-                });
-            }
-            return codeList.join(sep);
-        },
         handleChooseChange(selection) {
             this.selection = selection;
-            if (selection && selection.length) {
+            const codeList = selection.map(elem => { return elem.code; });
+            if (codeList && codeList.length) {
                 const operate = {
                     repeat: true,
-                    type: MapDeviceType.Signal.type,
                     operation: '',
-                    val: this.serializeCodeListWithSeparator('::'),
-                    selection: selection
+                    val: codeList.join('::')
                 };
 
                 if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
@@ -260,10 +252,14 @@ export default {
         },
         // 自排关
         humanControl() {
+            const codeList = this.selection.map(elem => { return elem.code; });
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.humanControl.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                param: {
+                    Route_Code_List: codeList
+                }
             };
 
             this.loading = true;
@@ -280,10 +276,14 @@ export default {
         },
         // 自排开
         atsAutoControl() {
+            const codeList = this.selection.map(elem => { return elem.code; });
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                param: {
+                    Route_Code_List: codeList
+                }
             };
 
             this.loading = true;
@@ -300,7 +300,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
index a2072d2fc..eaa3d6027 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
@@ -53,8 +53,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteLock',
@@ -131,9 +132,9 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.lock.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.lock.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
             };
 
             this.loading = true;
@@ -150,7 +151,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
index ca7261a8b..14a6c0c34 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
@@ -1,15 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm route-setting"
-    :title="title"
-    :visible.sync="show"
-    width="500px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm route-setting" :title="title" :visible.sync="show" width="500px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row class="header">
       <el-col :span="8"><span>{{ $t('menu.stationName') }}</span></el-col>
       <el-col :span="8" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
@@ -22,16 +12,7 @@
         <el-input v-model="signalName" size="small" disabled />
       </el-col>
     </el-row>
-    <el-table
-      ref="table"
-      :data="tempData"
-      border
-      style="width: 100%; margin-top:10px"
-      size="mini"
-      height="120"
-      highlight-current-row
-      @row-click="clickEvent"
-    >
+    <el-table ref="table" :data="tempData" border style="width: 100%; margin-top:10px" size="mini" height="120" highlight-current-row @row-click="clickEvent">
       <el-table-column :id="domIdChoose" prop="name" :label="this.$t('menu.route')" style="margin-left:30px" />
       <el-table-column prop="protectedSection" :label="this.$t('menu.protectionSection')" :width="180">
         <template slot-scope="scope">
@@ -45,11 +26,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-row
-      justify="
-                        center"
-      class="button-group"
-    >
+    <el-row justify="center" class="button-group">
       <el-col :span="8" :offset="4">
         <el-button
           :id="domIdConfirm"
@@ -69,7 +46,7 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
@@ -200,9 +177,11 @@ export default {
 
                     // 设置选中指令
                     const operate = {
-                        type: MapDeviceType.Signal.type,
                         operation: OperationEvent.Signal.arrangementRoute.choose.operation,
-                        val: row.code
+                        val: row.code,
+                        param: {
+                            Route_Code: row.code
+                        }
                     };
 
                     this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -223,7 +202,6 @@ export default {
                     names = names + this.row.overlapSwitchList.map(elem => { return elem.name; }).join('');
                 }
                 const operate = {
-                    type: MapDeviceType.Signal.type,
                     operation: OperationEvent.Signal.arrangementRoute.menu.operation,
                     messages: [this.$t('menu.accessSetting') + this.$t('global.colon') + `${this.row.name}${names}(${this.row.stationName})`]
                 };
@@ -245,7 +223,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
index 59cf14ae0..6d4a00fdb 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
@@ -1,16 +1,6 @@
 <template>
   <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm section-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
+    <el-dialog v-dialogDrag class="fuzhou-01__systerm section-cmd-control" :title="title" :visible.sync="show" width="840px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
       <div style="padding: 10px 20px; border: 1px solid lightgray;">
         <span class="base-label">{{ $t('menu.commandInformation') }}</span>
         <el-form label-position="center" size="mini">
@@ -18,12 +8,7 @@
             <el-col :span="8">
               <el-form-item :label="this.$t('global.status')" label-width="40px">
                 <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
+                  <el-option v-for="option in typeList" :key="option.code" :label="option.name" :value="option.code" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -40,16 +25,7 @@
           </el-row>
         </el-form>
       </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
+      <el-table :data="tempData" border style="width: 100%" size="mini" highlight-current-row height="200">
         <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
         <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
         <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
@@ -58,18 +34,17 @@
       <span class="notice">{{ message }}</span>
       <el-row class="button-group">
         <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">
+            {{ $t('menu.release') }}
+            <span v-show="timeCountCommand>0">({{ timeCountCommand }})</span></el-button>
         </el-col>
         <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
+          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}</el-button>
         </el-col>
         <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">
+            {{ $t('menu.secondConfirm') }}
+            <span v-show="timeCountConfirm>0">({{ timeCountConfirm }})</span></el-button>
         </el-col>
         <el-col :span="2" :offset="2">
           <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
@@ -82,8 +57,9 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'SectionCmdControl',
@@ -120,14 +96,11 @@ export default {
         domIdCommand() {
             if (this.dialogShow) {
                 if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    return OperationEvent.Section.unlock.order.domId;
+                    return OperationEvent.Section.unlock.order.domId; // 区段解封
                 } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    return OperationEvent.Section.fault.order.domId;
+                    return OperationEvent.Section.fault.order.domId; // 区段故障解锁
                 } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    return OperationEvent.Section.axlePreReset.order.domId;
+                    return OperationEvent.Section.axlePreReset.order.domId; // 区段计轴预复位
                 }
             }
             return '';
@@ -135,14 +108,11 @@ export default {
         domIdConfirm1() {
             if (this.dialogShow) {
                 if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    return OperationEvent.Section.unlock.confirm1.domId;
+                    return OperationEvent.Section.unlock.confirm1.domId; // 区段解封
                 } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    return OperationEvent.Section.fault.confirm1.domId;
+                    return OperationEvent.Section.fault.confirm1.domId; // 区段故障解锁
                 } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    return OperationEvent.Section.axlePreReset.confirm1.domId;
+                    return OperationEvent.Section.axlePreReset.confirm1.domId; // 区段计轴预复位
                 }
             }
             return '';
@@ -289,9 +259,7 @@ export default {
         commandHasPopUp() {
         },
         commandNoPopUp() {
-            const operate = {
-                type: MapDeviceType.Section.type
-            };
+            const operate = {};
 
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
                 /** 区段解封*/
@@ -320,7 +288,6 @@ export default {
         },
         confirm1() {
             const operate = {
-                type: MapDeviceType.Section.type
             };
 
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
@@ -351,21 +318,22 @@ export default {
             });
         },
         confirm2() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Section.type
-            };
+            const operate = {};
 
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
                 /** 区段解封*/
                 operate.operation = OperationEvent.Section.unlock.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK;
             } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
                 /** 区段故障解锁*/
                 operate.operation = OperationEvent.Section.fault.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK;
             } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
                 /** 区段计轴预复位*/
                 operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_AXIS_PRE_RESET;
             }
+
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -386,9 +354,7 @@ export default {
             });
         },
         stop() {
-            const operate = {
-                type: MapDeviceType.Section.type
-            };
+            const operate = {};
 
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
                 /** 区段解封*/
@@ -416,7 +382,6 @@ export default {
         },
         close() {
             const operate = {
-                type: MapDeviceType.Section.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
 
@@ -428,9 +393,6 @@ export default {
                 this.doClose();
             });
         },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-        },
         setButtonEnable(param) {
             this.cmdDisabled = [true, true, true];
             if (param && param.step >= 0) {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue
index dc81675d1..d66d41180 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue
@@ -1,15 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm section-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm section-control" :title="title" :visible.sync="show" width="300px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row class="header">
       <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
       <el-col :span="11" :offset="2"><span>{{ $t('menu.section') }}</span></el-col>
@@ -35,8 +25,10 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'SectionControl',
@@ -60,7 +52,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         title() {
             if (this.operation == OperationEvent.Section.lock.menu.operation) {
@@ -111,64 +103,41 @@ export default {
         },
         commit() {
             if (this.operation == OperationEvent.Section.lock.menu.operation) {
-                /** 区段封锁*/
-                this.lock();
+                this.lock(); // 区段封锁
             } else if (this.operation == OperationEvent.Section.split.menu.operation) {
-                /** 轨道区段切除*/
-                this.split();
+                this.split(); // 轨道区段切除
             } else if (this.operation == OperationEvent.Section.active.menu.operation) {
-                /** 轨道区段激活*/
-                this.active();
+                this.active(); // 轨道区段激活
             }
         },
-        // 道岔单锁
+        // 区段单锁
         lock() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.lock.menu.operation
+                over: true,
+                operation: OperationEvent.Section.lock.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_BLOCK
             };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
+            this.sendCommand(operate);
         },
         // 轨道区段切除
         split() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.split.menu.operation
+                over: true,
+                operation: OperationEvent.Section.split.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_CUT_OFF
             };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
+            this.sendCommand(operate);
         },
         // 轨道区段激活
         active() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.active.menu.operation
+                over: true,
+                operation: OperationEvent.Section.active.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_ACTIVE
             };
-
+            this.sendCommand(operate);
+        },
+        sendCommand(operate) {
             this.loading = true;
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
                 this.loading = false;
@@ -176,14 +145,12 @@ export default {
                     this.doClose();
                 }
             }).catch(() => {
-                this.loading = false;
                 this.doClose();
                 this.$refs.noticeInfo.doShow(operate);
             });
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Section.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
index eaa7c36e2..0e4298f4b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
@@ -1,16 +1,6 @@
 <template>
   <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm section-cmd-speed"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
+    <el-dialog v-dialogDrag class="fuzhou-01__systerm section-cmd-speed" :title="title" :visible.sync="show" width="840px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
       <div style="padding: 10px 20px; border: 1px solid lightgray;">
         <span class="base-label">{{ $t('menu.commandInformation') }}</span>
         <el-form label-position="center" size="mini">
@@ -18,12 +8,7 @@
             <el-col :span="6">
               <el-form-item :label="this.$t('menu.type')" label-width="40px">
                 <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
+                  <el-option v-for="option in typeList" :key="option.code" :label="option.name" :value="option.code" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -39,13 +24,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item :label="this.$t('menu.speedLimitValue')" label-width="80px">
-                <el-select
-                  :id="domIdChoose"
-                  v-model="speed"
-                  size="small"
-                  :disabled="spdDisabled"
-                  @change="speedSelectChange"
-                >
+                <el-select :id="domIdChoose" v-model="formData.SpeedLimit_Value" size="small" :disabled="spdDisabled" @change="speedSelectChange">
                   <el-option v-for="item in speedList" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
@@ -53,16 +32,7 @@
           </el-row>
         </el-form>
       </div>
-      <el-table
-        ref="table"
-        class="table"
-        :data="tableData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
+      <el-table :data="tableData" border style="width: 100%" size="mini" highlight-current-row height="200">
         <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
         <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
         <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
@@ -71,18 +41,17 @@
       <span class="notice">{{ message }}</span>
       <el-row class="button-group">
         <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">
+            {{ $t('menu.release') }}
+            <span v-show="timeCountCommand>0">({{ timeCountCommand }})</span></el-button>
         </el-col>
         <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
+          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}</el-button>
         </el-col>
         <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">
+            {{ $t('menu.secondConfirm') }}
+            <span v-show="timeCountConfirm>0">({{ timeCountConfirm }})</span></el-button>
         </el-col>
         <el-col :span="2" :offset="2">
           <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
@@ -96,9 +65,10 @@
   </div>
 </template>
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControlSpeed from './childDialog/confirmControlSpeed';
 import { now } from '@/utils/date';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'SectionCmdSpeed',
@@ -113,7 +83,6 @@ export default {
             order: 0,
             row: null,
             timer: null,
-            type: '',
             operation: '',
             cmdDisabled: [true, true, true],
             spdDisabled: false,
@@ -126,7 +95,9 @@ export default {
             speedSpace: 5,
             stationName: '',
             name: '',
-            speed: ''
+            formData: {
+                SpeedLimit_Value: ''
+            }
         };
     },
     computed: {
@@ -143,7 +114,7 @@ export default {
         speedList() {
             const list = [];
             for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
-                list.push(String(i * this.speedSpace));
+                list.push(i * this.speedSpace);
             }
             return list;
         },
@@ -270,7 +241,6 @@ export default {
     watch: {
         cmdDisabled: {
             handler(val, oldVal) {
-                this.stpDisabled = true;
                 this.spdDisabled = false;
                 val.forEach((elem, index) => {
                     // 取消操作禁止选择限速，并跳过该步骤
@@ -286,7 +256,7 @@ export default {
             },
             deep: true
         },
-        'speed': function (val) {
+        'formData.SpeedLimit_Value': function (val) {
             if (val) this.cmdDisabled[0] = false;
         }
     },
@@ -344,7 +314,7 @@ export default {
                         this.stationName = station.name;
                     }
 
-                    this.speed = '';
+                    this.formData.SpeedLimit_Value = '';
                     this.tableData = [];
                     this.selected = selected;
                     this.timeCountCommand = -1;
@@ -352,11 +322,10 @@ export default {
                     this.cmdDisabled = [true, true, true];
                     this.stpDisabled = true;
                     this.order = 0;
-                    this.type = operate.type;
                     this.operation = operate.operation;
                     this.setMessage(this.$t('tip.selectSpeedLimitValueTip'));
                     if (this.isCancelSpeed) {
-                        this.speed = `${tempData}`;
+                        this.formData.SpeedLimit_Value = `${tempData}`;
                         this.spdDisabled = true;
                         this.cmdDisabled = [false, true, true];
                     }
@@ -374,7 +343,6 @@ export default {
         },
         speedSelectChange(val) {
             const operate = {
-                type: this.type,
                 val: val
             };
 
@@ -395,26 +363,24 @@ export default {
             });
         },
         command() {
-            const operate = {
-                type: this.type
-            };
+            const operate = {};
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
                 operate.operation = OperationEvent.Section.setSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionSetLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionSetLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
             } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
                 /** 区段取消限速*/
                 operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionCancelLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionCancelLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
             } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
                 /** 道岔设置限速*/
                 operate.operation = OperationEvent.Switch.setSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchSetLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchSetLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
             } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
                 /** 道岔取消限速*/
                 operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchCancelLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchCancelLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
             }
 
             this.setMessage(this.$t('tip.firstConfirmTip'));
@@ -432,9 +398,7 @@ export default {
             });
         },
         confirm1() {
-            const operate = {
-                type: this.type
-            };
+            const operate = {};
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
@@ -468,23 +432,26 @@ export default {
         },
         confirm2() {
             const operate = {
-                send: true,
-                type: this.type,
-                val: this.speed
+                val: this.formData.SpeedLimit_Value,
+                param: this.formData
             };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
                 operate.operation = OperationEvent.Section.setSpeed.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_SET_LIMIT_SPEED;
             } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
                 /** 区段取消限速*/
                 operate.operation = OperationEvent.Section.cancelSpeed.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_SET_LIMIT_SPEED;
             } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
                 /** 道岔设置限速*/
                 operate.operation = OperationEvent.Switch.setSpeed.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED;
             } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
                 /** 道岔取消限速*/
                 operate.operation = OperationEvent.Switch.cancelSpeed.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED;
             }
 
             this.setMessage('');
@@ -507,9 +474,7 @@ export default {
             });
         },
         stop() {
-            const operate = {
-                type: this.type
-            };
+            const operate = {};
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
@@ -540,7 +505,6 @@ export default {
         },
         close() {
             const operate = {
-                type: this.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickToClose'), result: '' });
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
index e1f941d26..f3325f200 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
@@ -82,7 +82,8 @@
 <script>
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -189,7 +190,6 @@ export default {
         },
         strategySelectChange(strategy) {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setBackStrategy.choose.operation,
                 val: `${strategy}`
             };
@@ -211,12 +211,14 @@ export default {
         commit() {
             if (this.isConfirm) {
                 const operate = {
-                    send: true,
-                    type: MapDeviceType.StationStand.type,
+                    over: true,
                     operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
-                    val: `${this.strategy}`
+                    val: `${this.strategy}`,
+                    cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                    param:{
+                        Stand_ReentryStrategy:this.strategy
+                    }
                 };
-
                 this.loading = true;
                 this.$store.dispatch('training/next', operate).then(({ valid }) => {
                     this.loading = false;
@@ -234,7 +236,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
+                over: true,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
index e98e938f1..185d399cf 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
@@ -26,8 +26,10 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StandDetainTrain',
@@ -51,7 +53,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         title() {
             if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
@@ -79,7 +81,7 @@ export default {
         });
     },
     methods: {
-        doShow(operate, selected) {
+        doShow(step, selected) {
             if (!this.dialogShow) {
                 this.standName = '';
                 if (selected) {
@@ -87,7 +89,7 @@ export default {
                 }
 
                 this.selected = selected;
-                this.operation = operate.operation;
+                this.operation = step.operation;
             }
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -122,77 +124,77 @@ export default {
         },
         // 设置扣车
         setDetainTrain() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消扣车
         cancelDetainTrain() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 强制取消扣车
         cancelDetainTrainForce() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 提前发车
         earlyDeparture() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -200,20 +202,20 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置跳停
         setJumpStop() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
+            const step = {
+                over: true,
                 operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-                val: this.selected.direction // 站台的上下行方向, 01:下行 /02:上行
+                val: this.selected.direction, // 站台的上下行方向, 01:下行 /02:上行
+                cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -221,20 +223,20 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消跳停
         cancelJumpStop() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
+            const step = {
+                over: true,
                 operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-                val: this.selected.direction // 站台的上下行方向, 01:下行 /02:上行
+                val: this.selected.direction, // 站台的上下行方向, 01:下行 /02:上行
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -242,17 +244,16 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
+            const step = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
             this.loading = false;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
index 04a74f495..cd0b5e891 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
@@ -42,9 +42,10 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
     name: 'StandDetail',
@@ -145,8 +146,9 @@ export default {
         },
         commit() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.close.confirm.operation
+                over: true,
+                operation: OperationEvent.Command.close.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
             };
 
             this.loading = true;
@@ -162,7 +164,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
index 6bb042531..d5e3640f1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
@@ -55,8 +55,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StandDetainTrainAll',
@@ -109,7 +110,7 @@ export default {
                 /** status 01: 未扣车*/
                 const stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {}).status;
                 const station = (this.$store.getters['map/getDeviceByCode'](elem.stationCode) || {});
-                if (station && stand && stand.holdStatus != '01' && Number(elem.direction) == Number(this.upDown)) {
+                if (station && station.visible && stand && stand.holdStatus != '01' && Number(elem.direction) == Number(this.upDown)) {
                     this.tempData.push({ stationName: station.name, standName: elem.name });
                 }
             });
@@ -138,10 +139,8 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         choose(upDown) {
-            // 重新设置扣车站台
             this.loadTableData();
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.cancelDetainTrainAll.choose.operation,
                 val: `${upDown}`
             };
@@ -154,10 +153,13 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
+                over: true,
                 operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
-                val: this.upDown
+                cmdType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN,
+                val: this.upDown,
+                param: {
+                    Stand_AllLine: this.upDown
+                }
             };
 
             this.loading = true;
@@ -174,7 +176,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
index e0d40525b..958656680 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
@@ -63,9 +63,10 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import ConfirmControl from './childDialog/confirmControl';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
+import ConfirmControl from './childDialog/confirmControl';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StandRunLevel',
@@ -86,15 +87,6 @@ export default {
             time: ''
         };
     },
-    watch: {
-        // 深度数据状态
-        tempData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        }
-    },
     computed: {
         ...mapGetters('map', [
             'stationList',
@@ -130,6 +122,15 @@ export default {
             return list;
         }
     },
+    watch: {
+        // 深度数据状态
+        tempData: {
+            handler(val, oldVal) {
+                this.checkTableDataSelction(val);
+            },
+            deep: true
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
@@ -192,12 +193,14 @@ export default {
         },
         timeSelectChange(time) {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setRunLevel.choose.operation,
-                val: time.toString()
+                val: time.toString(),
+                param: {
+                    Stand_RunLevel: time
+                }
             };
 
-            this.time = time.toString();
+            this.time = time;
             this.isSelect = false;
             this.isConfirm = true;
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -208,9 +211,11 @@ export default {
         },
         checkChange(check) {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setRunLevel.check.operation,
-                val: check.toString()
+                val: check.toString(),
+                param: {
+                    Stand_AlwaysValid: !!this.tempData[0].check
+                }
             };
 
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -228,10 +233,13 @@ export default {
             if (this.isConfirm) {
                 const forver = !!this.tempData[0].check;
                 const operate = {
-                    type: MapDeviceType.StationStand.type,
                     operation: OperationEvent.StationStand.setRunLevel.menu.operation,
-                    messages: [`${this.$t('menu.menuStationStand.setRunLevel')}${this.$t('global.colon')}${this.tempData[0].name}-${this.standName},${this.tempData[0].time == 0 ? this.$t('menu.runTimeAutomatically') : `${this.$t('menu.runningTimeIs')}${this.tempData[0].time}s`},${this.$t('menu.effectiveFrequencyIs')}${this.tempData[0].check ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`],
-                    val: [this.time, forver].join('::')
+                    val: [this.time, forver].join('::'),
+                    param:{
+                        Stand_AlwaysValid:forver,
+                        Stand_RunLevel:this.time
+                    },
+                    messages: [`${this.$t('menu.menuStationStand.setRunLevel')}${this.$t('global.colon')}${this.tempData[0].name}-${this.standName},${this.tempData[0].time == 0 ? this.$t('menu.runTimeAutomatically') : `${this.$t('menu.runningTimeIs')}${this.tempData[0].time}s`},${this.$t('menu.effectiveFrequencyIs')}${this.tempData[0].check ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
                 };
 
                 this.loading = true;
@@ -252,7 +260,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
index 9ade50cee..11ec73b92 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
@@ -72,9 +72,10 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StandStopTime',
@@ -179,9 +180,11 @@ export default {
             }
 
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setStopTime.choose1.operation,
-                val: `${control}`
+                val: `${control}`,
+                param: {
+                    Stand_StopControl: `${control}`
+                }
             };
 
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -192,9 +195,11 @@ export default {
         },
         chooseEffective(effective) {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setStopTime.choose2.operation,
-                val: `${effective}`
+                val: `${effective}`,
+                param: {
+                    Stand_AlwaysValid: `${effective}`
+                }
             };
 
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -206,9 +211,11 @@ export default {
         inputTime(time) {
             const operate = {
                 repeat: true,
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setStopTime.input.operation,
-                val: `${time}`
+                val: `${time}`,
+                param: {
+                    Stand_StopTime: `${time}`
+                }
             };
 
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -219,9 +226,13 @@ export default {
         },
         commit() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.StationStand.setStopTime.menu.operation,
                 val: [`${this.control}`, this.time, this.effective].join('::'),
+                param:{
+                    Stand_StopControl:this.control,
+                    Stand_AlwaysValid:this.effective,
+                    Stand_StopTime:this.time
+                },
                 messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == false ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
             };
 
@@ -240,7 +251,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
index 49224d1fa..a25a8d7ac 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
@@ -77,7 +77,7 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
 
 export default {
@@ -253,7 +253,6 @@ export default {
         },
         commandNoPopUp() {
             const operate = {
-                type: MapDeviceType.Station.type
             };
 
             if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
@@ -280,7 +279,6 @@ export default {
         },
         confirm1() {
             const operate = {
-                type: MapDeviceType.Station.type
             };
 
             if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
@@ -309,16 +307,17 @@ export default {
         },
         confirm2() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Station.type
+                over: true
             };
 
             if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
                 /** 上电解锁*/
                 operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
+                // operate.cmdType = CMD.Station.powerUnLock;
             } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
                 /** 执行关键操作测试*/
                 operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
+                // operate.cmdType = CMD.Station.execKeyOperationTest;
             }
 
             this.setMessage('');
@@ -342,7 +341,6 @@ export default {
         },
         stop() {
             const operate = {
-                type: MapDeviceType.Station.type
             };
 
             if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
@@ -368,7 +366,6 @@ export default {
         },
         close() {
             const operate = {
-                type: MapDeviceType.Station.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
index 743cad27c..4fe701445 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
@@ -27,8 +27,9 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StationHumanControlAll',
@@ -80,10 +81,9 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.humanControlALL.menu.operation
+                over: true,
+                operation: OperationEvent.Station.humanControlALL.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
             };
 
             this.loading = true;
@@ -100,7 +100,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Station.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
index 02267fc87..40a952722 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
@@ -39,8 +39,9 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StationSetRouteControlAll',
@@ -98,11 +99,13 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
+                over: true,
                 operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
-                val: this.mode
+                cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                val: this.mode,
+                param: {
+                    CheckConflict: this.mode
+                }
             };
 
             this.loading = true;
@@ -119,7 +122,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Station.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
index 297349843..f55a1a53d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
@@ -82,8 +82,9 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'SwitchCmdControl',
@@ -301,7 +302,7 @@ export default {
         },
         commandNoPopUp() {
             const operate = {
-                type: MapDeviceType.Switch.type
+
             };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
@@ -334,7 +335,7 @@ export default {
         },
         confirm1() {
             const operate = {
-                type: MapDeviceType.Switch.type
+
             };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
@@ -369,24 +370,26 @@ export default {
         },
         confirm2() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type
+                over: true
             };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                 /** 道岔单解*/
                 operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
             } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
                 /** 道岔解封*/
                 operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
             } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                 /** 道岔故障解锁*/
                 operate.operation = OperationEvent.Switch.fault.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_FAULT_UNLOCK;
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
             }
-
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -408,7 +411,6 @@ export default {
         },
         stop() {
             const operate = {
-                type: MapDeviceType.Switch.type
             };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
@@ -440,7 +442,6 @@ export default {
         },
         close() {
             const operate = {
-                type: MapDeviceType.Switch.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/switchControl.vue
index 1de0cba4d..acdfa7ced 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/switchControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/switchControl.vue
@@ -45,8 +45,10 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'SwitchControl',
@@ -72,7 +74,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         title() {
             if (this.operation == OperationEvent.Switch.lock.menu.operation) {
@@ -152,9 +154,9 @@ export default {
         // 道岔单锁
         lock() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.lock.menu.operation
+                over: true,
+                operation: OperationEvent.Switch.lock.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
             };
 
             this.loading = true;
@@ -172,9 +174,9 @@ export default {
         // 道岔封锁
         block() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.block.menu.operation
+                over: true,
+                operation: OperationEvent.Switch.block.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_BLOCK
             };
 
             this.loading = true;
@@ -192,9 +194,9 @@ export default {
         // 道岔转动
         turnout(operation) {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.turnout.menu.operation
+                over: true,
+                operation: OperationEvent.Switch.turnout.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_TURN
             };
 
             this.loading = true;
@@ -212,9 +214,9 @@ export default {
         // 道岔强扮
         turnoutForce() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.turnoutForce.menu.operation
+                over: true,
+                operation: OperationEvent.Switch.turnoutForce.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN
             };
             this.loading = true;
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -231,9 +233,9 @@ export default {
         // 区段切除
         split() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.split.menu.operation
+                over: true,
+                operation: OperationEvent.Switch.split.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
             };
             this.loading = true;
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -250,9 +252,9 @@ export default {
         // 区段激活
         active() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.active.menu.operation
+                over: true,
+                operation: OperationEvent.Switch.active.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
             };
             this.loading = true;
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -268,7 +270,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Switch.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainControl.vue
index 9d28dc08d..87286986a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainControl.vue
@@ -83,10 +83,11 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import OperateHandler from '@/scripts/plugin/OperateHandler';
+import Handler from '@/scripts/cmdPlugin/Handler';
 
 export default {
     name: 'TrainControl',
@@ -303,7 +304,7 @@ export default {
         },
         trainNumberChange(groupNumber) {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 val: `${groupNumber}`,
                 operation: ''
             };
@@ -322,7 +323,7 @@ export default {
         },
         trainTypeChange(trainType) {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 val: `${trainType}`,
                 operation: ''
             };
@@ -342,17 +343,19 @@ export default {
         trainNoChange(tripNumber) {
             const operate = {
                 send: true,
-                type: MapDeviceType.Train.type,
+                
                 val: tripNumber,
                 operation: ''
             };
 
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
+                operate.cmdType = CMD.Train.addTrainId;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
+                operate.cmdType = CMD.Train.editTrainId;
             }
-            OperateHandler.backStep(1);
+            Handler.undo(1);
             this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     if (response.data) {
@@ -394,8 +397,9 @@ export default {
                     const model = this.formModel;
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+                        
                         operation: OperationEvent.Train.addTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_ADD_TRAIN_ID,
                         messages: [this.$t('tip.addTrainIdTip')],
                         val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
                     };
@@ -424,8 +428,9 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+                        
                         operation: OperationEvent.Train.editTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_EDIT_TRAIN_ID,
                         messages: [this.$t('tip.editTrainIdTip')],
                         val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
                     };
@@ -450,7 +455,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
index 46c366226..c6e00382c 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
@@ -38,8 +38,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteCreate',
@@ -118,8 +119,9 @@ export default {
         commit() {
             const operate = {
                 send: true,
-                type: MapDeviceType.Section.type,
+                
                 operation: OperationEvent.Section.newtrain.menu.operation,
+                cmdType: CMD.Section.CMD_NEW_TRAIN,
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
@@ -136,7 +138,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Section.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
index a4ca45a8d..448f7fd28 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
@@ -30,10 +30,11 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'TrainDelete',
@@ -111,7 +112,7 @@ export default {
         },
         trainNumberChange() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 val: `${this.formModel.groupNumber}`,
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
@@ -127,8 +128,9 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+                        
                         operation: OperationEvent.Train.delTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_DEL_TRAIN_ID,
                         val: this.formModel.groupNumber
                     };
 
@@ -150,7 +152,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
index 441427f74..fe924739b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
@@ -28,7 +28,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'TrainMove',
@@ -90,8 +91,9 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.editTrainNo.menu.operation
+                        
+                        operation: OperationEvent.Train.editTrainNo.menu.operation,
+                        cmdType: CMD.Train.CMD_EDIT_TRAIN_NO
                     };
 
                     this.loading = true;
@@ -111,7 +113,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
index 5a3bff7cb..845e76b56 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
@@ -74,7 +74,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'TrainMove',
@@ -152,8 +153,9 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.moveTrainId.menu.operation
+                        
+                        operation: OperationEvent.Train.moveTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
                     };
 
                     this.loading = true;
@@ -174,7 +176,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
index 90174fdbc..c7cb6d580 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
@@ -75,7 +75,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'TrainSwitch',
@@ -157,8 +158,9 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.moveTrainId.menu.operation
+                        
+                        operation: OperationEvent.Train.moveTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
                     };
 
                     this.loading = true;
@@ -179,7 +181,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/index.vue b/src/jmapNew/theme/fuzhou_01/menus/index.vue
index 720e59539..0dfd8757e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/index.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/index.vue
@@ -3,7 +3,6 @@
     <menu-cancel ref="menuCancel" />
     <template v-show="isShowAll">
       <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-      <menu-station-control ref="menuStationControl" :selected="selected" />
       <menu-station-stand ref="menuStationStand" :selected="selected" />
       <menu-switch ref="menuSwitch" :selected="selected" />
       <menu-signal ref="menuSignal" :selected="selected" />
@@ -21,7 +20,6 @@
 import { mapGetters } from 'vuex';
 import MenuCancel from './menuCancel';
 import MenuSignal from './menuSignal';
-import MenuStationControl from './menuStationControl';
 import MenuStationStand from './menuStationStand';
 import MenuSwitch from './menuSwitch';
 import MenuSection from './menuSection';
@@ -40,7 +38,6 @@ export default {
         MenuSignal,
         MenuSwitch,
         MenuSection,
-        MenuStationControl,
         MenuStationStand,
         MenuStation,
         MenuTrain,
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue b/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
index 322e3c49f..e59b47d55 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
@@ -12,9 +12,7 @@
             <span class="nav-li-text">{{ item.title }}</span>
             <ul class="nav-ul" :class="{'active' :i==classA}">
               <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
+                <template v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)">
                   <li
                     :id="child.operate.domId"
                     :key="j"
@@ -84,9 +82,10 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
-// import { OperateMode } from '@/scripts/ConstDic';
-import { menuBarConvert, SystemType } from './utils/menuItemStatus';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
+import { State2SimulationMap } from '@/scripts/cmdPlugin/Config.js';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import StationControlConvert from './menuDialog/stationControlConvert';
 import TrainAdd from './menuDialog/trainAdd';
 import TrainTranstalet from './menuDialog/trainTranstalet';
@@ -132,7 +131,7 @@ export default {
             valid: true,
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
                         title: this.$t('menu.menuBar.system'),
                         operate: OperationEvent.Command.mBar.system,
@@ -241,7 +240,7 @@ export default {
                         ]
                     }
                 ],
-                central: [
+                Center: [
                     {
                         title: this.$t('menu.menuBar.system'),
                         operate: OperationEvent.Command.mBar.system,
@@ -438,7 +437,7 @@ export default {
     },
     methods: {
         initMenu(menu) {
-            this.menu = menuBarConvert(this.menuNormal[SystemType[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
+            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[State2SimulationMap[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
             this.clickEvent();
             this.closeMenu(true);
         },
@@ -487,7 +486,6 @@ export default {
             this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
             this.clickEvent();
             const operate = {
-                type: 'bar',
                 operation: item.operate.operation
             };
             this.tempClassA = index;
@@ -509,7 +507,6 @@ export default {
         popupMenuB(item, index) {
             this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
             const operate = {
-                type: 'bar',
                 operation: item.operate.operation
             };
             this.tempClassB = index;
@@ -522,7 +519,6 @@ export default {
         // 转为站控
         turnToStationControl(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -536,7 +532,6 @@ export default {
         // 强制转为站控
         mandatoryStationControl(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -550,7 +545,6 @@ export default {
         // 请求中控
         conterStationControl(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -564,7 +558,6 @@ export default {
         // 设置列车识别号显示
         setTrainIdDisplay(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -578,7 +571,6 @@ export default {
         // 设置设备显示
         setNameDisplay(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -592,7 +584,6 @@ export default {
         // 设置名称显示
         setDeviceDisplay(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -606,7 +597,6 @@ export default {
         // 添加计划车
         addPlanTrain(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -620,7 +610,6 @@ export default {
         // 平移计划车
         translatPlanTrain(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -634,7 +623,6 @@ export default {
         // 删除计划车
         delPlanTrain(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -648,7 +636,6 @@ export default {
         // 用户管理
         userManage(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -662,7 +649,6 @@ export default {
         // 关于
         about(order) {
             const operate = {
-                type: 'bar',
                 operation: order.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuCancel.vue b/src/jmapNew/theme/fuzhou_01/menus/menuCancel.vue
index 97f6db860..c977cd799 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuCancel.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuCancel.vue
@@ -42,19 +42,9 @@ export default {
     computed: {
         ...mapGetters('map', [
             'stationList'
-        ]),
-        isScreen() { // 大屏隐藏所有菜单
-            return this.$route.params.mode === 'dp' ||
-             this.$store.state.training.roles == 'BigScreen';
-        }
+        ])
     },
     watch: {
-        '$store.state.menuOperation.buttonOperation': function (val, old) {
-            if (!this.isScreen && this.menu && this.menu.length > 1) {
-                // this.menu[0].disabled = (this.menu[0] && val) ? true : true;
-                // this.menu[1].disabled = !((this.menu[1] && val));
-            }
-        },
         '$store.state.menuOperation.menuCount': function (val) {
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
@@ -100,11 +90,7 @@ export default {
                 }
             });
 
-            if (this.isScreen) {
-                this.menu = [...this.menuScreen];
-            } else {
-                this.menu = [...this.menuNormal];
-            }
+            this.menu = [...this.menuNormal];
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
index d7a64af6b..309fb8c00 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -30,8 +30,10 @@
 </template>
 
 <script>
-import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../../dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'TwoConfirmation',
@@ -69,11 +71,11 @@ export default {
     methods: {
         doShow(operate) {
             this.domIdConfirm = '';
-            if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+            if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
                 this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
                 this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                 this.domIdConfirm = OperationEvent.StationControl.requestCentralControl.confirm.domId;
             }
 
@@ -89,7 +91,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.confirm.operation
             };
 
@@ -101,27 +102,26 @@ export default {
                 }
             });
         },
-        forEachDoHandler(selection, handler) {
-            selection.forEach(elem => {
-                handler(elem);
-            });
-        },
         commit() {
             if (this.operate) {
                 this.loading = true;
-                this.forEachDoHandler(this.operate.selection || [], elem => {
+                (this.operate.selection || []).forEach(elem => {
                     const operate = {
-                        send: true,
-                        type: this.operate.type,
-                        val: elem.code
+                        val: elem.code,
+                        param: {
+                            ControlMode_Code: elem.code
+                        }
                     };
 
-                    if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
                         operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
-                    } else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
+                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL;
+                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
                         operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
-                    } else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
+                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
+                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
                         operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
+                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
                     }
 
                     this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
index 81009d4c1..d2467898d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
@@ -41,7 +41,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserAdd',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
index 7e07a21db..f0fb7cdc1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
@@ -29,7 +29,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserDelete',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
index 6e3bf3039..a39351cd4 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
@@ -44,7 +44,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserEdit',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
index f19854741..688174504 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
@@ -38,7 +38,7 @@
   </el-dialog>
 </template>
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
index c1b8e15a0..996630adf 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
@@ -70,7 +70,7 @@ import { mapGetters } from 'vuex';
 import UserAdd from './childDialog/userAdd';
 import UserEdit from './childDialog/userEdit';
 import UserDelete from './childDialog/userDelete';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
index c349ac7cd..dd3767489 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
@@ -57,7 +57,8 @@
 </template>
 
 <script>
-import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
 export default {
@@ -87,7 +88,7 @@ export default {
         },
         domIdConfirm() {
             if (this.dialogShow) {
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                     /** 强制站控*/
                     return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
                 }
@@ -124,7 +125,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.password.operation
             };
 
@@ -136,10 +136,9 @@ export default {
         },
         commit() {
             const operate = {
-                type: this.operate.type
             };
 
-            if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                 /** 强制站控*/
                 operate.operation = OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation;
             }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
index 9fa2d1bcf..ea48fd5ea 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
@@ -67,7 +67,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import TwoConfirmation from './childDialog/twoConfirmation';
 
 export default {
@@ -114,29 +115,29 @@ export default {
         },
         isFork() {
             if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
             }
             return false;
         },
         isRequest() {
             if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
             }
             return false;
         },
         isConter() {
             if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
             }
             return false;
         },
         domIdChoose() {
             if (this.dialogShow) {
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                     return OperationEvent.StationControl.forcedStationControl.choose.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                     return OperationEvent.StationControl.requestStationControl.choose.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                     return OperationEvent.StationControl.requestCentralControl.choose.domId;
                 }
             }
@@ -207,9 +208,9 @@ export default {
                         row[prop] = result[prop];
                     }
                     if (success) {
-                        if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                        if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                             row.control = this.controlProps['02']; // 01:中控， 02:站控
-                        } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                        } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                             row.control = this.controlProps['01']; // 01:中控， 02:站控
                         }
                         row.disabled = true;
@@ -236,11 +237,11 @@ export default {
         },
         checkBoxDisabled(row) {
             const control = (this.$store.getters['map/getDeviceByCode'](row.code) || {});
-            if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                 if (control && control.status == '02') { // 01:中控， 02:站控
                     return true;
                 }
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                 if (control && control.status == '01') { // 01:中控， 02:站控
                     return true;
                 }
@@ -293,7 +294,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: 'bar',
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
@@ -333,30 +333,21 @@ export default {
                 { type: 'resp', timeout: 'true', stationControlCode: elem.code }
             );
         },
-        serializeCodeListWithSeparator(sep) {
-            const codeList = [];
-            if (this.selection && this.selection.length) {
-                this.selection.forEach(elem => {
-                    codeList.push(elem.code);
-                });
-            }
-            return codeList.join(sep);
-        },
         handleChooseChange(selection) {
             this.selection = selection;
+            const stationCodeList = selection.map(elem => { return elem.code; });
             if (selection && selection.length) {
                 const operate = {
-                    type: MapDeviceType.StationControl.type,
                     operation: '',
-                    val: this.serializeCodeListWithSeparator('::'),
+                    val: stationCodeList.join('::'),
                     selection: selection
                 };
 
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
                     operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                     operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                     operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation;
                 }
 
@@ -372,11 +363,11 @@ export default {
             }
         },
         requestCommit() {
+            const stationCodeList = this.selection.map(elem => { return elem.code; });
             const operate = {
-                type: MapDeviceType.StationControl.type,
                 messages: [this.$t('menu.menuDialog.confirmStationControlTip')],
                 operation: OperationEvent.StationControl.requestStationControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
+                val: stationCodeList.join('::'),
                 selection: this.selection
             };
 
@@ -397,11 +388,11 @@ export default {
             });
         },
         forkCommit() {
+            const stationCodeList = this.selection.map(elem => { return elem.code; });
             const operate = {
-                type: MapDeviceType.StationControl.type,
                 messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
                 operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
+                val: stationCodeList.join('::'),
                 selection: this.selection
             };
 
@@ -421,12 +412,12 @@ export default {
                 this.disabledSure = false;
             });
         },
-        conterCommit() { // 请求中控
+        conterCommit() {
+            const stationCodeList = this.selection.map(elem => { return elem.code; });
             const operate = {
-                type: MapDeviceType.StationControl.type,
                 messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
                 operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
+                val: stationCodeList.join('::'),
                 selection: this.selection
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
index a200845d9..89055de36 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
@@ -48,7 +48,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -126,7 +126,7 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+                        
                         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
                     };
 
@@ -150,7 +150,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
index 3e9138938..7e947d735 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
@@ -34,7 +34,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -108,7 +108,7 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+                        
                         operation: OperationEvent.Command.planTrain.delPlanTrain.operation
                     };
 
@@ -132,7 +132,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
index a6b93c428..60da613b0 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
@@ -47,7 +47,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',
@@ -125,7 +125,7 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        type: MapDeviceType.Train.type,
+                        
                         operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
                     };
 
@@ -149,7 +149,7 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
+                
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
index 096fb45a5..3b4b101da 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
 export default {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
index 361d91c12..35fc8f51d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import deviceType from '@/jmap/constant/deviceType';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
index 65cd96542..c5e38fab9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import deviceType from '@/jmap/constant/deviceType';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
index f2a03250d..885bda462 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
@@ -4,7 +4,6 @@
     <section-control ref="sectionControl" />
     <section-cmd-control ref="sectionCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
-    <train-create ref="trainCreate" />
     <notice-info ref="noticeInfo" />
   </div>
 </template>
@@ -14,12 +13,13 @@ import PopMenu from '@/components/PopMenu';
 import SectionControl from './dialog/sectionControl';
 import SectionCmdControl from './dialog/sectionCmdControl';
 import SpeedCmdControl from './dialog/speedCmdControl';
-import TrainCreate from './dialog/trainCreate';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import Handler from '@/scripts/cmdPlugin/Handler';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'SectionMenu',
@@ -28,7 +28,6 @@ export default {
         SectionControl,
         SectionCmdControl,
         SpeedCmdControl,
-        TrainCreate,
         NoticeInfo
     },
     props: {
@@ -43,124 +42,97 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
                         label: this.$t('menu.menuSection.sectionFaultUnlock'),
                         handler: this.fault,
-                        disabledCallback: MenuDisabledState.Section.fault,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
                     },
                     {
                         label: this.$t('menu.menuSection.sectionResection'),
                         handler: this.split,
-                        disabledCallback: MenuDisabledState.Section.split,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
                     },
                     {
                         label: this.$t('menu.menuSection.sectionActive'),
                         handler: this.active,
-                        disabledCallback: MenuDisabledState.Section.active,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
                     },
                     {
                         label: this.$t('menu.menuSection.sectionAxisPreReset'),
                         handler: this.axlePreReset,
-                        disabledCallback: MenuDisabledState.Section.axlePreReset,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
                     },
                     {
                         label: this.$t('menu.menuSection.sectionBlockade'),
                         handler: this.lock,
-                        disabledCallback: MenuDisabledState.Section.lock,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
                     },
                     {
                         label: this.$t('menu.menuSection.sectionUnblock'),
                         handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Section.unlock,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
                     },
                     {
                         label: this.$t('menu.menuSection.sectionSetSpeedLimit'),
                         handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Section.setSpeed,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+
                     },
                     {
                         label: this.$t('menu.menuSection.sectionCancelSpeedLimit'),
                         handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Section.cancelSpeed,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
                     }
                 ],
-                central: [
+                Center: [
                     {
                         label: this.$t('menu.menuSection.sectionFaultUnlock'),
                         handler: this.fault,
-                        disabledCallback: MenuDisabledState.Section.fault,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
                     },
                     {
                         label: this.$t('menu.menuSection.sectionResection'),
                         handler: this.split,
-                        disabledCallback: MenuDisabledState.Section.split,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
                     },
                     {
                         label: this.$t('menu.menuSection.sectionActive'),
                         handler: this.active,
-                        disabledCallback: MenuDisabledState.Section.active,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.axisPreReset'),
-                        handler: this.axlePreReset,
-                        disabledCallback: MenuDisabledState.Section.axlePreReset,
-                        auth: { station: false, center: false }
+                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
                     },
                     {
                         label: this.$t('menu.menuSection.sectionBlockade'),
                         handler: this.lock,
-                        disabledCallback: MenuDisabledState.Section.lock,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
                     },
                     {
                         label: this.$t('menu.menuSection.sectionUnblock'),
                         handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Section.unlock,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
                     },
                     {
                         label: this.$t('menu.menuSection.sectionSetSpeedLimit'),
                         handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Section.setSpeed,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
                     },
                     {
                         label: this.$t('menu.menuSection.sectionCancelSpeedLimit'),
                         handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Section.cancelSpeed,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
                     }
                 ]
             },
-            menuTrain: [
-                {
-                    label: this.$t('menu.menuSection.createTrain'),
-                    handler: this.newTrain,
-                    disabledCallback: MenuDisabledState.Section.newTrain
-                }
-            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuSection.setFault'),
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Section.setStoppage
+                    cmdType: CMD.Section.CMD_SECTION_ADD_FAULT
                 },
                 {
                     label: this.$t('menu.menuSection.cancelFault'),
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Section.cancelStoppage
+                    cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT
                 }
             ]
         };
@@ -192,17 +164,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce, ...this.menuTrain];
-            }
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
-
-            this.menu = menuConvert(this.menu);
         },
         doShow(point) {
             this.clickEvent();
@@ -218,187 +185,183 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.stoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.stoppage.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_ADD_FAULT,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.cancelStoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.cancelStoppage.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 故障解锁
         fault() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.fault.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.fault.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
+                    this.$refs.sectionCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 切除
         split() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.split.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.split.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
+                    this.$refs.sectionControl.doShow(step, this.selected);
                 }
             });
         },
         // 激活
         active() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.active.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.active.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
+                    this.$refs.sectionControl.doShow(step, this.selected);
                 }
             });
         },
         // 区段计轴预复位
         axlePreReset() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.axlePreReset.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.axlePreReset.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
+                    this.$refs.sectionCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 区段解锁
         lock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.lock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.lock.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
+                    this.$refs.sectionControl.doShow(step, this.selected);
                 }
             });
         },
         // 区段封锁
         unlock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.unlock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.unlock.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
+                    this.$refs.sectionCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 设置速度
         setSpeed() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.setSpeed.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.setSpeed.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected);
+                    this.$refs.speedCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消速度
         cancelSpeed() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.cancelSpeed.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    const tempData = response.data;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.cancelSpeed.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
                 }
-            });
-        },
-        // 新建列车
-        newTrain() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.newtrain.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainCreate.doShow(operate, this.selected);
+                    Handler.execute(CMD.Section.CMD_QUERY, {}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.speedCmdControl.doShow(step, this.selected, tempData);
+                    });
                 }
             });
         }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
index 1bc1ac780..958cd69f1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
@@ -20,10 +20,12 @@ import RouteCmdControl from './dialog/routeCmdControl';
 import RouteHandControl from './dialog/routeHandControl';
 import RouteDetail from './dialog/routeDetail';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import { querySignalStatus } from '@/api/simulation';
 
 export default {
     name: 'SignalMenu',
@@ -49,134 +51,103 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
                         label: this.$t('menu.menuSignal.routeSelect'),
                         handler: this.arrangementRoute,
-                        disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
                     },
                     {
                         label: this.$t('menu.menuSignal.routeCancel'),
                         handler: this.cancelTrainRoute,
-                        disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
                     },
                     {
                         label: this.$t('menu.menuSignal.signalBlock'),
                         handler: this.lock,
-                        disabledCallback: MenuDisabledState.Signal.lock,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
                     },
                     {
                         label: this.$t('menu.menuSignal.signalDeblock'),
                         handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Signal.unlock,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
                     },
                     {
                         label: this.$t('menu.menuSignal.signalReopen'),
                         handler: this.reopenSignal,
-                        disabledCallback: MenuDisabledState.Signal.reopenSignal,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
                     },
                     {
                         label: this.$t('menu.menuSignal.guideRouteHandle'),
                         handler: this.guide,
-                        disabledCallback: MenuDisabledState.Signal.guide,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
                     },
                     {
                         label: this.$t('menu.menuSignal.setInterlockAutoRoute'),
                         handler: this.setAutoInterlock,
-                        disabledCallback: MenuDisabledState.Signal.setAutoInterlock,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
                     },
                     {
                         label: this.$t('menu.menuSignal.cancelInterlockAutoRoute'),
                         handler: this.cancelAutoInterlock,
-                        disabledCallback: MenuDisabledState.Signal.cancelAutoInterlock,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
                     },
                     {
                         label: this.$t('menu.menuSignal.setInterlockAutoTrigger'),
                         handler: this.setAutoTrigger,
-                        disabledCallback: MenuDisabledState.Signal.setAutoTrigger,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
                     },
                     {
                         label: this.$t('menu.menuSignal.cancelInterlockAutoTrigger'),
                         handler: this.cancelAutoTrigger,
-                        disabledCallback: MenuDisabledState.Signal.cancelAutoTrigger,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
                     },
                     {
                         label: this.$t('menu.menuSignal.signalOff'),
                         handler: this.signalClose,
-                        disabledCallback: MenuDisabledState.Signal.signalClose,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
                     }
                 ],
-                central: [
+                Center: [
                     {
                         label: this.$t('menu.menuSignal.routeSelect'),
                         handler: this.arrangementRoute,
-                        disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
                     },
                     {
                         label: this.$t('menu.menuSignal.routeCancel'),
                         handler: this.cancelTrainRoute,
-                        disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
                     },
                     {
                         label: this.$t('menu.menuSignal.signalBlock'),
                         handler: this.lock,
-                        disabledCallback: MenuDisabledState.Signal.lock,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
                     },
                     {
                         label: this.$t('menu.menuSignal.signalDeblock'),
                         handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Signal.unlock,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
                     },
                     {
                         label: this.$t('menu.menuSignal.signalOff'),
                         handler: this.signalClose,
-                        disabledCallback: MenuDisabledState.Signal.signalClose,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
                     },
                     {
                         label: this.$t('menu.menuSignal.signalReopen'),
                         handler: this.reopenSignal,
-                        disabledCallback: MenuDisabledState.Signal.reopenSignal,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeGuide'),
-                        handler: this.guide,
-                        disabledCallback: MenuDisabledState.Signal.guide,
-                        auth: { station: false, center: false }
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
                     },
                     {
                         label: this.$t('menu.menuSignal.humanControl'),
                         handler: this.humanControl,
-                        disabledCallback: MenuDisabledState.Signal.humanControl,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
                     },
                     {
                         label: this.$t('menu.menuSignal.atsAutoControl'),
                         handler: this.atsAutoControl,
-                        disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.queryRouteControlMode'),
-                        handler: this.detail,
-                        disabledCallback: MenuDisabledState.Signal.detail,
-                        auth: { station: true, center: true }
+                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
                     }
                 ]
             },
@@ -184,12 +155,12 @@ export default {
                 {
                     label: this.$t('menu.menuSignal.setFault'),
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Signal.setStoppage
+                    cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT
                 },
                 {
                     label: this.$t('menu.menuSignal.cancelFault'),
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Signal.cancelStoppage
+                    cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT
                 }
             ]
         };
@@ -201,7 +172,10 @@ export default {
         ]),
         ...mapGetters('menuOperation', [
             'buttonOperation'
-        ])
+        ]),
+        group() {
+            return this.$route.query.group;
+        }
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
@@ -220,19 +194,11 @@ export default {
             };
         },
         initMenu() {
-            // 编辑模式菜单列表
-            this.menu = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce];
-            }
-
+            this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
-
-            this.menu = menuConvert(this.menu);
-
         },
         doShow(point) {
             this.clickEvent();
@@ -248,291 +214,303 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.stoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.stoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelStoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelStoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 排列进路
         arrangementRoute() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.arrangementRoute.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
-                    var tempData = null;
-                    if (response) {
-                        tempData = response.data;
-                    }
-                    this.$refs.routeSelection.doShow(operate.operation, this.selected, tempData);
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeSelection.doShow(step.operation, this.selected, tempData);
+                    });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消进路
         cancelTrainRoute() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 信号封锁
         lock() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.lock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.lock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeLock.doShow(operate.operation, this.selected);
+                    this.$refs.routeLock.doShow(step.operation, this.selected);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 信号解封
         unlock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.unlock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.unlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeCmdControl.doShow(operate, this.selected);
+                    this.$refs.routeCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 信号重开
         reopenSignal() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.reopenSignal.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 进路引导
         guide() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.guide.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.guide.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
-                    this.$refs.routeCmdControl.doShow(operate, this.selected);
+                    this.$refs.routeCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 设置联锁自动进路
         setAutoInterlock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.setAutoInterlock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.setAutoInterlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消联锁自动进路
         cancelAutoInterlock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 设置联锁自动触发
         setAutoTrigger() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.setAutoTrigger.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.setAutoTrigger.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消联锁自动触发
         cancelAutoTrigger() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 信号关灯
         signalClose() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.signalClose.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
+                    this.$refs.routeControl.doShow(step, this.selected);
                 }
             });
         },
         // 自排关(进路交人工控)
         humanControl() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.humanControl.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempData = null;
-                    if (response) {
-                        tempData = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeHandControl.doShow(step, this.selected, tempData);
+                    });
                 }
             });
         },
         // 自排关（进路交ATS自动控）
         atsAutoControl() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempData = null;
-                    if (response) {
-                        tempData = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
+                Signal_Code: `${this.selected.code}`,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
                 }
-            });
-        },
-        // 查询进路状态
-        detail() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.detail.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeDetail.doShow(operate, this.selected, response.data);
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeHandControl.doShow(step, this.selected, tempData);
+                    });
                 }
             });
         }
+        // 查询进路状态
+        // detail() {
+        //     const step = {
+        //         start: true,
+        //         code: `${this.selected.code}`,
+        //         operation: OperationEvent.Signal.detail.menu.operation,
+        //         param: {
+        //             Signal_Code: `${this.selected.code}`
+        //         }
+        //     };
+        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+        //                 const tempData = resp.data;
+        //                 this.$refs.routeDetail.doShow(step, this.selected, tempData);
+        //             });
+        //         }
+        //     });
+        // }
     }
 };
 </script>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
index a5cbb4993..0efa0bfed 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
@@ -15,9 +15,10 @@ import StationHumanControlAll from './dialog/stationHumanControlAll';
 import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'StationMenu',
@@ -40,63 +41,60 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
                         label: this.$t('menu.menuStation.fullSiteSetInterlockAutoTrigger'),
                         handler: this.setAutoTrigger,
-                        disabledCallback: MenuDisabledState.Station.setAutoTrigger,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
                     },
                     {
                         label: this.$t('menu.menuStation.fullSiteCancelInterlockAutoTrigger'),
                         handler: this.cancelAutoTrigger,
-                        disabledCallback: MenuDisabledState.Station.cancelAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.powerUnLock'),
-                        handler: this.powerUnLock,
-                        disabledCallback: MenuDisabledState.Station.powerUnLock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.execKeyOperationTest'),
-                        handler: this.execKeyOperationTest,
-                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-                        auth: { station: true, center: false }
+                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
                     }
+                    // {
+                    //     label: this.$t('menu.menuStation.powerUnLock'),
+                    //     handler: this.powerUnLock,
+                    //     auth: { station: true, center: false }
+                    //     // cmdType: CMD.Station.
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuStation.execKeyOperationTest'),
+                    //     handler: this.execKeyOperationTest,
+                    //     auth: { station: true, center: false }
+                    //     // cmdType: CMD.Station.
+                    // }
                 ],
-                central: [
+                Center: [
                     {
                         label: this.$t('menu.menuStation.allHumanControl'),
                         handler: this.humanControlALL,
-                        disabledCallback: MenuDisabledState.Station.humanControlALL,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
                     },
                     {
                         label: this.$t('menu.menuStation.allATSAutoControl'),
                         handler: this.atsAutoControlALL,
-                        disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.execKeyOperationTest'),
-                        handler: this.execKeyOperationTest,
-                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-                        auth: { station: false, center: true }
+                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
                     }
+                    // {
+                    //     label: this.$t('menu.menuStation.execKeyOperationTest'),
+                    //     handler: this.execKeyOperationTest,
+                    //     auth: { station: false, center: true },
+                    //     cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
+                    //     // cmdType: CMD.Section.
+                    // }
                 ]
             },
             menuForce: [
                 {
                     label: this.$t('menu.menuStation.setStoppage'),
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Station.setStoppage
+                    cmdType: CMD.Station.CMD_STATION_ADD_FAULT
                 },
                 {
                     label: this.$t('menu.menuStation.cancelStoppage'),
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Station.cancelStoppage
+                    cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
                 }
             ]
         };
@@ -130,7 +128,8 @@ export default {
             this.menu = [];
             if (this.selected.concentrateStationCode == this.selected.code) {
                 // 编辑模式菜单列表
-                this.menu = menuFiltration(this.menuNormal);
+                // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
+                this.menu = MenuContextHandler.covert(this.menuNormal);
                 if (this.operatemode === OperateMode.ADMIN) {
                     this.menu = [...this.menu, ...this.menuForce];
                 }
@@ -143,7 +142,7 @@ export default {
                 }
             }
 
-            this.menu = menuConvert(this.menu);
+            // this.menu = MenuContextHandler.covert(this.menu);
         },
         doShow(point) {
             this.clickEvent();
@@ -159,141 +158,149 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.stoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.stoppage.menu.operation,
+                cmdType: CMD.Station.CMD_STOPPAGE,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.cancelStoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.cancelStoppage.menu.operation,
+                cmdType: CMD.Station.CMD_CANCEL_STOPPAGE,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 全站设置联锁自动触发
         setAutoTrigger() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.setAutoTrigger.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.setAutoTrigger.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 全站取消联锁自动触发
         cancelAutoTrigger() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.cancelAutoTrigger.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 上电解锁
         powerUnLock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.powerUnLock.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.powerUnLock.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationCmdControl.doShow(operate, this.selected);
+                    this.$refs.stationCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 执行关键操作测试
         execKeyOperationTest() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.execKeyOperationTest.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.execKeyOperationTest.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationCmdControl.doShow(operate, this.selected);
+                    this.$refs.stationCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 所有进路自排关
         humanControlALL() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.humanControlALL.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.humanControlALL.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationHumanControlAll.doShow(operate);
+                    this.$refs.stationHumanControlAll.doShow(step);
                 }
             });
         },
         // 所有进路自排开
         atsAutoControlALL() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.atsAutoControlALL.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
+                    this.$refs.stationSetRouteControlAll.doShow(step, this.selected);
                 }
             });
         }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationControl.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationControl.vue
deleted file mode 100644
index ddecefc8a..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationControl.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <pop-menu ref="popMenu" :menu="menu" />
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import { mapGetters } from 'vuex';
-import { DeviceMenu } from '@/scripts/ConstDic';
-
-export default {
-    name: 'StationControlMenu',
-    components: {
-        PopMenu
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: [
-            ],
-            menuForce: [
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        doShow(point) {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
index a0c7f8d5b..f96f1ebd0 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
@@ -20,10 +20,12 @@ import StandRunLevel from './dialog/standRunLevel';
 import StandStopTime from './dialog/standStopTime';
 import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import Handler from '@/scripts/cmdPlugin/Handler';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'StationStandMenu',
@@ -49,128 +51,103 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
                         label: this.$t('menu.menuStationStand.detainTrain'),
                         handler: this.setDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
                     },
                     {
                         label: this.$t('menu.menuStationStand.cancelDetainTrain'),
                         handler: this.cancelDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
                     },
                     {
                         label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
                         handler: this.cancelDetainTrainForce,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrainForce,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
                     },
                     {
                         label: this.$t('menu.menuStationStand.jumpStop'),
                         handler: this.setJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
                     },
                     {
                         label: this.$t('menu.menuStationStand.cancelJumpStop'),
                         handler: this.cancelJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
                     },
                     {
                         label: this.$t('menu.menuStationStand.setRunLevel'),
                         handler: this.setRunLevel,
-                        disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-                        auth: { station: false, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
                     },
                     {
                         label: this.$t('menu.menuStationStand.setEarlyDeparture'),
                         handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: false, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
                     },
                     {
                         label: this.$t('menu.menuStationStand.setBackStrategy'),
                         handler: this.setBackStrategy,
-                        disabledCallback: MenuDisabledState.StationStand.setBackStrategy,
-                        auth: { station: false, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
                     },
                     {
                         label: this.$t('menu.menuStationStand.getStationStandStatus'),
                         handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
                     }
                 ],
-                central: [
+                Center: [
                     {
                         label: this.$t('menu.menuStationStand.detainTrain'),
                         handler: this.setDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
                     },
                     {
                         label: this.$t('menu.menuStationStand.cancelDetainTrain'),
                         handler: this.cancelDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
-                        handler: this.cancelDetainTrainForce,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrainForce,
-                        auth: { station: false, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
                     },
                     {
                         label: this.$t('menu.menuStationStand.cancelDetainTrainAll'),
                         handler: this.cancelDetainTrainAll,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrainAll,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
                     },
                     {
                         label: this.$t('menu.menuStationStand.jumpStop'),
                         handler: this.setJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
                     },
                     {
                         label: this.$t('menu.menuStationStand.cancelJumpStop'),
                         handler: this.cancelJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
                     },
                     {
                         label: this.$t('menu.menuStationStand.setStopTime'),
                         handler: this.setStopTime,
-                        disabledCallback: MenuDisabledState.StationStand.setStopTime,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
                     },
                     {
                         label: this.$t('menu.menuStationStand.setRunLevel'),
                         handler: this.setRunLevel,
-                        disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
                     },
                     {
                         label: this.$t('menu.menuStationStand.setEarlyDeparture'),
                         handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
                     },
                     {
                         label: this.$t('menu.menuStationStand.setBackStrategy'),
                         handler: this.setBackStrategy,
-                        disabledCallback: MenuDisabledState.StationStand.setBackStrategy,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
                     },
                     {
                         label: this.$t('menu.menuStationStand.getStationStandStatus'),
                         handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
                     }
                 ]
             },
@@ -178,12 +155,12 @@ export default {
                 {
                     label: this.$t('menu.menuStationStand.setFault'),
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.StationStand.setStoppage
+                    cmdType:CMD.Stand.CMD_STAND_ADD_FAULT
                 },
                 {
                     label: this.$t('menu.menuStationStand.cancelFault'),
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.StationStand.cancelStoppage
+                    cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT
                 }
             ]
         };
@@ -215,7 +192,8 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = menuFiltration(this.menuNormal);
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce];
             }
@@ -225,7 +203,7 @@ export default {
                 this.menu = this.menuForce;
             }
 
-            this.menu = menuConvert(this.menu);
+            // this.menu = MenuContextHandler.covert(this.menu);
         },
         doShow(point) {
             this.clickEvent();
@@ -241,246 +219,253 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.stoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.stoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_ADD_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelStoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelStoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置扣车
         setDetainTrain() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消扣车
         cancelDetainTrain() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 强制取消扣车
         cancelDetainTrainForce() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 全线取消扣车
         cancelDetainTrainAll() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standDetainTrainAll.doShow(operate, this.selected);
+                    this.$refs.standDetainTrainAll.doShow(step, this.selected);
                 }
             });
         },
         // 设置跳停
         setJumpStop() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消跳停
         cancelJumpStop() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 设置停站时间
         setStopTime() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standStopTime.doShow(operate, this.selected, tempDate);
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standStopTime.doShow(step, this.selected, tempData);
+                    });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置运行等级
         setRunLevel() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setRunLevel.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standRunLevel.doShow(operate, this.selected, tempDate);
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standRunLevel.doShow(step, this.selected, tempData);
+                    });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置提前发车
         earlyDeparture() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 设置折返策略
         setBackStrategy() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setBackStrategy.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standBackStrategy.doShow(operate, this.selected, tempDate);
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standBackStrategy.doShow(step, this.selected, tempData);
+                    });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 查询站台状态
         detail() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.detail.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.detail.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standDetail.doShow(operate, this.selected, tempDate);
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standDetail.doShow(step, this.selected, tempData);
+                    });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         }
     }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
index 8c18ebee9..a62a42a12 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
@@ -14,10 +14,11 @@ import SwitchControl from './dialog/switchControl';
 import SwitchCmdControl from './dialog/switchCmdControl';
 import SpeedCmdControl from './dialog/speedCmdControl';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'SwitchMenu',
@@ -40,134 +41,132 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
                         label: this.$t('menu.menuSwitch.switchLock'),
                         handler: this.lock,
-                        disabledCallback: MenuDisabledState.Switch.lock,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchUnlock'),
                         handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Switch.unlock,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionBlockade'),
                         handler: this.block,
-                        disabledCallback: MenuDisabledState.Switch.block,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionUnblock'),
                         handler: this.unblock,
-                        disabledCallback: MenuDisabledState.Switch.unblock,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchTurnout'),
                         handler: this.switchTurnout,
-                        disabledCallback: MenuDisabledState.Switch.switchTurnout,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_TURN
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'),
                         handler: this.fault,
-                        disabledCallback: MenuDisabledState.Switch.fault,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionAxisPreReset'),
                         handler: this.axlePreReset,
-                        disabledCallback: MenuDisabledState.Switch.axlePreReset,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
                     },
                     {
                         label: this.$t('menu.menuSwitch.sectionResection'),
                         handler: this.split,
-                        disabledCallback: MenuDisabledState.Switch.split,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF
                     },
                     {
                         label: this.$t('menu.menuSwitch.sectionActive'),
                         handler: this.active,
-                        disabledCallback: MenuDisabledState.Switch.active,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_ACTIVE
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'),
                         handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Switch.setSpeed,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'),
                         handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Switch.cancelSpeed,
-                        auth: { station: true, center: false }
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
                     }
                 ],
-                central: [
+                Center: [
                     {
                         label: this.$t('menu.menuSwitch.switchLock'),
                         handler: this.lock,
-                        disabledCallback: MenuDisabledState.Switch.lock,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchUnlock'),
                         handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Switch.unlock,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionBlockade'),
                         handler: this.block,
-                        disabledCallback: MenuDisabledState.Switch.block,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionUnblock'),
                         handler: this.unblock,
-                        disabledCallback: MenuDisabledState.Switch.unblock,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchTurnout'),
                         handler: this.switchTurnout,
-                        disabledCallback: MenuDisabledState.Switch.switchTurnout,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_TURN
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'),
                         handler: this.fault,
-                        disabledCallback: MenuDisabledState.Switch.fault,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
                     },
                     {
                         label: this.$t('menu.menuSwitch.sectionResection'),
                         handler: this.split,
-                        disabledCallback: MenuDisabledState.Switch.split,
-                        auth: { station: true, center: true }
+                        auth: { station: true, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF
                     },
                     {
                         label: this.$t('menu.menuSwitch.sectionActive'),
                         handler: this.active,
-                        disabledCallback: MenuDisabledState.Switch.active,
-                        auth: { station: true, center: true }
+                        auth: { station: true, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_ACTIVE
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'),
                         handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Switch.setSpeed,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
                     },
                     {
                         label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'),
                         handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Switch.cancelSpeed,
-                        auth: { station: false, center: true }
+                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
                     }
                 ]
             },
@@ -175,18 +174,18 @@ export default {
                 {
                     label: this.$t('menu.menuSwitch.setFault'),
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Switch.setStoppage,
                     auth: {
 
-                    }
+                    },
+                    cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT
                 },
                 {
                     label: this.$t('menu.menuSwitch.cancelFault'),
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Switch.cancelStoppage,
                     auth: {
 
-                    }
+                    },
+                    cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT
                 }
             ]
         };
@@ -218,7 +217,8 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = menuFiltration(this.menuNormal);
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce];
             }
@@ -228,7 +228,7 @@ export default {
                 this.menu = this.menuForce;
             }
 
-            this.menu = menuConvert(this.menu);
+            // this.menu = MenuContextHandler.covert(this.menu);
         },
         doShow(point) {
             this.clickEvent();
@@ -244,242 +244,255 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.stoppage.menu.operation
+
+                operation: OperationEvent.Switch.stoppage.menu.operation,
+                cmdType: CMD.Switch.CMD_STOPPAGE,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.cancelStoppage.menu.operation
+
+                operation: OperationEvent.Switch.cancelStoppage.menu.operation,
+                cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 道岔单锁
         lock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.lock.menu.operation
+
+                operation: OperationEvent.Switch.lock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$refs.switchControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔解封
         unlock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.unlock.menu.operation
+
+                operation: OperationEvent.Switch.unlock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔封锁
         block() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.block.menu.operation
+
+                operation: OperationEvent.Switch.block.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$refs.switchControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔解封
         unblock() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.unblock.menu.operation
+
+                operation: OperationEvent.Switch.unblock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔强扳
         switchTurnoutForce() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.turnoutForce.menu.operation
+
+                operation: OperationEvent.Switch.turnoutForce.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$refs.switchControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔转动
         switchTurnout() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.turnout.menu.operation
+
+                operation: OperationEvent.Switch.turnout.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
 
-            if (operate.operation) {
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            if (step.operation) {
+                this.$store.dispatch('training/next', step).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.switchControl.doShow(operate, this.selected);
+                        this.$refs.switchControl.doShow(step, this.selected);
                     }
                 });
             }
         },
         // 道岔故障解锁
         fault() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.fault.menu.operation
+
+                operation: OperationEvent.Switch.fault.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔计轴预复位
         axlePreReset() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.axlePreReset.menu.operation
+
+                operation: OperationEvent.Switch.axlePreReset.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 区段切除
         split() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.split.menu.operation
+
+                operation: OperationEvent.Switch.split.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$refs.switchControl.doShow(step, this.selected);
                 }
             });
         },
         // 区段激活
         active() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.active.menu.operation
+
+                operation: OperationEvent.Switch.active.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
+                    this.$refs.switchControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔设置速度
         setSpeed() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.setSpeed.menu.operation
+
+                operation: OperationEvent.Switch.setSpeed.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected);
+                    this.$refs.speedCmdControl.doShow(step, this.selected);
                 }
             });
         },
         // 道岔取消速度
         cancelSpeed() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.cancelSpeed.menu.operation
+
+                operation: OperationEvent.Switch.cancelSpeed.menu.operation,
+                cmdType: CMD.Switch.CMD_CANCEL_SPEED,
+                param: {
+                    Switch_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
                 if (valid) {
                     const tempData = response.data;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
+                    this.$refs.speedCmdControl.doShow(step, this.selected, tempData);
                 }
             });
         }
-
     }
 };
 </script>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index 40679a35d..7f215a543 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -14,14 +14,15 @@
 import PopMenu from '@/components/PopMenu';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import TrainControl from './dialog/trainControl';
 import TrainDelete from './dialog/trainDelete';
 import TrainMove from './dialog/trainMove';
 import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuTrain',
@@ -46,63 +47,63 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [],
-                central: [
-                    {
-                        label: this.$t('menu.menuTrain.addTrainId'),
-                        handler: this.addTrainId,
-                        disabledCallback: MenuDisabledState.Train.addTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.deleteTrainId'),
-                        handler: this.delTrainId,
-                        disabledCallback: MenuDisabledState.Train.delTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.editTrainId'),
-                        handler: this.editTrainId,
-                        disabledCallback: MenuDisabledState.Train.editTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.editTrainNo'),
-                        handler: this.editTrainNo,
-                        disabledCallback: MenuDisabledState.Train.editTrainNo,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.moveTrainId'),
-                        handler: this.moveTrainId,
-                        disabledCallback: MenuDisabledState.Train.moveTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.switchTrainId'),
-                        handler: this.switchTrainId,
-                        disabledCallback: MenuDisabledState.Train.switchTrainId,
-                        auth: { station: true, center: true }
-                    }
+                Local: [],
+                Center: [
+                    // {
+                    //     label: this.$t('menu.menuTrain.addTrainId'),
+                    //     handler: this.addTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.deleteTrainId'),
+                    //     handler: this.delTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.editTrainId'),
+                    //     handler: this.editTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.editTrainNo'),
+                    //     handler: this.editTrainNo,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.moveTrainId'),
+                    //     handler: this.moveTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.switchTrainId'),
+                    //     handler: this.switchTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // }
                 ]
             },
             menuForce: [
                 {
                     label: this.$t('menu.menuTrain.setCommunicationFault'),
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Train.setStoppage
+                    cmdType:CMD.Train.CMD_TRAIN_ADD_FAULT
                 },
                 {
                     label: this.$t('menu.menuTrain.cancelCommunicationFault'),
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Train.cancelStoppage
+                    cmdType:CMD.Train.CMD_TRAIN_REMOVE_FAULT
                 }
             ],
             menuSpeed: [
                 {
                     label: this.$t('menu.menuTrain.confirmRunToFrontStation'),
                     handler: this.limitSpeed,
-                    disabledCallback: MenuDisabledState.Train.limitSpeed
+                    cmdType:CMD.Train.CMD_TRAIN_MANUAL_LIMIT_DRIVE
                 }
             ]
         };
@@ -134,7 +135,8 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = trainMenuFiltration(this.menuNormal);
+            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
+            this.menu = MenuContextHandler.covert(this.menuNormal);
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
             }
@@ -144,7 +146,7 @@ export default {
                 this.menu = [...this.menuForce, ...this.menuSpeed];
             }
 
-            this.menu = menuConvert(this.menu);
+            // this.menu = MenuContextHandler.covert(this.menu);
         },
         doShow(point) {
             this.clickEvent();
@@ -162,157 +164,166 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.stoppage.menu.operation
+
+                operation: OperationEvent.Train.stoppage.menu.operation,
+                cmdType: CMD.Train.CMD_STOPPAGE,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.cancelStoppage.menu.operation
+
+                operation: OperationEvent.Train.cancelStoppage.menu.operation,
+                cmdType: CMD.Train.CMD_CANCEL_STOPPAGE,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 限速行驶
         limitSpeed() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.limitSpeed.menu.operation
+
+                operation: OperationEvent.Train.limitSpeed.menu.operation,
+                cmdType: CMD.Train.CMD_LIMIT_SPEED,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 添加列车识别号
         addTrainId() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.addTrainId.menu.operation
+
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
+                    this.$refs.trainControl.doShow(step, this.selected);
                 }
             });
         },
         // 删除列车识别号
         delTrainId() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.delTrainId.menu.operation
+
+                operation: OperationEvent.Train.delTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDelete.doShow(operate, this.selected);
+                    this.$refs.trainDelete.doShow(step, this.selected);
                 }
             });
         },
         // 修改列车识别号
         editTrainId() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.editTrainId.menu.operation
+
+                operation: OperationEvent.Train.editTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
+                    this.$refs.trainControl.doShow(step, this.selected);
                 }
             });
         },
         // 修改车组号
         editTrainNo() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.editTrainNo.menu.operation
+
+                operation: OperationEvent.Train.editTrainNo.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainEditNumber.doShow(operate, this.selected);
+                    this.$refs.trainEditNumber.doShow(step, this.selected);
                 }
             });
         },
         // 移动列车识别号
         moveTrainId() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.moveTrainId.menu.operation
+
+                operation: OperationEvent.Train.moveTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainMove.doShow(operate, this.selected);
+                    this.$refs.trainMove.doShow(step, this.selected);
                 }
             });
         },
         // 交换列车识别号
         switchTrainId() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.switchTrainId.menu.operation
+
+                operation: OperationEvent.Train.switchTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainSwitch.doShow(operate, this.selected);
+                    this.$refs.trainSwitch.doShow(step, this.selected);
                 }
             });
         }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
index d1f1124a9..471f03888 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -176,7 +176,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
@@ -189,7 +188,6 @@ export default {
         },
         commit() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue
index 0ee717b7d..9e5752284 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/control.vue
@@ -59,8 +59,9 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RequestControl',
@@ -203,7 +204,6 @@ export default {
 
             const operate = {
                 start: true,
-                type: MapDeviceType.StationControl.type,
                 operation: OperationEvent.StationControl.controlResponse.menu.operation
             };
 
@@ -227,22 +227,13 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
             this.$refs.multipleTable.setCurrentRow();
         },
-        serializeCodeListWithSeparator(sep) {
-            const codeList = [];
-            if (this.selection && this.selection.length) {
-                this.selection.forEach(elem => {
-                    codeList.push(elem.code);
-                });
-            }
-            return codeList.join(sep);
-        },
         handleChooseChange(selection) {
             this.selection = selection;
             if (selection && selection.length) {
+                const codeList = selection.map(elem => { return elem.code; });
                 const operate = {
-                    type: MapDeviceType.StationControl.type,
                     operation: OperationEvent.StationControl.controlResponse.choose.operation,
-                    val: this.serializeCodeListWithSeparator('::')
+                    val: codeList.join('::')
                 };
 
                 this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -257,13 +248,16 @@ export default {
         },
         agree() {
             const operate = {
-                send: true,
-                over: true,
-                type: MapDeviceType.StationControl.type,
+                start: true,
                 operation: OperationEvent.StationControl.controlResponse.agree.operation,
-                code: this.selection[0].code,
+                code: this.tableData[0].code,
                 val: this.commandId,
-                prdType: this.$store.state.training.prdType
+                cmdType: this.$store.state.training.prdType == '01' ? CMD.ControlConvertMenu.CMD_CM_REPLY_CENTER_CONTROL : CMD.ControlConvertMenu.CMD_CM_REPLY_STATION_CONTROL,
+                param: {
+                    ControlMode_Code: this.tableData[0].code,
+                    Reply_Command_Id: this.commandId,
+                    ControlMode_Reply: true
+                }
             };
 
             this.clearTimer();
@@ -279,17 +273,17 @@ export default {
         },
         refuse() {
             const operate = {
-                send: true,
-                over: true,
-                type: MapDeviceType.StationControl.type,
+                start: true,
                 operation: OperationEvent.StationControl.controlResponse.refuse.operation,
-                code: this.selection.length ? this.selection[0].code : '',
+                code: this.tableData[0].code,
                 val: this.commandId,
-                prdType: this.$store.state.training.prdType
+                cmdType:  this.$store.state.training.prdType == '01' ? CMD.ControlConvertMenu.CMD_CM_REPLY_CENTER_CONTROL : CMD.ControlConvertMenu.CMD_CM_REPLY_STATION_CONTROL,
+                param: {
+                    ControlMode_Code: this.tableData[0].code,
+                    Reply_Command_Id: this.commandId,
+                    ControlMode_Reply: false
+                }
             };
-            if (!operate.code) {
-                operate.code = this.tableData[0].code;
-            }
 
             this.clearTimer();
             this.disabledAgree = true;
diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
index 5dbdcd924..2b87d09de 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {
@@ -41,11 +41,9 @@ export default {
     watch: {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && elem.type == 'resp' && (elem.timeout || !elem.agree)) {
-                const operate = this.$store.state.training.operate;
                 const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
                 const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
                 const newOperate = {
-                    type: operate.type,
                     name: station.name
                 };
 
@@ -83,7 +81,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
 
@@ -96,7 +93,6 @@ export default {
         },
         commit() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js
index 230fc7be0..bd43672d1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js
+++ b/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js
@@ -7,12 +7,12 @@ export function getCurrentStateObject() {
 }
 
 /** 系统类型 */
-export const SystemType = {
+export const State2SimulationMap = {
     '01': 'local',		// 现地工作站
     '02': 'central'		// 中心调度工作站
 };
 
-export const StationControlType = {
+export const State2ControlMap = {
     '01': 'center', 	// 中控
     '02': 'station',	// 站控
     '03': 'station'
@@ -521,8 +521,8 @@ export function menuFiltration(menuObj) {
 
     if (control) {
         if (store.state.training.prdType != '') {
-            const type = SystemType[store.state.training.prdType];
-            const status = StationControlType[control.status];
+            const type = State2SimulationMap[store.state.training.prdType];
+            const status = State2ControlMap[control.status];
             menu = [...menuObj[type]];
             if (menu.constructor === Array) {
                 menu.forEach(elem => {
@@ -552,7 +552,7 @@ export function menuFiltration(menuObj) {
 export function trainMenuFiltration(menuObj) {
     var menu = [];
     if (store.state.training.prdType != '') {
-        const type = SystemType[store.state.training.prdType];
+        const type = State2SimulationMap[store.state.training.prdType];
         menu = [...menuObj[type]];
         if (menu.constructor === Array) {
             menu.forEach(elem => {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
index 1e5656ce3..be5de4ee8 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
@@ -1,6 +1,15 @@
 <template>
-    <el-dialog class="ningbo-01__systerm alxe-effective" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+    <el-dialog
+        class="ningbo-01__systerm alxe-effective"
+        :title="title"
+        :visible.sync="show"
+        width="420px"
+        :before-close="doClose"
+        :zIndex="2000"
+        :modal="false"
+        :close-on-click-modal="false"
+        v-dialogDrag
+    >
         <div style="padding: 10px 20px;border: 1px solid lightgray;">
             <span class="base-label">准备</span>
             <div style="margin-top: -10px">
@@ -10,14 +19,28 @@
                 </el-row>
                 <el-row type="flex" justify="left">
                     <el-col :span="9">
-                        <el-input :type="type" v-model="model.stationName" size="mini" :disabled="true"></el-input>
+                        <el-input
+                            :type="type"
+                            v-model="model.stationName"
+                            size="mini"
+                            :disabled="true"
+                        ></el-input>
                     </el-col>
                     <el-col :span="9">
-                        <el-input :type="type" v-model="model.sectionName" size="mini" :disabled="true"></el-input>
+                        <el-input
+                            :type="type"
+                            v-model="model.sectionName"
+                            size="mini"
+                            :disabled="true"
+                        ></el-input>
                     </el-col>
                     <el-col :span="4" :offset="1">
-                        <el-button :id="domIdConfirm1" size="mini" @click="commitOnce" :disabled="type==='password'">确认
-                        </el-button>
+                        <el-button
+                            :id="domIdConfirm1"
+                            size="mini"
+                            @click="commitOnce"
+                            :disabled="type==='password'"
+                        >确认</el-button>
                     </el-col>
                 </el-row>
             </div>
@@ -31,41 +54,63 @@
                 </el-row>
                 <el-row type="flex" justify="left">
                     <el-col :span="9">
-                        <el-select :id="domIdChoose1" v-model="model.confirmStationName" filterable size="mini"
-                            @change="stationSelectChange" :disabled="type==='text'">
-                            <el-option v-for="(option,index) in filterStationList" :key="index" :label="option.name"
-                                :value="option.name">
-                            </el-option>
+                        <el-select
+                            :id="domIdChoose1"
+                            v-model="model.confirmStationName"
+                            filterable
+                            size="mini"
+                            @change="stationSelectChange"
+                            :disabled="type==='text'"
+                        >
+                            <el-option
+                                v-for="(option,index) in filterStationList"
+                                :key="index"
+                                :label="option.name"
+                                :value="option.name"
+                            ></el-option>
                         </el-select>
                     </el-col>
                     <el-col :span="9">
-                        <el-select :id="domIdChoose2" v-model="model.confirmSectionName" filterable size="mini"
-                            @change="sectionSelectChange" :disabled="type==='text'">
-                            <el-option v-for="(option,index) in randomSectionList" :key="index" :label="option.name"
-                                :value="option.name">
-                            </el-option>
+                        <el-select
+                            :id="domIdChoose2"
+                            v-model="model.confirmSectionName"
+                            filterable
+                            size="mini"
+                            @change="sectionSelectChange"
+                            :disabled="type==='text'"
+                        >
+                            <el-option
+                                v-for="(option,index) in randomSectionList"
+                                :key="index"
+                                :label="option.name"
+                                :value="option.name"
+                            ></el-option>
                         </el-select>
                     </el-col>
                     <el-col :span="4" :offset="1">
-                        <el-button :id="domIdConfirm2" size="mini" :loading="loading" @click="commit"
-                            :disabled="type==='text'">确认</el-button>
+                        <el-button
+                            :id="domIdConfirm2"
+                            size="mini"
+                            :loading="loading"
+                            @click="commit"
+                            :disabled="type==='text'"
+                        >确认</el-button>
                     </el-col>
                 </el-row>
             </div>
         </div>
         <el-row type="flex" justify="left" style="margin-top:20px;margin-bottom: 10px;">
-            <el-col :span="6" :offset="1"> 操作倒计时</el-col>
+            <el-col :span="6" :offset="1">操作倒计时</el-col>
             <el-col :span="16">
                 <el-input v-model="model.time" size="mini" :readonly="true"></el-input>
             </el-col>
         </el-row>
         <el-row>
-            <el-col :offset="1"> 状态</el-col>
+            <el-col :offset="1">状态</el-col>
         </el-row>
         <el-row>
             <el-col :offset="1" :span="23">
-                <el-input type="textarea" :rows="2" placeholder="" v-model="model.status">
-                </el-input>
+                <el-input type="textarea" :rows="2" placeholder v-model="model.status"></el-input>
             </el-col>
         </el-row>
         <el-row class="botton-group" style="margin-top:20px">
@@ -79,336 +124,450 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
-    import PopupAlarm from './childDialog/popupAlarm';
+import { mapGetters } from "vuex";
+import {
+    MapDeviceType,
+    OperationEvent,
+    getDomIdByOperation
+} from "@/scripts/ConstDic";
+import { mouseCancelState } from "../utils/menuItemStatus";
+import NoticeInfo from "./childDialog/childDialog/noticeInfo";
+import PopupAlarm from "./childDialog/popupAlarm";
 
-    export default {
-        name: 'AlxeEffective',
-        components: {
-            NoticeInfo,
-            PopupAlarm
+export default {
+    name: "AlxeEffective",
+    components: {
+        NoticeInfo,
+        PopupAlarm
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            type: "text",
+            timeout: 1000,
+            timenum: 30,
+            stepNum: 0,
+            task: null,
+            model: {
+                stationName: "",
+                sectionName: "",
+                confirmStationName: "",
+                confirmSectionName: "",
+                status: "",
+                time: 0
+            },
+            selected: null,
+            operate: null,
+            operation: "",
+            randomSectionList: []
+        };
+    },
+    computed: {
+        ...mapGetters("map", ["stationList", "sectionList"]),
+        filterStationList() {
+            let i = 0,
+                list = [];
+            if (this.stationList) {
+                this.stationList.forEach(elem => {
+                    if (
+                        list.findIndex(it => {
+                            return it.name == elem.name;
+                        }) < 0
+                    ) {
+                        list.push({ name: elem.name });
+                    }
+                });
+            }
+            return list;
         },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                type: 'text',
-                timeout: 1000,
-                timenum: 30,
-                stepNum: 0,
-                task: null,
-                model: {
-                    stationName: '',
-                    sectionName: '',
-                    confirmStationName: '',
-                    confirmSectionName: '',
-                    status: '',
-                    time: 0,
-                },
-                selected: null,
-                operate: null,
-                operation: '',
-                randomSectionList: []
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (
+                    this.operation ==
+                    OperationEvent.Section.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Section.alxeEffective.confirm1.domId;
+                } else if (
+                    this.operation ==
+                    OperationEvent.Switch.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Switch.alxeEffective.confirm1.domId;
+                }
             }
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationList',
-                'sectionList'
-            ]),
-            filterStationList() {
-                let i = 0, list = [];
-                if (this.stationList) {
-                    this.stationList.forEach(elem => {
-                        if (list.findIndex(it => { return it.name == elem.name }) < 0) {
-                            list.push({ name: elem.name });
-                        }
-                    });
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (
+                    this.operation ==
+                    OperationEvent.Section.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Section.alxeEffective.confirm2.domId;
+                } else if (
+                    this.operation ==
+                    OperationEvent.Switch.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Switch.alxeEffective.confirm2.domId;
                 }
-                return list;
-            },
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdConfirm1() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                        return OperationEvent.Section.alxeEffective.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                        return OperationEvent.Switch.alxeEffective.confirm1.domId;
-                    }
-                }
-            },
-            domIdConfirm2() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                        return OperationEvent.Section.alxeEffective.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                        return OperationEvent.Switch.alxeEffective.confirm2.domId;
-                    }
-                }
-            },
-            domIdChoose1() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                        return OperationEvent.Section.alxeEffective.choose1.domId;
-                    } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                        return OperationEvent.Switch.alxeEffective.choose1.domId;
-                    }
-                }
-            },
-            domIdChoose2() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                        return OperationEvent.Section.alxeEffective.choose2.domId;
-                    } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                        return OperationEvent.Switch.alxeEffective.choose2.domId;
-                    }
-                }
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            title() {
-                this.earlyDepar = false;
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation ||
-                    this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                    return '确认计轴恢复工作';
-                }
-            },
+            }
         },
-        watch: {
-            'model.sectionName': function (name) {
-                let index = Math.floor(Math.random(1) * 5);
-                for (var i = 0; i < 5; i++) {
-                    if (i == index) {
-                        this.randomSectionList.push({ name });
-                    } else {
-                        let section = this.sectionList[Math.floor(Math.random(1) * this.sectionList.length)];
-                        if (section.type != '02') {
-                            if (this.randomSectionList.findIndex(it => { return it.name == section.name }) < 0) {
-                                this.randomSectionList.push({ name: section.name });
-                            } else {
-                                i--;
-                            }
+        domIdChoose1() {
+            if (this.dialogShow) {
+                if (
+                    this.operation ==
+                    OperationEvent.Section.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Section.alxeEffective.choose1.domId;
+                } else if (
+                    this.operation ==
+                    OperationEvent.Switch.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Switch.alxeEffective.choose1.domId;
+                }
+            }
+        },
+        domIdChoose2() {
+            if (this.dialogShow) {
+                if (
+                    this.operation ==
+                    OperationEvent.Section.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Section.alxeEffective.choose2.domId;
+                } else if (
+                    this.operation ==
+                    OperationEvent.Switch.alxeEffective.menu.operation
+                ) {
+                    return OperationEvent.Switch.alxeEffective.choose2.domId;
+                }
+            }
+        },
+        domIdCancel() {
+            return this.dialogShow
+                ? OperationEvent.Command.cancel.menu.domId
+                : "";
+        },
+        title() {
+            this.earlyDepar = false;
+            if (
+                this.operation ==
+                    OperationEvent.Section.alxeEffective.menu.operation ||
+                this.operation ==
+                    OperationEvent.Switch.alxeEffective.menu.operation
+            ) {
+                return "确认计轴恢复工作";
+            }
+            return "";
+        }
+    },
+    watch: {
+        "model.sectionName": function(name) {
+            let index = Math.floor(Math.random(1) * 5);
+            for (var i = 0; i < 5; i++) {
+                if (i == index) {
+                    this.randomSectionList.push({ name });
+                } else {
+                    let section = this.sectionList[
+                        Math.floor(Math.random(1) * this.sectionList.length)
+                    ];
+                    if (section.type != "02") {
+                        if (
+                            this.randomSectionList.findIndex(it => {
+                                return it.name == section.name;
+                            }) < 0
+                        ) {
+                            this.randomSectionList.push({ name: section.name });
                         } else {
                             i--;
                         }
+                    } else {
+                        i--;
                     }
                 }
             }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            stopTask() {
-                if (this.task) {
-                    clearInterval(this.task);
-                    this.task = null;
-                }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch("training/tipReload");
+        });
+    },
+    methods: {
+        stopTask() {
+            if (this.task) {
+                clearInterval(this.task);
+                this.task = null;
+            }
 
-                if (this.stepNum < 3) {
-                    this.$store.dispatch('training/backSteps', this.stepNum);
-                    this.$store.dispatch('training/emitTipFresh');
-                    this.model.name = '';
-                    this.model.time = '';
-                    this.type = 'text';
-                }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.status = '';
-                this.model.stationName = '';
-                this.model.sectionName = '';
-                this.model.confirmStationName = '';
-                this.model.confirmSectionName = '';
-                if (selected) {
-                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                        if (selected.isSwitchSection) {
-                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                            if (section) {
-                                this.model.sectionName = section.name;
-                            }
-                        } else {
-                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                            if (section) {
-                                this.model.sectionName = section.name;
-                                this.model.sectionName = `${section.name}-${selected.name}`;
-                            } else {
-                                this.model.sectionName = `${selected.name}`;
-                            }
-                        }
-                    } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                        let section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode);
+            if (this.stepNum < 3) {
+                this.$store.dispatch("training/backSteps", this.stepNum);
+                this.$store.dispatch("training/emitTipFresh");
+                this.model.name = "";
+                this.model.time = "";
+                this.type = "text";
+            }
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            this.operate = operate || {};
+            this.operation = operate.operation;
+            this.status = "";
+            this.model.stationName = "";
+            this.model.sectionName = "";
+            this.model.confirmStationName = "";
+            this.model.confirmSectionName = "";
+            if (selected) {
+                if (
+                    selected &&
+                    selected._type.toUpperCase() === "Section".toUpperCase()
+                ) {
+                    if (selected.isSwitchSection) {
+                        let section = this.$store.getters[
+                            "map/getDeviceByCode"
+                        ](selected.parentCode);
                         if (section) {
                             this.model.sectionName = section.name;
                         }
+                    } else {
+                        let section = this.$store.getters[
+                            "map/getDeviceByCode"
+                        ](selected.parentCode);
+                        if (section) {
+                            this.model.sectionName = section.name;
+                            this.model.sectionName = `${section.name}-${selected.name}`;
+                        } else {
+                            this.model.sectionName = `${selected.name}`;
+                        }
                     }
-
-                    let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.model.stationName = station.name;
+                } else if (
+                    selected._type.toUpperCase() === "Switch".toUpperCase()
+                ) {
+                    let section = this.$store.getters["map/getDeviceByCode"](
+                        selected.switchSectionCode
+                    );
+                    if (section) {
+                        this.model.sectionName = section.name;
                     }
                 }
 
-                this.stepNum = 0;
-                this.loading = false;
-                this.dialogShow = true;
-                this.stopTask();
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
+                let station = this.$store.getters["map/getDeviceByCode"](
+                    selected.stationCode
+                );
+                if (station) {
+                    this.model.stationName = station.name;
+                }
+            }
+
+            this.stepNum = 0;
+            this.loading = false;
+            this.dialogShow = true;
+            this.stopTask();
+            this.$nextTick(function() {
+                this.$store.dispatch("training/emitTipFresh");
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch("training/emitTipFresh");
+            mouseCancelState(this.selected);
+        },
+        waitSelectEvent() {
+            if (!this.$store.state.menuOperation.break) {
+                this.model.time -= 1;
+                if (this.model.time <= 0) {
+                    this.stopTask();
+                }
+            }
+        },
+        commitOnce() {
+            this.stepNum = 1;
+            let operate = {
+                type: this.operate.type,
+                operation: ""
+            };
+
+            if (
+                this.operation ==
+                OperationEvent.Section.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Section.alxeEffective.confirm1.operation;
+            } else if (
+                this.operation ==
+                OperationEvent.Switch.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Switch.alxeEffective.confirm1.operation;
+            }
+
+            this.$store.dispatch("training/next", operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch("menuOperation/handleBreakFlag", {
+                        break: true
+                    });
+                    this.type = "password";
+                    this.model.time = this.timenum;
+                    this.task = setInterval(this.waitSelectEvent, this.timeout);
+                }
+            });
+        },
+        stationSelectChange(val) {
+            if (this.model.confirmStationName === this.model.stationName) {
+                this.stepNum = 2;
+            } else {
+                this.model.time = 0;
+            }
+
+            let operate = {
+                type: this.operate.type,
+                operation: "",
+                val: val
+            };
+
+            if (
+                this.operation ==
+                OperationEvent.Section.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Section.alxeEffective.choose1.operation;
+            } else if (
+                this.operation ==
+                OperationEvent.Switch.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Switch.alxeEffective.choose1.operation;
+            }
+
+            this.$store.dispatch("training/next", operate).then(({ valid }) => {
+                this.$store.dispatch("menuOperation/handleBreakFlag", {
+                    break: true
                 });
-            },
-            doClose() {
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            waitSelectEvent() {
-                if (!this.$store.state.menuOperation.break) {
-                    this.model.time -= 1;
-                    if (this.model.time <= 0) {
-                        this.stopTask();
-                    }
-                }
-            },
-            commitOnce() {
-                this.stepNum = 1;
-                let operate = {
-                    type: this.operate.type,
-                    operation: ''
-                }
+            });
+        },
+        sectionSelectChange(val) {
+            if (this.model.confirmSectionName === this.model.sectionName) {
+                this.stepNum = 2;
+            } else {
+                this.model.time = 0;
+            }
 
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Section.alxeEffective.confirm1.operation
-                } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation
-                }
+            let operate = {
+                type: this.operate.type,
+                operation: "",
+                val: val
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.type = 'password';
-                        this.model.time = this.timenum;
-                        this.task = setInterval(this.waitSelectEvent, this.timeout);
-                    }
-                })
-            },
-            stationSelectChange(val) {
-                if (this.model.confirmStationName === this.model.stationName) {
-                    this.stepNum = 2;
-                } else {
-                    this.model.time = 0;
-                }
+            if (
+                this.operation ==
+                OperationEvent.Section.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Section.alxeEffective.choose2.operation;
+            } else if (
+                this.operation ==
+                OperationEvent.Switch.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Switch.alxeEffective.choose2.operation;
+            }
 
-                let operate = {
-                    type: this.operate.type,
-                    operation: '',
-                    val: val
-                }
+            this.$store.dispatch("training/next", operate).then(({ valid }) => {
+                this.$store.dispatch("menuOperation/handleBreakFlag", {
+                    break: true
+                });
+            });
+        },
+        /** 确认计轴恢复工作*/
+        commit() {
+            let operate = {
+                send: true,
+                type: this.operate.type,
+                operation: "",
+                val: this.selected.code
+            };
 
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Section.alxeEffective.choose1.operation
-                } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation
-                }
+            if (
+                this.operation ==
+                OperationEvent.Section.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Section.alxeEffective.confirm2.operation;
+            } else if (
+                this.operation ==
+                OperationEvent.Switch.alxeEffective.menu.operation
+            ) {
+                operate.operation =
+                    OperationEvent.Switch.alxeEffective.confirm2.operation;
+            }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                })
-            },
-            sectionSelectChange(val) {
-                if (this.model.confirmSectionName === this.model.sectionName) {
-                    this.stepNum = 2;
-                } else {
-                    this.model.time = 0;
-                }
+            this.model.status = "";
+            if (
+                this.model.stationName == this.model.confirmStationName &&
+                this.model.sectionName == this.model.confirmSectionName
+            ) {
+                this.stepNum = 3;
 
-                let operate = {
-                    type: this.operate.type,
-                    operation: '',
-                    val: val
-                }
-
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Section.alxeEffective.choose2.operation
-                } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                })
-            },
-            /** 确认计轴恢复工作*/
-            commit() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: '',
-                    val: this.selected.code
-                }
-
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Section.alxeEffective.confirm2.operation
-                } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
-                    operate.operation = OperationEvent.Switch.alxeEffective.confirm2.operation
-                }
-
-                this.model.status = '';
-                if (this.model.stationName == this.model.confirmStationName &&
-                    this.model.sectionName == this.model.confirmSectionName) {
-                    this.stepNum = 3;
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = true;
+                this.$store
+                    .dispatch("training/next", operate)
+                    .then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
-                            this.type = 'text';
+                            this.type = "text";
                             this.stopTask();
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.$refs.popupAlarm.doShow(Object.assign(this.operate, { val: operate.val }),
-                                [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]);
+                            this.$store.dispatch(
+                                "menuOperation/handleBreakFlag",
+                                {
+                                    break: true
+                                }
+                            );
+                            this.$refs.popupAlarm.doShow(
+                                Object.assign(this.operate, {
+                                    val: operate.val
+                                }),
+                                [
+                                    `集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`
+                                ]
+                            );
                         }
-                    }).catch(error => {
-                        this.$refs.noticeInfo.doShow(operate);
                     })
-                } else {
-                    if (this.model.stationName != this.model.confirmStationName) {
-                        this.model.status = '车站选择错误';
-                    } else if (this.model.sectionName != this.model.confirmSectionName) {
-                        this.model.status = '区段选择错误';
-                    }
-
-                }
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+                    .catch(error => {
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+            } else {
+                if (this.model.stationName != this.model.confirmStationName) {
+                    this.model.status = "车站选择错误";
+                } else if (
+                    this.model.sectionName != this.model.confirmSectionName
+                ) {
+                    this.model.status = "区段选择错误";
                 }
+            }
+        },
+        cancel() {
+            let operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store
+                .dispatch("training/next", operate)
+                .then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
-                }).catch(error => {
+                })
+                .catch(error => {
                     this.doClose();
                 });
-            }
         }
     }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .alxe-effective .context {
-        height: 80px !important;
-    }
+.alxe-effective .context {
+    height: 80px !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
index 9c068f67b..3d5e6dd50 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
@@ -1,223 +1,245 @@
 <template>
-    <el-dialog class="ningbo-01__systerm signal-control" :title="title" :visible.sync="show" width="300px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row class="header">
-            <el-col :span="11"><span>集中站</span></el-col>
-            <el-col :span="11" :offset="2"><span>信号机</span></el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="11">
-                <el-input v-model="stationName" size="small" disabled></el-input>
-            </el-col>
-            <el-col :span="11" :offset="2">
-                <el-input v-model="signalName" size="small" disabled></el-input>
-            </el-col>
-        </el-row>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm signal-control"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="11"><span>集中站</span></el-col>
+      <el-col :span="11" :offset="2"><span>信号机</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="signalName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <div v-if="passModel" style="margin: 12px 0;">
+      <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" @change="changeRadio">设置自动通过</el-radio>
+      <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" @change="changeRadio">取消自动通过</el-radio>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'RouteControl',
-        components: {
-            ConfirmControl,
-            NoticeInfo
+export default {
+    name: 'RouteControl',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: null,
+            stationName: '',
+            signalName: '',
+            passRadio: '1',
+            passModel: false // 信号机控制显示判断
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                selected: null,
-                operation: null,
-                stationName: '',
-                signalName: ''
-
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                return '取消列车进路';
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                return '信号关灯';
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                return '重开信号';
+            } else if (this.operation == OperationEvent.Signal.singalPassModel.menu.operation) {
+                return '信号机控制';
             }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-            },
-            title() {
-                if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    return '取消列车进路';
-                } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-                    return '信号关灯';
-                } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-                    return '重开信号';
-                }
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.signalName = '';
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                        this.signalName = selected.name
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.stationName = station.name;
-                        }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.passModel = false;
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
                     }
-                    this.operation = operate.operation;
                 }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+                this.operation = operate.operation;
+                if (this.operation == OperationEvent.Signal.singalPassModel.menu.operation) {
+                    this.passModel = true;
+                }
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    /** 取消列车进路*/
-                    this.cancelTrainRoute();
-                } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-                    /** 信号关灯*/
-                    this.signalClose();
-                } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-                    /** 信号重开*/
-                    this.reopenSignal();
-                }
-            },
-            //取消列车进路
-            cancelTrainRoute() {
-                if (this.$store.state.training.prdType == '01') {
-                    /** 现地工作站*/
-                    this.cancelTrainRouteByLocal();
-                } else if (this.$store.state.training.prdType == '02') {
-                    /** 行调工作站*/
-                    this.cancelTrainRouteByCentral();
-                }
-            },
-            //现地工作站取消进路
-            cancelTrainRouteByLocal() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-                }
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        changeRadio() {
 
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //行调工作站取消进路
-            cancelTrainRouteByCentral() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //信号关灯
-            signalClose() {
-                let operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.signalClose.menu.operation,
-                    messages: [`信号关灯: ${this.signalName}`],
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.confirmControl.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                });
-            },
-            //信号重开
-            reopenSignal() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.reopenSignal.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //取消
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
+        },
+        commit() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                /** 取消列车进路*/
+                this.cancelTrainRoute();
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                /** 信号重开*/
+                this.reopenSignal();
+            } else if (this.operation == OperationEvent.Signal.singalPassModel.menu.operation) {
+                this.reopenSignal();
             }
+        },
+        // 取消列车进路
+        cancelTrainRoute() {
+            if (this.$store.state.training.prdType == '01') {
+                /** 现地工作站*/
+                this.cancelTrainRouteByLocal();
+            } else if (this.$store.state.training.prdType == '02') {
+                /** 行调工作站*/
+                this.cancelTrainRouteByCentral();
+            }
+        },
+        // 现地工作站取消进路
+        cancelTrainRouteByLocal() {
+            const operate = {
+                send: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 行调工作站取消进路
+        cancelTrainRouteByCentral() {
+            const operate = {
+                send: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                messages: [`信号关灯: ${this.signalName}`]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const operate = {
+                send: true,
+                operation: OperationEvent.Signal.reopenSignal.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
new file mode 100644
index 000000000..f88a9c28b
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
@@ -0,0 +1,229 @@
+<template>
+  <el-dialog v-dialogDrag class="ningbo-01__systerm stand-detain-train" :title="'批量设置' + title" :visible.sync="show" width="480px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row style="margin-top: -13px; padding: 20px 0px 5px 0;">
+      <el-col :span="11">
+        <span>上行线路设置{{ title }}</span>
+        <el-table ref="multipleTable" :data="standList" tooltip-effect="dark" height="400" style="width: 100%;margin: 5px 0;" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" />
+          <el-table-column label="站台名称">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+        </el-table>
+        <el-radio v-model="radio" label="1" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-radio>
+        <el-radio v-model="radio" label="2" style="display: block; text-align: left;">反向{{ title }}</el-radio>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <span>下行线路设置{{ title }}</span>
+        <el-table ref="multipleTable" :data="standList" tooltip-effect="dark" height="400" style="width: 100%;margin: 5px 0;" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" />
+          <el-table-column label="站台名称">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+        </el-table>
+        <el-radio v-model="radio" label="3" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-radio>
+        <el-radio v-model="radio" label="4" style="display: block; text-align: left;">反向{{ title }}</el-radio>
+      </el-col>
+    </el-row>
+    <el-row class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'StandDetainTrain',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: null,
+            standCode: '',
+            radio: '1'
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        standList() {
+            let list = [];
+            if (this.stationStandList && this.stationStandList.length) {
+                list = this.stationStandList.filter(elem => { return !elem.small; });
+            }
+            return list;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        upRadioId() {
+            return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.upSelect.domId : '';
+        },
+        downRadioId() {
+            return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.downSelect.domId : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) {
+                return '扣车';
+            } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) {
+                return '取消扣车';
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected) {
+                    this.standName = selected.name;
+                }
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.deviceStationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                this.operation = operate.operation;
+                this.standCode = operate.code;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.operation = '';
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        changeRadio(val) { // 提前发车选择上下行
+            const operate = {
+                operation: '',
+                val: val
+            };
+            if (val == 1) {
+                operate.operation = OperationEvent.StationStand.earlyDeparture.upSelect.operation;
+            } else if (val == 2) {
+                operate.operation = OperationEvent.StationStand.earlyDeparture.downSelect.operation;
+            }
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(error => {
+                console.log(error);
+            });
+        },
+        commit() {
+            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                /** 设置扣车*/
+                this.setDetainTrain();
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                /** 取消扣车*/
+                this.cancelDetainTrain();
+            }
+        },
+        // 设置扣车
+        setDetainTrain() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                param: {
+                    StationStand_Code: this.standCode
+                }
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                param: {
+                    StationStand_Code: this.standCode
+                }
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.loading = false;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
+<style scope>
+
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
index 45ffac1fc..db49efb1e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
@@ -1,15 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm stand-detain-train"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="ningbo-01__systerm stand-detain-train" :title="title" :visible.sync="show" width="320px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row class="header">
       <el-col :span="10"><span>集中站</span></el-col>
       <el-col :span="10" :offset="2"><span>站台</span></el-col>
@@ -22,7 +12,7 @@
         <el-input v-model="standName" size="small" disabled />
       </el-col>
     </el-row>
-    <div v-if="!earlyDepar">
+    <div v-if="buckle">
       <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
         <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
         <el-row style="margin-top: -13px;">
@@ -70,6 +60,30 @@
         </el-row>
       </div>
     </div>
+    <div v-if="AutomaticBuckle">
+      <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
+        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
+        <el-row style="margin-top: -13px;">
+          <el-col :span="11">
+            <el-radio v-model="autoRadio" label="1" style="display: block; text-align: left;">上行</el-radio>
+          </el-col>
+          <el-col :span="11" :offset="2">
+            <el-radio v-model="autoRadio" label="2" style="display: block; text-align: left;">下行</el-radio>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
+        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">功能</span>
+        <el-row style="margin-top: -13px;">
+          <el-col :span="11">
+            <el-radio v-model="autoRadio1" label="1" :disabled="autoRadio1 == '2'" style="display: block; text-align: left;">设置</el-radio>
+          </el-col>
+          <el-col :span="11" :offset="2">
+            <el-radio v-model="autoRadio1" label="2" :disabled="autoRadio1 == '1'" style="display: block; text-align: left;">取消</el-radio>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
     <div v-if="earlyDepar">
       <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
         <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
@@ -110,9 +124,11 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
 import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StandDetainTrain',
@@ -130,7 +146,12 @@ export default {
             radio: '1',
             radio1: '1',
             radio2: '1',
-            earlyDepar: false
+            earlyDepar: false, // 提前发车
+            buckle: true, // 设置扣车
+            AutomaticBuckle: false, // 区间自动扣车
+            standCode: '',
+            autoRadio: '1',
+            autoRadio1: '1'
         };
     },
     computed: {
@@ -141,7 +162,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         upRadioId() {
             return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.upSelect.domId : '';
@@ -150,21 +171,16 @@ export default {
             return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.downSelect.domId : '';
         },
         title() {
-            this.earlyDepar = false;
             if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                this.radio1 = '1';
                 return '扣车';
             } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                this.radio1 = '2';
                 return '取消扣车';
             } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                this.earlyDepar = true;
-                if (this.selected.direction == '01') {
-                    this.radio2 = '2';
-                } else {
-                    this.radio2 = '1';
-                }
                 return '提前发车';
+            } else if (this.operation == OperationEvent.StationStand.setDetainTrainAuto.menu.operation) {
+                return '区间自动扣车';
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
+                return '区间自动扣车';
             }
             return '';
         }
@@ -196,21 +212,48 @@ export default {
                 }
 
                 this.operation = operate.operation;
+                this.setDefaultItems();
+                this.standCode = operate.code;
             }
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        setDefaultItems() { // 设置默认选项值
+            this.earlyDepar = false;
+            this.buckle = false;
+            this.AutomaticBuckle = false;
+            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                this.buckle = true;
+                this.radio1 = '1';
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                this.buckle = true;
+                this.radio1 = '2';
+            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
+                this.earlyDepar = true;
+                if (this.selected.direction == '01') {
+                    this.radio2 = '2';
+                } else {
+                    this.radio2 = '1';
+                }
+            } else if (this.operation == OperationEvent.StationStand.setDetainTrainAuto.menu.operation) {
+                this.AutomaticBuckle = true;
+                this.autoRadio1 = '1';
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
+                this.AutomaticBuckle = true;
+                this.autoRadio1 = '2';
+            }
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.operation = '';
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
-        changeRadio(val) {
+        changeRadio(val) { // 提前发车选择上下行
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: '',
                 val: val
             };
@@ -243,13 +286,16 @@ export default {
         // 设置扣车
         setDetainTrain() {
             const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
+                over: true,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                param: {
+                    StationStand_Code: this.standCode
+                }
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -264,13 +310,16 @@ export default {
         // 取消扣车
         cancelDetainTrain() {
             const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                param: {
+                    StationStand_Code: this.standCode
+                }
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -285,13 +334,16 @@ export default {
         // 提前发车
         earlyDeparture() {
             const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation
+                over: true,
+                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
+                param: {
+                    StationStand_Code: this.standCode
+                }
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -304,12 +356,11 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
             this.loading = false;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue
index c2f46cd9e..42d00e5ed 100644
--- a/src/jmapNew/theme/ningbo_01/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/index.vue
@@ -4,7 +4,6 @@
     <template v-show="isShowAll">
       <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
       <menu-button ref="menuButton" />
-      <menu-station-control ref="menuStationControl" :selected="selected" />
       <menu-station-stand ref="menuStationStand" :selected="selected" />
       <menu-switch ref="menuSwitch" :selected="selected" />
       <menu-signal ref="menuSignal" :selected="selected" />
@@ -24,7 +23,6 @@ import { mapGetters } from 'vuex';
 import MenuCancel from './menuCancel';
 import MenuSignal from './menuSignal';
 import MenuButton from './menuButton';
-import MenuStationControl from './menuStationControl';
 import MenuStationStand from './menuStationStand';
 import MenuSwitch from './menuSwitch';
 import MenuSection from './menuSection';
@@ -45,7 +43,6 @@ export default {
         MenuSignal,
         MenuSwitch,
         MenuSection,
-        MenuStationControl,
         MenuStationStand,
         MenuStation,
         MenuTrain,
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue b/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue
index 36896b645..69031a452 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue
@@ -76,39 +76,9 @@ export default {
         },
         initMenu() {
             this.menuNormal = [];
-            // this.stationList.forEach(station => {
-            //     if (station.code === station.concentrateStationCode) {
-            //         let node = {
-            //             label: station.name,
-            //             children: []
-            //         }
-            //
-            //         this.stationList.forEach(elem => {
-            //             if (elem.visible) {
-            //                 let next = elem;
-            //                 while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
-            //                     next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
-            //                 }
-            //
-            //                 if (station.code == next.code) {
-            //                     node.children.push({
-            //                         code: elem.code,
-            //                         label: elem.name,
-            //                         handler: this.mapLocation,
-            //                     });
-            //                 }
-            //             }
-            //         })
-            //
-            //         this.menuNormal.push(node);
-            //     }
-            // });
             if (this.isScreen) {
                 this.menu = [...this.menuScreen];
             }
-            // else {
-            //     this.menu = [...this.menuNormal];
-            // }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue b/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
index 938e1b368..21f957938 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
@@ -14,107 +14,107 @@ import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
 import { MenuDisabledState } from './utils/menuItemStatus';
 
 export default {
-	name: 'MenuLimit',
-	components: {
-		PopMenu,
-		CancelAllLimit
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [{
-				label: '取消全线临时限速',
-				handler: this.cancelSpeed,
-				disabledCallback: '',
-				auth: { station: true, center: false }
-			}],
-			menuNormal: {
-				local: [
-					{
-						label: '取消全线临时限速',
-						handler: this.cancelSpeed,
-						disabledCallback: MenuDisabledState.Section.cancelSpeed,
-						auth: { station: true, center: false }
-					}
-				],
-				central: [
-					{
-						label: '取消全线临时限速',
-						handler: this.cancelSpeed,
-						disabledCallback: MenuDisabledState.Section.cancelSpeed,
-						auth: { station: false, center: true }
-					}
-				]
-			}
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu];
-			}
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 取消速度
-		cancelSpeed() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.LimitControl.type,
-				label: MapDeviceType.LimitControl.label,
-				operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.cancelAllLimit.doShow(operate, this.selected);
-				}
-			});
-		}
-	}
+    name: 'MenuLimit',
+    components: {
+        PopMenu,
+        CancelAllLimit
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [{
+                label: '取消全线临时限速',
+                handler: this.cancelSpeed,
+                disabledCallback: '',
+                auth: { station: true, center: false }
+            }],
+            menuNormal: {
+                local: [
+                    {
+                        label: '取消全线临时限速',
+                        handler: this.cancelSpeed,
+                        disabledCallback: MenuDisabledState.Section.cancelSpeed,
+                        auth: { station: true, center: false }
+                    }
+                ],
+                central: [
+                    {
+                        label: '取消全线临时限速',
+                        handler: this.cancelSpeed,
+                        disabledCallback: MenuDisabledState.Section.cancelSpeed,
+                        auth: { station: false, center: true }
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            if (this.operatemode === OperateMode.ADMIN) {
+                this.menu = [...this.menu];
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 取消速度
+        cancelSpeed() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+                type: MapDeviceType.LimitControl.type,
+                label: MapDeviceType.LimitControl.label,
+                operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.cancelAllLimit.doShow(operate, this.selected);
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
index a56c603d3..f838cc4ff 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -21,393 +21,283 @@ import TrainCreate from './dialog/trainCreate';
 import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
 import { mouseCancelState } from './utils/menuItemStatus';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
-	name: 'SectionMenu',
-	components: {
-		PopMenu,
-		SectionControl,
-		SectionCmdControl,
-		SpeedLimitControl,
-		SpeedCmdControl,
-		TrainCreate,
-		AlxeEffective,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						label: '区段故障解锁',
-						handler: this.fault,
-						disabledCallback: MenuDisabledState.Section.fault,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '区段激活',
-						handler: this.active,
-						disabledCallback: MenuDisabledState.Section.active,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '区段切除',
-						handler: this.split,
-						disabledCallback: MenuDisabledState.Section.split,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '区段计轴预复位',
-						handler: this.axlePreReset,
-						disabledCallback: MenuDisabledState.Section.axlePreReset,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '区段封锁',
-						handler: this.lock,
-						disabledCallback: MenuDisabledState.Section.lock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '区段解封',
-						handler: this.unlock,
-						disabledCallback: MenuDisabledState.Section.unlock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '区段设置限速',
-						handler: this.setSpeed,
-						disabledCallback: MenuDisabledState.Section.setSpeed,
-						auth: { station: true, center: false }
-					}
-				],
-				central: [
-					{
-						label: '区段跟踪激活',
-						handler: this.active,
-						disabledCallback: MenuDisabledState.Section.active,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '区段跟踪切除',
-						handler: this.split,
-						disabledCallback: MenuDisabledState.Section.split,
-						auth: { station: false, center: true }
-					},
-					{
-						type: 'separator'
-					},
-					{
-						label: '确认计轴有效',
-						handler: this.alxeEffective,
-						disabledCallback: MenuDisabledState.Section.alxeEffective,
-						auth: { station: false, center: true }
-					},
-					{
-						type: 'separator'
-					},
-					{
-						label: '设置临时限速',
-						handler: this.setSpeed,
-						disabledCallback: MenuDisabledState.Section.setSpeed,
-						auth: { station: false, center: true }
-					}
-					// {
-					// 	type: 'separator'
-					// },
-					// {
-					// 	label: '查看站场设备状态',
-					// 	handler: this.undeveloped,
-					// 	disabledCallback: MenuDisabledState.Section.setSpeed,
-					// 	auth: { station: false, center: true }
-					// }
-				]
-			},
-			menuTrain: [
-				{
-					label: '新建列车',
-					handler: this.newTrain,
-					disabledCallback: MenuDisabledState.Section.newTrain
-				}
-			],
-			menuForce: [
-				{
-					label: '设置计轴失效',
-					handler: this.alxeFailure,
-					disabledCallback: MenuDisabledState.Section.alxeFailure
-				}
-			]
-		};
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce, ...this.menuTrain];
-			}
+    name: 'SectionMenu',
+    components: {
+        PopMenu,
+        SectionControl,
+        SectionCmdControl,
+        SpeedLimitControl,
+        SpeedCmdControl,
+        TrainCreate,
+        AlxeEffective,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: '区段故障解锁',
+                        handler: this.fault,
+                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    },
+                    {
+                        label: '区段激活',
+                        handler: this.active,
+                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
+                    },
+                    {
+                        label: '区段切除',
+                        handler: this.split,
+                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+                    },
+                    {
+                        label: '区段封锁',
+                        handler: this.lock,
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
+                    },
+                    {
+                        label: '区段解封',
+                        handler: this.unlock,
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                    }
+                ],
+                Center: [
+                    {
+                        label: '区段跟踪激活',
+                        handler: this.active,
+                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
+                    },
+                    {
+                        label: '区段跟踪切除',
+                        handler: this.split,
+                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+                    },
+                    {
+                        label: '确认计轴有效',
+                        handler: this.alxeEffective,
+                        cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
+                    },
+                    {
+                        label: '设置临时限速',
+                        handler: this.setSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置计轴失效', // 设置区段故障
+                    handler: this.alxeFailure,
+                    cmdType: CMD.Section.CMD_SECTION_ADD_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置计轴失效
+        alxeFailure() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.alxeFailure.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置计轴失效
-		alxeFailure() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.alxeFailure.menu.operation
-			};
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 故障解锁
+        fault() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.fault.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 故障解锁
-		fault() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.fault.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		undeveloped() {
-			this.doClose();
-			this.$alert('实现中......', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-				}
-			});
-		},
-		// 切除
-		split() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.split.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		alxeEffective() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.alxeEffective.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.alxeEffective.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 激活
-		active() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.active.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 区段计轴预复位
-		axlePreReset() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.axlePreReset.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 区段解锁
-		lock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.lock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 区段封锁
-		unlock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.unlock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.sectionCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 设置速度
-		setSpeed() {
-			// let operate = {
-			//     start: true,
-			//     code: this.selected.code,
-			//     type: MapDeviceType.Section.type,
-			//     label: MapDeviceType.Section.label,
-			//     operation: OperationEvent.Section.setLimitSpeed.menu.operation
-			// };
-			// this.$store.dispatch('training/next', operate).then(({ valid }) => {
-			//     if (valid) {
-			//         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-			//         this.$refs.speedCmdControl.doShow(operate, this.selected);
-			//     }
-			// });
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.setSpeed.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.speedLimitControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 取消速度
-		// cancelSpeed() {
-		//     let operate = {
-		//         start: true,
-		//         send: true,
-		//         code: this.selected.code,
-		//         type: MapDeviceType.Section.type,
-		//         label: MapDeviceType.Section.label,
-		//         operation: OperationEvent.Section.cancelSpeed.menu.operation
-		//     };
-		//     this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-		//         if (valid) {
-		//             let tempData = response.data;
-		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-		//             this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
-		//         }
-		//     });
-		// },
-		// 新建列车
-		newTrain() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Section.type,
-				label: MapDeviceType.Section.label,
-				operation: OperationEvent.Section.newtrain.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainCreate.doShow(operate, this.selected);
-				}
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 切除
+        split() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.split.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 确认计轴有效
+        alxeEffective() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.alxeEffective.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.alxeEffective.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段激活
+        active() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.active.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段解锁
+        lock() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.lock.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段封锁
+        unlock() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.unlock.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置速度
+        setSpeed() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Section.setSpeed.menu.operation,
+                param: {
+                    Section_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index 94bbeeeee..04e03d9b9 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -20,401 +20,422 @@ import RouteCmdControl from './dialog/routeCmdControl';
 import RouteHandControl from './dialog/routeHandControl';
 import RouteDetail from './dialog/routeDetail';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+
 import { mouseCancelState } from './utils/menuItemStatus';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+// import { querySignalStatus } from '@/api/simulation';
 
 export default {
-	name: 'SignalMenu',
-	components: {
-		PopMenu,
-		RouteControl,
-		RouteSelection,
-		RouteLock,
-		RouteCmdControl,
-		RouteHandControl,
-		RouteDetail,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						label: '排列进路',
-						handler: this.arrangementRoute,
-						disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '取消进路',
-						handler: this.cancelTrainRoute,
-						disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '信号重开',
-						handler: this.reopenSignal,
-						disabledCallback: MenuDisabledState.Signal.reopenSignal,
-						auth: { station: false, center: true }
-					},
-					{
-						type: 'separator'
-					},
-					{
-						label: '进路交人工控',
-						handler: this.humanControl,
-						disabledCallback: MenuDisabledState.Signal.humanControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '进路交自动控',
-						handler: this.atsAutoControl,
-						disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '查询进路控制状态',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.Signal.detail,
-						auth: { station: true, center: true }
-					}
-				],
-				central: [
-					{
-						label: '设置进路',
-						handler: this.arrangementRoute,
-						disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '取消列车进路',
-						handler: this.cancelTrainRoute,
-						disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '信号重开',
-						handler: this.reopenSignal,
-						disabledCallback: MenuDisabledState.Signal.reopenSignal,
-						auth: { station: false, center: true }
-					},
-					{
-						type: 'separator'
-					},
-					{
-						label: '进路交人工控',
-						handler: this.humanControl,
-						disabledCallback: MenuDisabledState.Signal.humanControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '进路交自动控',
-						handler: this.atsAutoControl,
-						disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '查询进路控制状态',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.Signal.detail,
-						auth: { station: true, center: true }
-					}
-				]
-			},
-			menuForce: [
-				{
-					label: '信号关灯',
-					handler: this.signalClose,
-					disabledCallback: ''
-				},
-				{
-					label: '设置故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Signal.setStoppage
-				},
-				{
-					label: '取消故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Signal.cancelStoppage
-				}
-			]
-		};
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce];
-			}
+    name: 'SignalMenu',
+    components: {
+        PopMenu,
+        RouteControl,
+        RouteSelection,
+        RouteLock,
+        RouteCmdControl,
+        RouteHandControl,
+        RouteDetail,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: '排列进路',
+                        handler: this.arrangementRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    },
+                    {
+                        label: '取消进路',
+                        handler: this.cancelTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    },
+                    {
+                        label: '信号重开',
+                        handler: this.reopenSignal,
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+                    },
+                    {
+                        label: '信号封锁',
+                        handler: this.lock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+                    },
+                    {
+                        label: '信号解封',
+                        handler: this.unlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                    },
+                    {
+                        label: '进路交人工控',
+                        handler: this.humanControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                    },
+                    {
+                        label: '进路交自动控',
+                        handler: this.atsAutoControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                    },
+                    {
+                        label: '查询进路控制状态',
+                        handler: this.detail,
+                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+                    }
+                ],
+                Center: [
+                    {
+                        label: '设置进路',
+                        handler: this.arrangementRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    },
+                    {
+                        label: '取消列车进路',
+                        handler: this.cancelTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    },
+                    {
+                        label: '信号重开',
+                        handler: this.reopenSignal,
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+                    },
+                    {
+                        label: '进路交人工控',
+                        handler: this.humanControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                    },
+                    {
+                        label: '进路交自动控',
+                        handler: this.atsAutoControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                    },
+                    {
+                        label: '设置/取消通过模式',
+                        handler: this.singalPassModel,
+                        cmdType: CMD.Signal.CMD_SIGNAL_PASS_MODEL
+                    },
+                    {
+                        label: '查询进路控制状态',
+                        handler: this.detail,
+                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '信号关灯',
+                    handler: this.signalClose,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+                },
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.stoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelStoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 排列进路
+        arrangementRoute() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
 
-			this.menu = menuConvert(this.menu);
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    // querySignalStatus(this.group, {signalCode: this.selected.code}).then(resp => {
+                    // const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.routeSelection.doShow(step.operation, this.selected, tempData);
+                    // });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消进路
+        cancelTrainRoute() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                param: {
+                    Signal_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号封锁
+        lock() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.lock.menu.operation,
+                param: {
+                    Signal_Code: this.selected.code
+                }
+            };
 
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.stoppage.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.cancelStoppage.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 设置进路
-		arrangementRoute() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.arrangementRoute.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					var tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$refs.routeSelection.doShow(operate.operation, this.selected, tempData);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消进路
-		cancelTrainRoute() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 信号封锁
-		lock() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.lock.menu.operation
-			};
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeLock.doShow(operate.operation, this.selected);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 信号解封
-		unlock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.unlock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 信号重开
-		reopenSignal() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.reopenSignal.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 信号关灯
-		signalClose() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.signalClose.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 进路交人工控
-		humanControl() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.humanControl.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
-				}
-			});
-		},
-		// 进路交自动控
-		atsAutoControl() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.atsAutoControl.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					let tempData = null;
-					if (response) {
-						tempData = response.data;
-					}
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
-				}
-			});
-		},
-		// 查询进路状态
-		detail() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Signal.type,
-				label: MapDeviceType.Signal.label,
-				operation: OperationEvent.Signal.detail.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeDetail.doShow(operate, this.selected, response.data);
-				}
-			});
-		}
-	}
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeLock.doShow(operate.operation, this.selected);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号解封
+        unlock() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.unlock.menu.operation,
+                param: {
+                    Signal_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                param: {
+                    Signal_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 进路交人工控
+        humanControl() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                param: {
+                    Signal_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                    //     const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
+                    // });
+                }
+            });
+        },
+        // 进路交自动控
+        atsAutoControl() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                param: {
+                    Signal_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                    //     const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
+                    // });
+                }
+            });
+        },
+        // 设置/取消通过模式
+        singalPassModel() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.singalPassModel.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 查询进路状态
+        detail() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                    //     const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.routeDetail.doShow(operate, this.selected, tempData);
+                    // });
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
index 47ddcc29e..b2c22c81b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -21,287 +21,287 @@ import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItem
 import { mouseCancelState } from './utils/menuItemStatus';
 
 export default {
-	name: 'StationMenu',
-	components: {
-		PopMenu,
-		StationCmdControl,
-		StationHumanControlAll,
-		StationSetRouteControlAll,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						label: '全站设置联锁自动触发',
-						handler: this.setAutoTrigger,
-						disabledCallback: MenuDisabledState.Station.setAutoTrigger,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '全站取消联锁自动触发',
-						handler: this.cancelAutoTrigger,
-						disabledCallback: MenuDisabledState.Station.cancelAutoTrigger,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '上电解锁',
-						handler: this.powerUnLock,
-						disabledCallback: MenuDisabledState.Station.powerUnLock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '执行关键操作测试',
-						handler: this.execKeyOperationTest,
-						disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-						auth: { station: true, center: false }
-					}
-				],
-				central: [
-					{
-						label: '所有进路自排关',
-						handler: this.humanControlALL,
-						disabledCallback: MenuDisabledState.Station.humanControlALL,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '所有进路自排开',
-						handler: this.atsAutoControlALL,
-						disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '执行关键操作测试',
-						handler: this.execKeyOperationTest,
-						disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-						auth: { station: false, center: true }
-					}
-				]
-			},
-			menuForce: [
-				{
-					label: '设置ZC故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Station.setStoppage
-				},
-				{
-					label: '取消ZC故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Station.cancelStoppage
-				}
-			]
-		};
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			this.menu = [];
-			if (this.selected.concentrateStationCode == this.selected.code) {
-				// 编辑模式菜单列表
-				this.menu = menuFiltration(this.menuNormal);
-				if (this.operatemode === OperateMode.ADMIN) {
-					this.menu = [...this.menu, ...this.menuForce];
-				}
-			}
+    name: 'StationMenu',
+    components: {
+        PopMenu,
+        StationCmdControl,
+        StationHumanControlAll,
+        StationSetRouteControlAll,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: '全站设置联锁自动触发',
+                        handler: this.setAutoTrigger,
+                        disabledCallback: MenuDisabledState.Station.setAutoTrigger,
+                        auth: { station: true, center: false }
+                    },
+                    {
+                        label: '全站取消联锁自动触发',
+                        handler: this.cancelAutoTrigger,
+                        disabledCallback: MenuDisabledState.Station.cancelAutoTrigger,
+                        auth: { station: true, center: false }
+                    },
+                    {
+                        label: '上电解锁',
+                        handler: this.powerUnLock,
+                        disabledCallback: MenuDisabledState.Station.powerUnLock,
+                        auth: { station: true, center: false }
+                    },
+                    {
+                        label: '执行关键操作测试',
+                        handler: this.execKeyOperationTest,
+                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
+                        auth: { station: true, center: false }
+                    }
+                ],
+                Center: [
+                    {
+                        label: '所有进路自排关',
+                        handler: this.humanControlALL,
+                        disabledCallback: MenuDisabledState.Station.humanControlALL,
+                        auth: { station: false, center: true }
+                    },
+                    {
+                        label: '所有进路自排开',
+                        handler: this.atsAutoControlALL,
+                        disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
+                        auth: { station: false, center: true }
+                    },
+                    {
+                        label: '执行关键操作测试',
+                        handler: this.execKeyOperationTest,
+                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
+                        auth: { station: false, center: true }
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置ZC故障',
+                    handler: this.setStoppage,
+                    disabledCallback: MenuDisabledState.Station.setStoppage
+                },
+                {
+                    label: '取消ZC故障',
+                    handler: this.cancelStoppage,
+                    disabledCallback: MenuDisabledState.Station.cancelStoppage
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            this.menu = [];
+            if (this.selected.concentrateStationCode == this.selected.code) {
+                // 编辑模式菜单列表
+                this.menu = menuFiltration(this.menuNormal);
+                if (this.operatemode === OperateMode.ADMIN) {
+                    this.menu = [...this.menu, ...this.menuForce];
+                }
+            }
 
-			if (this.selected.centralized) {
-				// 故障模式菜单列表
-				if (this.operatemode === OperateMode.FAULT) {
-					this.menu = [...this.menuForce];
-				}
-			}
+            if (this.selected.centralized) {
+                // 故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = [...this.menuForce];
+                }
+            }
 
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.stoppage.menu.operation
-			};
+            this.menu = menuConvert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.stoppage.menu.operation
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.cancelStoppage.menu.operation
-			};
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.cancelStoppage.menu.operation
+            };
 
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 全站设置联锁自动触发
-		setAutoTrigger() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.setAutoTrigger.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 全站取消联锁自动触发
-		cancelAutoTrigger() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 上电解锁
-		powerUnLock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.powerUnLock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.stationCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 执行关键操作测试
-		execKeyOperationTest() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.execKeyOperationTest.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.stationCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 所有进路自排关
-		humanControlALL() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.humanControlALL.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.stationHumanControlAll.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 所有进路自排开
-		atsAutoControlALL() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Station.type,
-				label: MapDeviceType.Station.label,
-				operation: OperationEvent.Station.atsAutoControlALL.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
-				}
-			});
-		}
-	}
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 全站设置联锁自动触发
+        setAutoTrigger() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.setAutoTrigger.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 全站取消联锁自动触发
+        cancelAutoTrigger() {
+            const operate = {
+                start: true,
+                send: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 上电解锁
+        powerUnLock() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.powerUnLock.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 执行关键操作测试
+        execKeyOperationTest() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.execKeyOperationTest.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 所有进路自排关
+        humanControlALL() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.humanControlALL.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationHumanControlAll.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 所有进路自排开
+        atsAutoControlALL() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                type: MapDeviceType.Station.type,
+                label: MapDeviceType.Station.label,
+                operation: OperationEvent.Station.atsAutoControlALL.menu.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
deleted file mode 100644
index 6e394cecd..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <pop-menu ref="popMenu" :menu="menu" />
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import { mapGetters } from 'vuex';
-import { DeviceMenu } from '@/scripts/ConstDic';
-
-export default {
-	name: 'StationControlMenu',
-	components: {
-		PopMenu
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: [
-			],
-			menuForce: [
-			]
-		};
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		doShow(point) {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		}
-	}
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index 30d6fc27c..6d7bfb588 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -9,6 +9,7 @@
     <stand-detain-train-all ref="standDetainTrainAll" />
     <notice-info ref="noticeInfo" />
     <stand-back-strategy ref="standBackStrategy" />
+    <StandBulkBuckleTrain ref="standBulkBuckleTrain" />
   </div>
 </template>
 
@@ -20,13 +21,16 @@ import StandBackStrategy from './dialog/standBackStrategy';
 import StandDetail from './dialog/standDetail';
 import StandRunLevel from './dialog/standRunLevel';
 import StandStopTime from './dialog/standStopTime';
+import StandBulkBuckleTrain from './dialog/standBulkBuckleTrain';
 import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+
+import Handler from '@/scripts/cmdPlugin/Handler';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-import { mouseCancelState } from './utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'StationStandMenu',
@@ -34,6 +38,7 @@ export default {
         PopMenu,
         StandControl,
         StandJumpStopControl,
+        StandBulkBuckleTrain,
         StandDetail,
         StandRunLevel,
         NoticeInfo,
@@ -53,155 +58,88 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                local: [
+                Local: [
                     {
-                        label: '设置扣车',
+                        label: '扣车',
                         handler: this.setDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: true, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
                     },
                     {
                         label: '取消扣车',
                         handler: this.cancelDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        type: 'separator'
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
                     },
                     {
                         label: '提前发车',
                         handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: '设置停站时间',
-                        handler: this.setStopTime,
-                        disabledCallback: MenuDisabledState.StationStand.setStopTime,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        type: 'separator'
+                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
                     },
                     {
                         label: '站台详细信息',
                         handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: '运行时间控制',
-                        handler: this.setRunLevel,
-                        disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: '设置提前发车',
-                        handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: false, center: false }
-                    },
-                    // {
-                    //     label: '人工折返策略设置',
-                    //     handler: this.setBackStrategy,
-                    //     disabledCallback: MenuDisabledState.StationStand.setBackStrategy,
-                    //     auth: { station: false, center: false }
-                    // },
-                    {
-                        label: '查询站台状态',
-                        handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: false, center: false }
+                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
                     }
                 ],
-                central: [
+                Center: [
                     {
                         label: '扣车',
                         handler: this.setDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
                     },
                     {
                         label: '取消扣车',
                         handler: this.cancelDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    },
+                    {
+                        label: '批量扣车',
+                        handler: this.setBulkBuckleTrain,
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL
+                    },
+                    {
+                        label: '批量取消扣车',
+                        handler: this.cancelBulkBuckleTrain,
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
                     },
                     {
                         label: '提前发车',
                         handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
                     },
                     {
                         label: '设置跳停',
                         handler: this.setJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
                     },
                     {
                         label: '取消跳停',
                         handler: this.cancelJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        type: 'separator'
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
                     },
                     {
                         label: '设置停站时间',
                         handler: this.setStopTime,
-                        disabledCallback: MenuDisabledState.StationStand.setStopTime,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
                     },
                     {
                         label: '设置运行等级',
                         handler: this.setRunLevel,
-                        disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-                        auth: { station: true, center: true }
-                    },
-                    // {
-                    //     label: '变通策略管理',
-                    //     handler: this.setBackStrategy,
-                    //     disabledCallback: MenuDisabledState.StationStand.setBackStrategy,
-                    //     auth: { station: true, center: true }
-                    // },
-                    {
-                        type: 'separator'
+                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
                     },
                     {
                         label: '区间列车数量限制',
                         handler: this.setDetainTrainAll,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO
                     },
                     {
                         label: '取消区间列车数量限制',
                         handler: this.cancelDetainTrainAll,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        type: 'separator'
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
                     },
                     {
                         label: '查看站台信息',
                         handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: true, center: true }
+                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
                     }
                 ]
             },
@@ -209,12 +147,12 @@ export default {
                 {
                     label: '设置故障',
                     handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.StationStand.setStoppage
+                    cmdType:CMD.Stand.CMD_STAND_ADD_FAULT
                 },
                 {
                     label: '取消故障',
                     handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.StationStand.cancelStoppage
+                    cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT
                 }
             ]
         };
@@ -246,17 +184,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce];
-            }
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
-
-            this.menu = menuConvert(this.menu);
         },
         doShow(point) {
             this.clickEvent();
@@ -272,268 +205,268 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.stoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.stoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_ADD_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-
-            mouseCancelState(this.selected);
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 取消故障
         cancelStoppage() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelStoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelStoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-
-            mouseCancelState(this.selected);
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow(step);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置扣车
         setDetainTrain() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消扣车
         cancelDetainTrain() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 区间列车数量限制
         setDetainTrainAll() {
-            const operate = {
+            const step = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
+                operation: OperationEvent.StationStand.setDetainTrainAuto.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消区间列车数量限制
         cancelDetainTrainAll() {
-            const operate = {
+            const step = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+                operation: OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
-        // 强制取消扣车
-        cancelDetainTrainForce() {
-            const operate = {
+        // 批量扣车
+        setBulkBuckleTrain() {
+            const step = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
+                operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation,
+                param: {
+                    StationStand_Code: this.selected.code
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standBulkBuckleTrain.doShow(step, this.selected);
+                }
+            });
+        },
+        // 批量取消扣车
+        cancelBulkBuckleTrain() {
+            const step = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation,
+                param: {
+                    StationStand_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standBulkBuckleTrain.doShow(step, this.selected);
                 }
             });
         },
         // 设置跳停
         setJumpStop() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
+                    this.$refs.standJumpStopControl.doShow(step, this.selected);
                 }
             });
         },
         // 取消跳停
         cancelJumpStop() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
+                    this.$refs.standJumpStopControl.doShow(step, this.selected);
                 }
             });
         },
-        // 停站时间控制
+        // 设置停站时间
         setStopTime() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standStopTime.doShow(operate, this.selected, tempDate);
+                    // Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                    //     const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.standStopTime.doShow(step, this.selected, tempData);
+                    // });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置运行等级
         setRunLevel() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setRunLevel.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                console.log(valid, '----')
-                if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standRunLevel.doShow(operate, this.selected, tempDate);
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
                 }
-            }).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate);
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                    //     const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.standRunLevel.doShow(step, this.selected, tempData);
+                    // });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
             });
         },
         // 设置提前发车
         earlyDeparture() {
-            const operate = {
+            const step = {
                 start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
+                    this.$refs.standControl.doShow(step, this.selected);
                 }
             });
         },
-        // 设置折返策略
-        // setBackStrategy() {
-        //     const operate = {
-        //         start: true,
-        //         send: true,
-        //         code: this.selected.code,
-        //         type: MapDeviceType.StationStand.type,
-        //         operation: OperationEvent.StationStand.setBackStrategy.menu.operation
-        //     };
-
-        //     this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-        //         if (valid) {
-        //             let tempDate = null;
-        //             if (response) {
-        //                 tempDate = response.data;
-        //             }
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.standBackStrategy.doShow(operate, this.selected, tempDate);
-        //         }
-        //     }).catch(() => {
-        //         this.$refs.noticeInfo.doShow(operate);
-        //     });
-        // },
         // 查询站台状态
         detail() {
-            const operate = {
+            const step = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.detail.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.detail.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
                 if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standDetail.doShow(operate, this.selected, tempDate);
+                    // Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                    //     const tempData = resp.data;
+                    const tempData = [];
+                    this.$refs.standDetail.doShow(step, this.selected, tempData);
+                    // });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow(step);
             });
         }
     }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index e743bbefb..dddc4058a 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <section-control ref="sectionControl" />
+    <!-- <section-control ref="sectionControl" /> -->
     <switch-control ref="switchControl" />
     <switch-cmd-control ref="switchCmdControl" />
-    <speed-cmd-control ref="speedCmdControl" />
+    <!-- <speed-cmd-control ref="speedCmdControl" /> -->
     <speed-limit-control ref="speedLimitControl" />
     <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" />
@@ -13,439 +13,340 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import SectionControl from './dialog/sectionControl';
+// import SectionControl from './dialog/sectionControl';
 import SwitchControl from './dialog/switchControl';
 import SwitchCmdControl from './dialog/switchCmdControl';
-import SpeedCmdControl from './dialog/speedCmdControl';
+// import SpeedCmdControl from './dialog/speedCmdControl';
 import SpeedLimitControl from './dialog/speedLimitControl';
 import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
 import { mouseCancelState } from './utils/menuItemStatus';
 
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 export default {
-	name: 'SwitchMenu',
-	components: {
-		PopMenu,
-		SectionControl,
-		SwitchControl,
-		SwitchCmdControl,
-		SpeedLimitControl,
-		SpeedCmdControl,
-		AlxeEffective,
-		NoticeInfo
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [],
-			menuNormal: {
-				local: [
-					{
-						label: '轨道切除',
-						handler: this.split,
-						disabledCallback: MenuDisabledState.Switch.split,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '轨道激活',
-						handler: this.active,
-						disabledCallback: MenuDisabledState.Switch.active,
-						auth: { station: true, center: true }
-					}
-				],
-				central: [
-					{
-						label: '单操到定位',
-						handler: this.locate,
-						disabledCallback: MenuDisabledState.Switch.locate,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '单操到反位',
-						handler: this.reverse,
-						disabledCallback: MenuDisabledState.Switch.reverse,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '道岔单锁',
-						handler: this.lock,
-						disabledCallback: MenuDisabledState.Switch.lock,
-						auth: { station: true, center: false }
-					},
-					{
-						label: '道岔单解',
-						handler: this.unlock,
-						disabledCallback: MenuDisabledState.Switch.unlock,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '道岔封锁',
-						handler: this.block,
-						disabledCallback: MenuDisabledState.Switch.block,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '道岔解封',
-						handler: this.unblock,
-						disabledCallback: MenuDisabledState.Switch.unblock,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '区故解',
-						handler: this.fault,
-						disabledCallback: MenuDisabledState.Switch.fault,
-						auth: { station: true, center: true }
-					}
-				]
-			},
-			menuForce: [
-				{
-					label: '设置故障',
-					handler: this.setStoppage,
-					disabledCallback: MenuDisabledState.Switch.setStoppage,
-					auth: {
+    name: 'SwitchMenu',
+    components: {
+        PopMenu,
+        // SectionControl,
+        SwitchControl,
+        SwitchCmdControl,
+        SpeedLimitControl,
+        // SpeedCmdControl,
+        AlxeEffective,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: '单操到定位',
+                        handler: this.locate,
+                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                    },
+                    {
+                        label: '单操到反位',
+                        handler: this.reverse,
+                        cmdType: CMD.Switch.CMD_SWITCH_TURN
+                    },
+                    {
+                        label: '道岔单锁',
+                        handler: this.lock,
+                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: '道岔单解',
+                        handler: this.unlock,
+                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+                    },
+                    {
+                        label: '道岔封锁',
+                        handler: this.block,
+                        cmdType: CMD.Switch.CMD_SWITCH_BLOCK
+                    },
+                    {
+                        label: '道岔解封',
+                        handler: this.unblock,
+                        cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
+                    }
+                ],
+                Center: [
+                    {
+                        label: '轨道切除',
+                        handler: this.split,
+                        cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
+                    },
+                    {
+                        label: '轨道激活',
+                        handler: this.active,
+                        cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
+                    },
+                    {
+                        label: '确认计轴有效',
+                        handler: this.alxeEffective,
+                        cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
+                    },
+                    {
+                        label: '设置临时限速',
+                        handler: this.setSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Switch.CMD_SWITCH_ADD_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Switch.CMD_SWITCH_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
 
-					}
-				},
-				{
-					label: '取消故障',
-					handler: this.cancelStoppage,
-					disabledCallback: MenuDisabledState.Switch.cancelStoppage,
-					auth: {
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.stoppage.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
 
-					}
-				}
-			]
-		};
-	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
-	computed: {
-		...mapGetters('training', [
-			'mode',
-			'operatemode'
-		]),
-		...mapGetters('menuOperation', [
-			'buttonOperation'
-		])
-	},
-	methods: {
-		clickEvent() {
-			const self = this;
-			window.onclick = function (e) {
-				self.doClose();
-			};
-		},
-		initMenu() {
-			// 编辑模式菜单列表
-			this.menu = menuFiltration(this.menuNormal);
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...this.menu, ...this.menuForce];
-			}
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.cancelStoppage.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
 
-			// 故障模式菜单列表
-			if (this.operatemode === OperateMode.FAULT) {
-				this.menu = this.menuForce;
-			}
-
-			this.menu = menuConvert(this.menu);
-		},
-		doShow(point) {
-			this.clickEvent();
-			this.initMenu();
-			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-				this.$refs.popMenu.resetShowPosition(point);
-			}
-		},
-		doClose() {
-			if (this.$refs && this.$refs.popMenu) {
-				this.$refs.popMenu.close();
-			}
-		},
-		// 设置故障
-		setStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.stoppage.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 取消故障
-		cancelStoppage() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.cancelStoppage.menu.operation
-			};
-
-			mouseCancelState(this.selected);
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				} else {
-					this.$refs.noticeInfo.doShow(operate);
-				}
-			}).catch(() => {
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 道岔单锁
-		lock() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.lock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.unlock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔封锁
-		block() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.block.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.unblock.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔强扳
-		switchTurnoutForce() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.turnoutForce.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔转动
-		switchTurnout() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.turnout.menu.operation
-			};
-
-			if (operate.operation) {
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.fault.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔取消速度
-		cancelSpeed() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.cancelSpeed.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					const tempData = response.data;
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
-				}
-			});
-		},
-
-		// 区段切除
-		split() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.split.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				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,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.active.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 道岔计轴预复位
-		axlePreReset() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.axlePreReset.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.switchCmdControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 设置临时限速
-		setSpeed() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.setSpeed.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.speedLimitControl.doShow(operate, this.selected);
-				}
-			});
-		},
-		// 确认计轴有效
-		alxeEffective() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				type: MapDeviceType.Switch.type,
-				label: MapDeviceType.Switch.label,
-				operation: OperationEvent.Switch.alxeEffective.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.alxeEffective.doShow(operate, this.selected);
-				}
-			});
-		},
-		undeveloped() {
-			this.doClose();
-			this.$alert('实现中......', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-				}
-			});
-		}
-	}
+            mouseCancelState(this.selected);
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(operate);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 道岔单锁
+        lock() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.lock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                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: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔封锁
+        block() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.block.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                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: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段切除
+        split() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.split.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                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: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置临时限速
+        setSpeed() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.setSpeed.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 确认计轴有效
+        alxeEffective() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Switch.alxeEffective.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.alxeEffective.doShow(operate, this.selected);
+                }
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTool.vue b/src/jmapNew/theme/ningbo_01/menus/menuTool.vue
index d278e2adf..266a43165 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTool.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTool.vue
@@ -15,129 +15,129 @@ import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
 export default {
-	name: 'MenuTool',
-	components: {
-		SystemTime
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			logoImg: logo_,
-			time: '00:0000',
-			tools: [
-				{
-					title: '服务器1',
-					operate: '',
-					src: logo_,
-					click: this.undeveloped
-				},
-				{
-					title: '服务器2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '前置机1',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '前置机2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '主调',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台1',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台3',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '大屏',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '维护工作站',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '运行图显示人工站',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '跳停',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '扣车',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '列车报警',
-					operate: '',
-					src: logo_,
-					click: this.undeveloped
-				}
-			]
-		};
-	},
-	computed: {
-		isShowSystemTime() {
-			return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-		}
-	},
-	watch: {
-		'$store.state.training.initTime': function (initTime) {
-			const date = new Date(initTime);
-			this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
-		}
-	},
-	mounted() {
-		this.initTools();
-	},
-	methods: {
-		initTools() {
-			this.tools = [];
-		}
-	}
+    name: 'MenuTool',
+    components: {
+        SystemTime
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            logoImg: logo_,
+            time: '00:0000',
+            tools: [
+                {
+                    title: '服务器1',
+                    operate: '',
+                    src: logo_,
+                    click: this.undeveloped
+                },
+                {
+                    title: '服务器2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '前置机1',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '前置机2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '主调',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台1',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台3',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '大屏',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '维护工作站',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '运行图显示人工站',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '跳停',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '扣车',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '列车报警',
+                    operate: '',
+                    src: logo_,
+                    click: this.undeveloped
+                }
+            ]
+        };
+    },
+    computed: {
+        isShowSystemTime() {
+            return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
+        }
+    },
+    watch: {
+        '$store.state.training.initTime': function (initTime) {
+            const date = new Date(initTime);
+            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+        }
+    },
+    mounted() {
+        this.initTools();
+    },
+    methods: {
+        initTools() {
+            this.tools = [];
+        }
+    }
 };
 </script>
 
diff --git a/src/mixin/CancelMouseState.js b/src/mixin/CancelMouseState.js
new file mode 100644
index 000000000..3e8110957
--- /dev/null
+++ b/src/mixin/CancelMouseState.js
@@ -0,0 +1,13 @@
+
+export default {
+    methods: {
+        mouseCancelState(selected) {
+            const device = this.$jlmap.getDeviceByCode(selected.code);
+            const instance = (device || {}).instance;
+            if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
+                device['down'] = false;
+                instance.mouseEvent.mouseout(this.$jlmap.$zr.curEvent);
+            }
+        }
+    }
+};
diff --git a/src/router/index.js b/src/router/index.js
index 15558845c..802c8d184 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -104,6 +104,7 @@ const UserRulesDetail = () => import('@/views/orderauthor/rules/detail');
 const LessonApproval = () => import('@/views/approval/lesson/index');
 const ScriptApproval = () => import('@/views/approval/script/index');
 const RunPlanApproval = () => import('@/views/approval/runPlan/index');
+const DeviceManage = () => import('@/views/system/deviceManage/index');
 
 import { loginInfo } from '@/scripts/ConstDic';
 import { getSessionStorage } from '@/utils/auth';
@@ -264,7 +265,7 @@ export const constantRoutes = [
         hidden: true
     },
     {
-        path: 'gzb',
+        path: '/gzb',
         redirect: '/gzb/login',
         hidden: true
     },
@@ -838,6 +839,13 @@ export const asyncRouter = [
                 meta: {
                     i18n: 'router.configLine'
                 }
+            },
+            {
+                path: 'deviceManage',
+                component: DeviceManage,
+                meta: {
+                    i18n: 'router.deviceManage'
+                }
             }
         ]
     },
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 1f93bc768..c1946502e 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -126,16 +126,16 @@ export default {
         ],
 
         simulationRole: [
-            { label: '行调操作', value: '01' },
-            { label: '现地操作', value: '02' }
+            { label: '行调操作', value: 'Center' },
+            { label: '现地操作', value: 'Local' }
         ],
 
         deviceTypeList: [
             { label: '区段', value: 'Section' },
             { label: '道岔', value: 'Switch' },
             { label: '信号机', value: 'Signal' },
-            { label: '站台', value: 'StationStand' },
-            { label: '控制模式', value: 'ControlConvertMenu' },
+            { label: '站台', value: 'Stand' },
+            // { label: '控制模式', value: 'ControlConvertMenu' },
             { label: '车次窗', value: 'TrainWindow' }
         ],
         // 新版的产品类型枚举
diff --git a/src/scripts/cmdPlugin/Command.js b/src/scripts/cmdPlugin/Command.js
new file mode 100644
index 000000000..c8286e5fe
--- /dev/null
+++ b/src/scripts/cmdPlugin/Command.js
@@ -0,0 +1,33 @@
+const P_OVER = `over`;
+export default class Command {
+    constructor() {
+        this.command = {};
+        this.id = '';
+        this.isError = false;
+        this.isOver = false;
+    }
+
+    toFound(definition, wholeParam) {
+        this.id = definition.id;
+        (definition.paramList || []).forEach(param => {
+            if (wholeParam.hasOwnProperty(param.name)) {
+                this.command[param.name] = wholeParam[param.name];
+            } else {
+                this.isError = true;
+                return;
+            }
+        });
+
+        if (wholeParam.hasOwnProperty(P_OVER)) {
+            this.isOver = true;
+        }
+    }
+
+    toError() {
+        this.isError = true;
+    }
+
+    get() {
+        return this.command;
+    }
+}
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
new file mode 100644
index 000000000..f7d54a7db
--- /dev/null
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -0,0 +1,189 @@
+export default {
+    Switch: {
+        /** 设置故障 */
+        CMD_SWITCH_ADD_FAULT: {value:'Switch_Add_Fault', label: '设置道岔故障'},
+        /** 清除故障 */
+        CMD_SWITCH_REMOVE_FAULT: {value:'Switch_Remove_Fault', label: '清除道岔故障'},
+        /** 单锁 */
+        CMD_SWITCH_SINGLE_LOCK: {value:'Switch_Single_Lock', label: '单锁'},
+        /** 单解 */
+        CMD_SWITCH_SINGLE_UNLOCK: {value:'Switch_Single_Unlock', label: '单解'},
+        /** 封锁 */
+        CMD_SWITCH_BLOCK: {value:'Switch_Block', label: '封锁'},
+        /** 解封 */
+        CMD_SWITCH_UNBLOCK: {value:'Switch_Unblock', label: '解封'},
+        /** 切除 */
+        CMD_SWITCH_CUT_OFF: {value:'Switch_Cut_Off', label: '切除'},
+        /** 激活 */
+        CMD_SWITCH_ACTIVE: {value:'Switch_Active', label: '激活'},
+        /** 设置临时限速 */
+        CMD_SWITCH_SET_LIMIT_SPEED: {value:'Switch_Set_Limit_Speed', label: '设置临时限速'},
+        /** 取消临时限速 */
+        CMD_SWITCH_CANCEL_LIMIT_SPEED: {value:'Switch_Cancel_Limit_Speed', label: '取消临时限速'},
+        /** 计轴预复位 */
+        CMD_SWITCH_AXIS_PRE_RESET: {value:'Switch_Axis_Pre_Reset', label: '计轴预复位'},
+        /** 故障解锁 */
+        CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
+        /** 转动 */
+        CMD_SWITCH_TURN: {value:'Switch_Turn', label: '转动'},
+        /** 强扳 */
+        CMD_SWITCH_FORCE_TURN: {value:'Switch_Force_Turn', label: '强扳'},
+        /** 确认计轴有效 */
+        CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Comfirmation_Axle', label: '确认计轴有效'}
+    },
+
+    // 控制模式操作
+    ControlConvertMenu: {
+        /** 请求站控 */
+        CMD_CM_APPLY_FOR_STATION_CONTROL: {value:'CM_Apply_For_Station_Control', label: '请求站控'},
+        /** 请求中控 */
+        CMD_CM_APPLY_FOR_CENTER_CONTROL: {value:'CM_Apply_For_Center_Control', label: '请求中控'},
+        /** 强制站控 */
+        CMD_CM_FORCE_STATION_CONTROL: {value:'CM_Force_Station_Control', label: '强制站控'},
+        /** 紧急站控 */
+        CMD_CM_EMERGENCY_STATION_CONTROL: {value:'CM_Emergency_Station_Control', label: '紧急站控'},
+        /** 回复站控请求（同意/拒绝） */
+        CMD_CM_REPLY_STATION_CONTROL: {value:'CM_Reply_Station_Control', label: '回复站控请求'},
+        /** 回复中控请求（同意/拒绝） */
+        CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'}
+    },
+
+    // 信号机操作
+    Signal: {
+        /** 设置故障 */
+        CMD_SIGNAL_ADD_FAULT: {value:'Signal_Add_Fault', label: '设置信号机故障'},
+        /** 清除故障 */
+        CMD_SIGNAL_REMOVE_FAULT: {value:'Signal_Remove_Fault', label: '清除信号机故障'},
+        /** 封锁 */
+        CMD_SIGNAL_BLOCK: {value:'Signal_Block', label: '封锁'},
+        /** 解封 */
+        CMD_SIGNAL_UNBLOCK: {value:'Signal_Unblock', label: '解封'},
+        /** 排列进路 */
+        CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'},
+        /** 取消进路 */
+        CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'},
+        /** 人解进路 */
+        CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'},
+        /** 信号关灯 */
+        CMD_SIGNAL_CLOSE_SIGNAL: {value:'Signal_Close_Signal', label: '信号关灯'},
+        /** 信号重开 */
+        CMD_SIGNAL_REOPEN_SIGNAL: {value:'Signal_Reopen_Signal', label: '信号重开'},
+        /** 引导进路 */
+        CMD_SIGNAL_ROUTE_GUIDE: {value:'Signal_Route_Guide', label: '引导进路'},
+        /** 进路自排开 */
+        CMD_SIGNAL_OPEN_AUTO_SETTING: {value:'Signal_Open_Auto_Setting', label: '进路自排开'},
+        /** 进路自排关 */
+        CMD_SIGNAL_CLOSE_AUTO_SETTING: {value:'Signal_Close_Auto_Setting', label: '进路自排关'},
+        /** 设置联锁自动进路*/
+        CMD_SIGNAL_SET_CI_AUTO: {value:'Signal_Set_CI_Auto', label: '设置联锁自动进路'},
+        /** 取消联锁自动进路*/
+        CMD_SIGNAL_CANCEL_CI_AUTO: {value:'Signal_Cancel_CI_Auto', label: '取消联锁自动进路'},
+        /** 设置联锁自动触发 */
+        CMD_SIGNAL_SET_CI_AUTO_TRIGGER: {value:'Signal_Set_CI_Auto_Trigger', label: '设置联锁自动触发'},
+        /** 取消联锁自动触发 */
+        CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER: {value:'Signal_Cancel_CI_Auto_Trigger', label: '取消联锁自动触发'},
+        /** 设置/取消通过模式 */
+        CMD_SIGNAL_PASS_MODEL: {value:'Signal_Pass_Model', label: '设置/取消通过模式'},
+        /** 设置/取消通过模式 */
+        CMD_SIGNAL_DETAIL: {value:'Signal_Detail', label: '查询进路状态'}
+    },
+
+    // 物理区段操作
+    Section: {
+        /** 设置故障 */
+        CMD_SECTION_ADD_FAULT: {value:'Section_Add_Fault', label: '设置区段故障'},
+        /** 清除故障 */
+        CMD_SECTION_REMOVE_FAULT: {value:'Section_Remove_Fault', label: '清除区段故障'},
+        /** 封锁 */
+        CMD_SECTION_BLOCK: {value:'Section_Block', label: '封锁'},
+        /** 解封 */
+        CMD_SECTION_UNBLOCK: {value:'Section_Unblock', label: '解封'},
+        /** 切除 */
+        CMD_SECTION_CUT_OFF: {value:'Section_Cut_Off', label: '切除'},
+        /** 激活 */
+        CMD_SECTION_ACTIVE: {value:'Section_Active', label: '激活'},
+        /** 设置临时限速 */
+        CMD_SECTION_SET_LIMIT_SPEED: {value:'Section_Set_Limit_Speed', label: '设置临时限速'},
+        /** 计轴预复位 */
+        CMD_SECTION_AXIS_PRE_RESET: {value:'Section_Axis_Pre_Reset', label: '计轴预复位'},
+        /** 故障解锁 */
+        CMD_SECTION_FAULT_UNLOCK: {value:'Section_Fault_Unlock', label: '故障解锁'},
+        /** 取消临时限速 */
+        CMD_SECTION_CANCEL_LIMIT_SPEED:{value:'Section_Cancel_Limit_Speed', label: '取消临时限速'},
+        /** 确认计轴有效 */
+        CMD_SECTION_COMFIRMATION_AXLE:{value:'Section_Comfirmation_Axle', label: '确认计轴有效'}
+    },
+
+    // 站台
+    Stand: {
+        /** 设置故障 */
+        CMD_STAND_ADD_FAULT: {value:'Stand_Add_Fault', label: '设置站台故障'},
+        /** 清除故障 */
+        CMD_STAND_REMOVE_FAULT: {value:'Stand_Remove_Fault', label: '清除站台故障'},
+        /** 设置跳停 */
+        CMD_STAND_SET_JUMP_STOP: {value:'Stand_Set_Jump_Stop', label: '设置跳停'},
+        /** 取消跳停 */
+        CMD_STAND_CANCEL_JUMP_STOP: {value:'Stand_Cancel_Jump_Stop', label: '取消跳停'},
+        /** 设置扣车 */
+        CMD_STAND_SET_HOLD_TRAIN: {value:'Stand_Set_Hold_Train', label: '设置扣车'},
+        /** 取消扣车 */
+        CMD_STAND_CANCEL_HOLD_TRAIN: {value:'Stand_Cancel_Hold_Train', label: '取消扣车'},
+        /** 批量扣车 */
+        CMD_STAND_SET_HOLD_TRAIN_ALL: {value:'Stand_Set_Hold_Train_All', label: '批量扣车'},
+        /** 批量取消扣车 */
+        CMD_STAND_CANCEL_HOLD_TRAIN_ALL: {value:'Stand_Cancel_Hold_Train_All', label: '批量取消扣车'},
+        /** 强制取消扣车 */
+        CMD_STAND_FORCE_CANCEL_HOLD_TRAIN: {value:'Stand_Force_Cancel_Hold_Train', label: '强制取消扣车'},
+        /** 区间列车数量限制 */
+        CMD_STAND_SET_HOLD_TRAIN_AUTO: {value:'Stand_Set_Hold_Train_Auto', label: '区间列车数量限制'},
+        /** 取消区间列车数量限制 */
+        CMD_STAND_CANCEL_HOLD_TRAIN_AUTO: {value:'Stand_Cancel_Hold_Train_Auto', label: '取消区间列车数量限制'},
+        /** 全线取消扣车 */
+        CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN: {value:'Stand_Whole_Line_Cancel_Hold_Train', label: '全线取消扣车'},
+        /** 提前发车 */
+        CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'},
+        /** 设置停站时间 */
+        CMD_STAND_SET_PARK_TIME: {value:'Stand_Set_Park_Time', label: '设置停站时间'},
+        /** 设置站间运行时间（设置运行等级） */
+        CMD_STAND_SET_RUN_TIME: {value:'Stand_Set_Run_Time', label: '设置站间运行时间'},
+        /** 设置折返策略 */
+        CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'},
+        /** 查看站台状态 */
+        CMD_STAND_VIEW_STATUS:{value:'Stand_View_Status', label: '查看站台状态'}
+    },
+
+    Station: {
+        /** 设置故障 */
+        CMD_STATION_ADD_FAULT: {value:'Station_Add_Fault', label: '设置车站故障'},
+        /** 清除故障 */
+        CMD_STATION_REMOVE_FAULT: {value:'Station_Remove_Fault', label: '清除车站故障'},
+        /** 全站设置联锁自动触发 */
+        CMD_STATION_SET_CI_AUTO_TRIGGER: {value:'Station_Set_CI_Auto_Trigger', label: '全站设置联锁自动触发'},
+        /** 全站取消联锁自动触发 */
+        CMD_STATION_CANCEL_CI_AUTO_TRIGGER: {value:'Station_Cancel_CI_Auto_Trigger', label: '全站取消联锁自动触发'},
+        /** 所有进路自排开 */
+        CMD_STATION_OPEN_AUTO_SETTING: {value:'Station_Open_Auto_Setting', label: '所有进路自排开'},
+        /** 所有进路自排关 */
+        CMD_STATION_CLOSE_AUTO_SETTING: {value:'Station_Close_Auto_Setting', label: '所有进路自排关'}
+    },
+
+    // 列车
+    Train: {
+        /** 设置故障 */
+        CMD_TRAIN_ADD_FAULT: {value:'Train_Add_Fault', label: '设置列车故障'},
+        /** 清除故障 */
+        CMD_TRAIN_REMOVE_FAULT: {value:'Train_Remove_Fault', label: '清除列车故障'},
+        /** 人工限速行驶 */
+        CMD_TRAIN_MANUAL_LIMIT_DRIVE: {value:'Train_Manual_Limit_Drive', label: '人工限速行驶'},
+        /** 按进路闭塞法行车 */
+        CMD_TRAIN_MANUAL_ROUTE_BLOCKING_DRIVE: {value:'Train_Manual_Route_Blocking_Drive', label: '按进路闭塞法行车'},
+        /** 越信号机红灯 */
+        CMD_TRAIN_PASS_RED_SIGNAL: {value:'Train_Pass_Red_Signal', label: '越信号机红灯'},
+        /** 引导信号行车 */
+        CMD_TRAIN_DRIVE_BY_GUIDE_SIGNAL: {value:'Train_Drive_By_Guide_Signal', label: '引导信号行车'}
+    },
+
+    LimitControl: {
+
+    }
+};
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
new file mode 100644
index 000000000..2560fcec1
--- /dev/null
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -0,0 +1,90 @@
+import { sendCommandNew } from '@/api/jmap/training';
+import router from '@/router';
+import Command from './Command';
+import Handler from './Handler';
+
+class CommandHandle {
+    constructor() {
+        this.data = [];
+        this.definitionMap = {
+        };
+    }
+
+    load(list) {
+        this.definitionMap = {
+            Center: {},
+            Local: {}
+        };
+        (list || []).forEach(definition => {
+            this.definitionMap[definition.simulationRole][definition.operate] = definition;
+        });
+    }
+
+    getDefinition(cmdType) {
+        if (cmdType) {
+            const simulationRole = Handler.getSimulationRole();
+            // const simulationRole = 'Center';
+            return this.definitionMap[simulationRole][cmdType.value] || null;
+        } else {
+            return null;
+        }
+    }
+
+    getCommand(cmdType, wholeParam) {
+        if (cmdType) {
+            const command = new Command();
+            const definition = this.getDefinition(cmdType);
+            if (definition) {
+                command.toFound(definition, wholeParam);
+                return command;
+            } else {
+                command.toError();
+                return command;
+            }
+        }
+
+        return null;
+    }
+
+    execute(id, command) {
+        return new Promise((resolve, reject) => {
+            const group = router.currentRoute.query.group;
+            sendCommandNew(group, id, command).then((response) => {
+                resolve(response);
+            }).catch(error => {
+                reject(error);
+            });
+        });
+    }
+
+    checkDisabled(menu, selected) {
+        const data = this.getDefinition(menu.cmdType);
+        if (!data) {
+            return false;
+        } else {
+            let result = false;
+            if (data.conditionList.length > 0) {
+                data.conditionList.forEach(val=>{
+                    switch (val.expression) {
+                    case 'eq': {
+                        result = result || (selected[val.name].toString() == val.value);
+                        break;
+                    }
+                    case 'neq': {
+                        result = result || (selected[val.name].toString() != val.value);
+                        break;
+                    }
+                    default: {
+                        result = result || (selected[val.name].toString() == val.value);
+                        break;
+                    }
+                    }
+                });
+                return !result;
+            }
+            return result;
+        }
+    }
+}
+
+export default new CommandHandle();
diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js
new file mode 100644
index 000000000..92761edc6
--- /dev/null
+++ b/src/scripts/cmdPlugin/Config.js
@@ -0,0 +1,11 @@
+/** 系统类型 */
+export const State2SimulationMap = {
+    '01': 'Local',		// 现地工作站
+    '02': 'Center'		// 中心调度工作站
+};
+
+export const State2ControlMap = {
+    '01': 'OperateCenterControl', 	// 中控
+    '02': 'LocalStationControl',	// 站控
+    '03': 'station'
+};
diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
new file mode 100644
index 000000000..3e73fce60
--- /dev/null
+++ b/src/scripts/cmdPlugin/Handler.js
@@ -0,0 +1,155 @@
+import store from '@/store';
+import router from '@/router';
+import CommandHandler from './CommandHandler.js';
+import ValidateHandler from './ValidateHandler.js';
+import { State2SimulationMap } from './Config.js';
+import { sendTrainingNextStep } from '@/api/jmap/training';
+import { getCmdList } from '@/api/management/dictionary';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+class Handler {
+    constructor() {
+        this.operations = [];
+    }
+
+    undo(num) {
+        this.operations = this.operations.slice(0, num);
+    }
+
+    pop() {
+        this.operations.pop();
+    }
+
+    clear() {
+        this.operations.splice(0, this.operations.length);
+    }
+
+    storeOperation(operation) {
+        if (operation.start === true) {
+            this.clear();
+        }
+
+        this.operations.push(operation);
+    }
+
+    afterValid(operation, valid) {
+        const basicInfo = store.getters['training/basicInfo'];
+        if (basicInfo.id && valid) {
+            const group = router.currentRoute.query.group;
+            sendTrainingNextStep({ trainingId: basicInfo.id, operation: operation }, group);
+        }
+
+        if (!valid) {
+            this.pop();
+        } else if (operation.cancel === true) {
+            this.clear();
+        }
+    }
+
+    getWholeParam() {
+        const whole = {};
+        (this.operations || {}).forEach(elem => { Object.assign(whole, elem.param || {}); });
+        return whole;
+    }
+
+    getCommand(operation) {
+        let command = null;
+        if (operation.cmdType) {
+            const cmdType = operation.cmdType;
+            const wholeParam = this.getWholeParam();
+
+            command = CommandHandler.getCommand(cmdType, wholeParam);
+            if (command && command.isError) {
+                this.operations.pop();
+                store.dispatch('training/setTempStep', null);
+                command = null;
+            } else if (command && command.isOver) {
+                this.clear();
+                store.dispatch('menuOperation/setButtonOperation', null);
+            }
+        } else {
+            if (operation.operation === OperationEvent.Command.cancel.menu.operation || operation.over) {
+                this.clear();
+            }
+        }
+
+        return command;
+    }
+
+    execute(cmdType, wholeParam) {
+        return new Promise((resolve, reject) => {
+            const command = CommandHandler.getCommand(cmdType, wholeParam);
+            if (command.isError) {
+                reject(command);
+            } else {
+                CommandHandler.execute(command.id, command.get()).then(response => {
+                    resolve(response);
+                }).catch(error => {
+                    reject(error);
+                });
+            }
+        });
+    }
+
+    handle(operation) {
+        return new Promise((resolve, reject) => {
+            this.storeOperation(operation);
+            const rtn = { valid: false, response: null };
+            const valid = ValidateHandler.vaildate(this.getTrainingMode(), operation);
+            this.afterValid(operation, valid);
+            rtn.valid = valid;
+
+            if (operation.cmdType) {
+                const command = this.getCommand(operation);
+                if (command) {
+                    CommandHandler.execute(command.id, command.get()).then(response => {
+                        rtn.response = response;
+                        resolve(rtn);
+                    }).catch(error => {
+                        reject(error);
+                    });
+                } else {
+                    rtn.response = '获取指令失败，暂无指令，请检查指令字典';
+                    reject(rtn);
+                }
+            } else {
+                resolve(rtn);
+            }
+        });
+    }
+
+    notify(lineCode) {
+        getCmdList(lineCode).then(resp => {
+            CommandHandler.load(resp.data || []);
+        }).catch(err => {
+            CommandHandler.load([]);
+            console.error(err);
+        });
+    }
+
+    getSteps() {
+        return store.state.training.steps;
+    }
+
+    getOrder() {
+        return store.state.training.order;
+    }
+
+    getSimulationRole() {
+        return State2SimulationMap[store.state.training.prdType];
+    }
+
+    getTrainingMode () {
+        return store.state.training.mode;
+    }
+
+    getTrainingStart() {
+        return store.state.training.started;
+    }
+
+    getOperateBreakStatus () {
+        return store.state.menuOperation.break;
+    }
+}
+
+export default new Handler();
diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js
new file mode 100644
index 000000000..fc93b9eec
--- /dev/null
+++ b/src/scripts/cmdPlugin/MenuContextHandler.js
@@ -0,0 +1,181 @@
+import store from '@/store';
+import CommandHandler from './CommandHandler';
+import { State2SimulationMap, State2ControlMap } from './Config';
+import { OperateMode } from '@/scripts/ConstDic';
+
+class MenuContextHandler {
+    constructor() {
+        this.operates = []; // 操作数据
+        this.command = {};	// 命令对象
+    }
+
+    getCurrentStateObject() {
+        return store.getters['menuOperation/selected'];
+    }
+
+    getStationControl(selected) {
+        let control;
+        if (selected._type == 'StationStand') {
+            control = store.getters['map/getDeviceStationCodeByStationCode'](selected.deviceStationCode);
+        } else if (selected._type == 'Station') {
+            control = store.getters['map/getDeviceStationCodeByStationCode'](selected.code);
+        } else {
+            control = store.getters['map/getDeviceStationCodeByStationCode'](selected.stationCode);
+        }
+        return control;
+    }
+
+    getPrdType() {
+        return store.state.training.prdType;
+    }
+
+    // menuFiltration(menuList) {
+    //     const selected = this.getCurrentStateObject();
+    //     let menu = [];
+    //     const control = this.getStationControl(selected);
+    //     if (control) {
+    //         if ( this.getPrdType() != '') {
+    //             const type = State2SimulationMap[this.getPrdType()];
+    //             const status = State2ControlMap[control.status];
+    //             menu = [...menuList[type]];
+    //             if (menu.constructor === Array) {
+    //                 menu.forEach(elem => {
+    //                     if (elem.type === 'separator') {
+    //                         elem.show = true;
+    //                         return;
+    //                     }
+    //                     if (elem.auth.constructor === Object) {
+    //                         elem.show = true;
+    //                         if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+    //                             elem.show = false;
+    //                         }
+    //                         elem.defaultDisabled = !elem.auth[status];
+    //                     }
+    //                 });
+    //             }
+    //         }
+    //     }
+    //     return menu;
+    // }
+
+    // 判断指令是否隐藏
+    checkDisabled(data, selected) {
+        let result = false;
+        if (data.conditionList.length > 0) {
+            data.conditionList.forEach(val=>{
+                switch (val.expression) {
+                case 'eq': {
+                    result = result || (selected[val.name].toString() == val.value);
+                    break;
+                }
+                case 'neq': {
+                    result = result || (selected[val.name].toString() != val.value);
+                    break;
+                }
+                default: {
+                    result = result || (selected[val.name].toString() == val.value);
+                    break;
+                }
+                }
+            });
+            result = !result;
+        }
+        return result;
+    }
+
+    covert(menuList) {
+        const selected = this.getCurrentStateObject();
+        let menu = [];
+        const control = this.getStationControl(selected);
+        if (control) {
+            if ( this.getPrdType() != '') {
+                const type = State2SimulationMap[this.getPrdType()];
+                // const status = State2ControlMap[control.status]; // 缺少车站控制模式字段
+                const status = State2ControlMap['01']; // 缺少车站控制模式字段
+                menu = [...menuList[type]];
+                if (menu.constructor === Array) {
+                    menu.forEach(elem => {
+                        if (elem.type === 'separator') {
+                            elem.show = true;
+                            return;
+                        }
+                        const data = CommandHandler.getDefinition(elem.cmdType);
+                        if (data) {
+                            // 判断指令是否显示
+                            if (data.simulationRole.toUpperCase() == type.toUpperCase() && data.controlMode.indexOf(status) > -1) {
+                                elem.show = true;
+                                elem.disabled = this.checkDisabled(data, selected);
+                            } else {
+                                elem.show = true;
+                                elem.disabled = true;
+                            }
+                        } else {
+                            elem.show = false;
+                        }
+
+                    });
+                }
+            }
+        }
+        return menu;
+
+        // if (menuList.constructor === Array) {
+        //     menuList.forEach(elem => {
+        //         if (elem.type === 'separator') {
+        //             elem.show = true;
+        //             return;
+        //         }
+        //         elem.disabled = !elem.auth[status];
+        //         if (!elem.defaultDisabled) {
+        //             const disabled = CommandHandler.checkDisabled(elem, this.getCurrentStateObject());
+        //             elem.disabled = disabled;
+        //         }
+        //         // if (elem.disabledCallback.constructor === Function) {
+        //         //     elem.disabled = elem.defaultDisabled;
+        //         //     if (!elem.defaultDisabled) {
+        //         //         elem.disabled = elem.disabledCallback();
+        //         //     }
+        //         // }
+        //     });
+        // }
+        // return menuList;
+    }
+
+    menuBarConvert(menu, mode) {
+        if (menu) {
+            if (mode === OperateMode.NORMAL) {
+                menu.forEach(item => {
+                    if (item.type === 'separator') {
+                        item.show = true;
+                        return;
+                    }
+
+                    item.show = false;
+                    if (!item.click) {
+                        item.click = () => { };
+                    }
+
+                    if (!item.froce) {
+                        item.show = true;
+                        if (item.children && item.children.length > 0) {
+                            this.menuBarConvert(item.children, mode);
+                        }
+                    }
+                });
+            } else if (mode === OperateMode.ADMIN) {
+                menu.forEach(item => {
+                    item.show = true;
+                    if (!item.click) {
+                        item.click = () => { };
+                    }
+                    if (item.children && item.children.length > 0) {
+                        this.menuBarConvert(item.children, mode);
+                    }
+                });
+            }
+        }
+        return menu || [];
+    }
+}
+
+export default new MenuContextHandler();
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
new file mode 100644
index 000000000..66f62a514
--- /dev/null
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -0,0 +1,1953 @@
+export const OperationEvent = {
+    // 直接指令
+    Command: {
+        // 取消操作
+        cancel: {
+            menu: {
+                operation: '000',
+                domId: '_Tips-Cancel-Menu'
+            },
+            clearMbm: {
+                operation: '00012',
+                domId: '_Tips-mbm_clear{TOP}'
+            }
+        },
+        // 关闭对话框
+        close: {
+            menu: {
+                operation: '001',
+                domId: '_Tips-Close-Menu'
+            },
+            password: {
+                operation: '0011',
+                domId: '_Tips-Close-Password'
+            },
+            confirm: {
+                operation: '0012',
+                domId: '_Tips-Close-Confirm'
+            },
+            alarm: {
+                operation: '0013',
+                domId: '_Tips-Close-Alarm'
+            },
+            notice: {
+                operation: '0014',
+                domId: '_Tips-Close-Notice'
+            }
+        },
+        // 菜单
+        mBar: {
+            /** 系统 */
+            system: {
+                operation: '002',
+                domId: '_Tips-Mbar-0-System'
+            },
+            /** 查看 */
+            check: {
+                operation: '0021',
+                domId: '_Tips-Mbar-0-Check'
+            },
+            /** 刷新 */
+            fresh: {
+                operation: '0022',
+                domId: '_Tips-Mbar-0-Fresh'
+            },
+            /** 显示 */
+            view: {
+                operation: '0023',
+                domId: '_Tips-Mbar-0-View'
+            },
+            /** 控制模式菜单 */
+            remoteControl: {
+                operation: '0024',
+                domId: '_Tips-Mbar-0-StationControl'
+            },
+            /** 请求区域 */
+            requestZone: {
+                operation: '0025',
+                domId: '_Tips-Mbar-0-StationControl'
+            },
+            /** 历史查询 */
+            historyQuery: {
+                operation: '0026',
+                domId: '_Tips-Mbar-0-HistoryQuery'
+            },
+            /** 用户管理 */
+            userManage: {
+                operation: '0027',
+                domId: '_Tips-Mbar-0-UserManage'
+            },
+            /** 帮助 */
+            help: {
+                operation: '0028',
+                domId: '_Tips-Mbar-0-Help'
+            },
+            /** 计划车操作 */
+            planTrain: {
+                operation: '0029',
+                domId: '_Tips-Mbar-0-PlanTrain'
+            },
+            /** 扣车*/
+            detainControl: {
+                operation: '00291',
+                domId: '_Tips-Mbar-0-detainControl'
+            }
+        },
+        // 前端视图指令
+        view: {
+            /** 设置列车识别号显示*/
+            setTrainIdDisplay: {
+                operation: '003',
+                domId: '_Tips-View-SetTrainIdDisplay'
+            },
+            /** 设置名称显示*/
+            setNameDisplay: {
+                operation: '0031',
+                domId: '_Tips-View-SetNameDisplay'
+            },
+            /** 设置设备显示*/
+            setDeviceDisplay: {
+                operation: '0032',
+                domId: '_Tips-View-SetDeviceDisplay'
+            },
+            setSection: {
+                operation: '0033',
+                domId: '_Tips-View-SetSection'
+            },
+            setSwitch: {
+                operation: '0034',
+                domId: '_Tips-View-SetSwitch'
+            },
+            setSignal: {
+                operation: '0035',
+                domId: '_Tips-View-SetSignal'
+            },
+            setTrainN: {
+                operation: '0036',
+                domId: '_Tips-View-SetTrainN'
+            },
+            setTrainB: {
+                operation: '0037',
+                domId: '_Tips-View-SetTrainB'
+            },
+            amplification: {
+                operation: '0038',
+                domId: '_Tips-View-Amplification'
+            },
+            dpShowTrainN: {
+                operation: '0039',
+                domId: '_Tips-View-DpShowTrainN'
+            }
+        },
+        // 计划车指令
+        planTrain: {
+            /** 添加计划车*/
+            addPlanTrain: {
+                operation: '004',
+                domId: '_Tips-PlanTrain-AddPlanTrain'
+            },
+            /** 平移计划车*/
+            translatPlanTrain: {
+                operation: '0041',
+                domId: '_Tips-PlanTrain-TranslatPlanTrain'
+            },
+            /** 删除计划车*/
+            delPlanTrain: {
+                operation: '0042',
+                domId: '_Tips-PlanTrain-DelPlanTrain'
+            }
+        },
+        // 管理指令
+        manage: {
+            /** 用户管理*/
+            userManage: {
+                operation: '005',
+                domId: '_Tips-Manage-UserManage'
+            },
+            /** 添加用户*/
+            addUser: {
+                operation: '0051',
+                domId: '_Tips-Manage-AddUser'
+            },
+            /** 修改用户*/
+            editUser: {
+                operation: '0052',
+                domId: '_Tips-Manage-EditUser'
+            },
+            /** 删除用户*/
+            delUser: {
+                operation: '0053',
+                domId: '_Tips-Manage-DelUser'
+            },
+            /** 选择用户*/
+            chooseUser: {
+                operation: '0054',
+                domId: '_Tips-Manage-ChooseUser'
+            },
+            /** 刷新用户*/
+            freshUser: {
+                operation: '0055',
+                domId: '_Tips-Manage-FreshUser'
+            }
+        },
+        // 帮助
+        help: {
+            about: {
+                operation: '006',
+                domId: '_Tips-Help-About'
+            }
+        },
+        // 无设备关联的指令
+        order: {
+            choose: {
+                operation: '007',
+                domId: '_Tips-Order-Choose'
+            },
+            choose1: {
+                operation: '0071',
+                domId: '_Tips-Order-Choose1'
+            }
+        }
+    },
+
+    // 道岔操作
+    Switch: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '199'
+            }
+        },
+        // 道岔故障
+        stoppage: {
+            menu: {
+                operation: '100'
+            }
+        },
+        // 道岔总定/定位操作
+        locate: {
+            button: {
+                operation: '1010',
+                domId: '_Tips-Switch-Locate-Mbm{TOP}'
+            },
+            menu: {
+                operation: '101',
+                domId: '_Tips-Switch-Locate-Menu'
+            }
+        },
+        // 道岔总反/反位操作
+        reverse: {
+            button: {
+                operation: '1020',
+                domId: '_Tips-Switch-Reverse-Mbm{TOP}'
+            },
+            menu: {
+                operation: '102',
+                domId: '_Tips-Switch-Reverse-Menu'
+            }
+        },
+        // 道岔单锁
+        lock: {
+            button: {
+                operation: '1030',
+                domId: '_Tips-Switch-Lock-Mbm{TOP}'
+            },
+            menu: {
+                operation: '103',
+                domId: '_Tips-Switch-Lock-Menu'
+            }
+        },
+        // 道岔解锁
+        unlock: {
+            button: {
+                operation: '1040',
+                domId: '_Tips-Switch-Unlock-Mbm{TOP}'
+            },
+            menu: {
+                operation: '104',
+                domId: '_Tips-Switch-Unlock-Menu'
+            },
+            order: {
+                operation: '1041',
+                domId: '_Tips-Switch-Unlock-Order'
+            },
+            confirm: {
+                operation: '1042',
+                domId: '_Tips-Switch-Unlock-Confirm'
+            },
+            confirm1: {
+                operation: '1043',
+                domId: '_Tips-Switch-Unlock-Confirm1'
+            },
+            confirm2: {
+                operation: '1044',
+                domId: '_Tips-Switch-Unlock-Confirm2'
+            },
+            stop: {
+                operation: '1045',
+                domId: '_Tips-Switch-Unlock-Stop'
+            }
+        },
+        // 道岔封闭
+        block: {
+            menu: {
+                operation: '105',
+                domId: '_Tips-Switch-Block-Menu'
+            },
+            confirm: {
+                operation: '1051',
+                domId: '_Tips-Switch-Block-Confirm'
+            }
+        },
+        // 道岔解封
+        unblock: {
+            menu: {
+                operation: '106',
+                domId: '_Tips-Switch-Unblock-menu'
+            },
+            order: {
+                operation: '1061',
+                domId: '_Tips-Switch-Unblock-Order'
+            },
+            confirm: {
+                operation: '1062',
+                domId: '_Tips-Switch-Unblock-Confirm'
+            },
+            confirm1: {
+                operation: '1063',
+                domId: '_Tips-Switch-Unblock-Confirm1'
+            },
+            confirm2: {
+                operation: '1064',
+                domId: '_Tips-Switch-Unblock-Confirm2'
+            },
+            stop: {
+                operation: '1065',
+                domId: '_Tips-Switch-Unblock-Stop'
+            }
+        },
+        // 转动
+        turnout: {
+            menu: {
+                operation: '107',
+                domId: '_Tips-Switch-Turnout-Menu'
+            }
+        },
+        // 强制扳动
+        turnoutForce: {
+            menu: {
+                operation: '108',
+                domId: '_Tips-Switch-TurnoutForce-Menu'
+            }
+        },
+        // 道岔故障解锁
+        fault: {
+            menu: {
+                operation: '109',
+                domId: '_Tips-Switch-Fault-Menu'
+            },
+            order: {
+                operation: '1091',
+                domId: '_Tips-Switch-Fault-Order'
+            },
+            confirm: {
+                operation: '1092',
+                domId: '_Tips-Switch-Fault-Confirm'
+            },
+            confirm1: {
+                operation: '1093',
+                domId: '_Tips-Switch-Fault-Confirm1'
+            },
+            confirm2: {
+                operation: '1094',
+                domId: '_Tips-Switch-Fault-Confirm2'
+            },
+            stop: {
+                operation: '1095',
+                domId: '_Tips-Switch-Fault-Stop'
+            }
+        },
+        // 计轴预复位
+        axlePreReset: {
+            menu: {
+                operation: '110',
+                domId: '_Tips-Switch-AxlePreReset-Menu'
+            },
+            order: {
+                operation: '1101',
+                domId: '_Tips-Switch-AxlePreReset-Order'
+            },
+            confirm: {
+                operation: '1102',
+                domId: '_Tips-Switch-AxlePreReset-Confirm'
+            },
+            confirm1: {
+                operation: '1103',
+                domId: '_Tips-Switch-AxlePreReset-Confirm1'
+            },
+            confirm2: {
+                operation: '1104',
+                domId: '_Tips-Switch-AxlePreReset-Confirm2'
+            },
+            stop: {
+                operation: '1105',
+                domId: '_Tips-Switch-AxlePreReset-Stop'
+            }
+        },
+        // 切除
+        split: {
+            menu: {
+                operation: '111',
+                domId: '_Tips-Switch-Split-Menu'
+            },
+            mbar: {
+                operation: '1111',
+                domId: '_Tips-Switch-Split-Mbar'
+            }
+        },
+        // 激活
+        active: {
+            menu: {
+                operation: '112',
+                domId: '_Tips-Switch-Active-Menu'
+            },
+            mbar: {
+                operation: '1121',
+                domId: '_Tips-Switch-Active-Mbar'
+            }
+        },
+        // 设置速度
+        setSpeed: {
+            menu: {
+                operation: '113',
+                domId: '_Tips-Switch-SetSpeed-Menu'
+            },
+            order: {
+                operation: '1131',
+                domId: '_Tips-Switch-SetSpeed-Order'
+            },
+            confirm: {
+                operation: '1132',
+                domId: '_Tips-Switch-SetSpeed-Confirm'
+            },
+            confirm1: {
+                operation: '1133',
+                domId: '_Tips-Switch-SetSpeed-Confirm1'
+            },
+            confirm2: {
+                operation: '1134',
+                domId: '_Tips-Switch-SetSpeed-Confirm2'
+            },
+            stop: {
+                operation: '1135',
+                domId: '_Tips-Switch-SetSpeed-Stop'
+            },
+            choose: {
+                operation: '1136',
+                domId: '_Tips-Switch-SetSpeed-Choose'
+            }
+        },
+        // 取消速度
+        cancelSpeed: {
+            menu: {
+                operation: '114',
+                domId: '_Tips-Switch-CancelSpeed-Menu'
+            },
+            order: {
+                operation: '1141',
+                domId: '_Tips-Switch-CancelSpeed-Order'
+            },
+            confirm: {
+                operation: '1142',
+                domId: '_Tips-Switch-CancelSpeed-Confirm'
+            },
+            confirm1: {
+                operation: '1143',
+                domId: '_Tips-Switch-CancelSpeed-Confirm1'
+            },
+            confirm2: {
+                operation: '1144',
+                domId: '_Tips-Switch-CancelSpeed-Confirm2'
+            },
+            stop: {
+                operation: '1145',
+                domId: '_Tips-Switch-CancelSpeed-Stop'
+            }
+        },
+        // 查询区段详情
+        query: {
+            menu: {
+                operation: '115',
+                domId: '_Tips-Switch-Query-Menu'
+            }
+        },
+        // 设置限速
+        setLimitSpeed: {
+            menu: {
+                operation: '116',
+                domId: '_Tips-Switch-SetSpeed-Menu'
+            }
+        },
+        // 确认计轴有效
+        alxeEffective: {
+            menu: {
+                operation: '117',
+                domId: '_Tips-Switch-Alxe-Effective-Menu'
+            },
+            choose1: {
+                operation: '1171',
+                domId: '_Tips-Switch-Alxe-Effective-Choose-1'
+            },
+            choose2: {
+                operation: '1172',
+                domId: '_Tips-Switch-Alxe-Effective-Choose-2'
+            },
+            confirm1: {
+                operation: '1173',
+                domId: '_Tips-Switch-Alxe-Effective-Confirm-1'
+            },
+            confirm2: {
+                operation: '1174',
+                domId: '_Tips-Switch-Alxe-Effective-Confirm-2'
+            }
+        },
+        // 引导总锁
+        guideLock: {
+            button: {
+                operation: '1180',
+                domId: '_Tips-Switch-GuideLock-Button{TOP}'
+            }
+        }
+    },
+
+    // 控制模式操作
+    StationControl: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '299'
+            }
+        },
+        // 故障
+        stoppage: {
+            menu: {
+                operation: '200'
+            }
+        },
+        // 紧急站控
+        emergencyStationControl: {
+            menu: {
+                operation: '201',
+                domId: '_Tips-Control-Emergency-Menu'
+            },
+            mbar: {
+                operation: '2011',
+                domId: '_Tips-Control-Emergency-Mbar'
+            },
+            choose: {
+                operation: '2012',
+                domId: '_Tips-Control-Emergency-Choose'
+            },
+            confirm: {
+                operation: '2013',
+                domId: '_Tips-Control-Emergency-Confirm'
+            }
+        },
+        // 请求站控
+        requestStationControl: {
+            menu: {
+                operation: '202',
+                domId: '_Tips-Control-Request-Menu'
+            },
+            mbar: {
+                operation: '2021',
+                domId: '_Tips-Control-Request-Mbar'
+            },
+            choose: {
+                operation: '2022',
+                domId: '_Tips-Control-Request-Choose'
+            },
+            confirm: {
+                operation: '2023',
+                domId: '_Tips-Control-Request-Confirm'
+            }
+        },
+        // 强行站控
+        forcedStationControl: {
+            menu: {
+                operation: '203',
+                domId: '_Tips-Control-Forced-Menu'
+            },
+            mbar: {
+                operation: '2031',
+                domId: '_Tips-Control-Forced-Mbar'
+            },
+            choose: {
+                operation: '2032',
+                domId: '_Tips-Control-Forced-Choose'
+            },
+            confirm: {
+                operation: '2033',
+                domId: '_Tips-Control-Forced-Confirm'
+            },
+            password: {
+                operation: '2034',
+                domId: '_Tips-Control-Forced-Password'
+            },
+            passwordConfirm: {
+                operation: '2035',
+                domId: '_Tips-Control-Forced-PasswordConfirm'
+            }
+        },
+        // 请求中控
+        requestCentralControl: {
+            menu: {
+                operation: '204',
+                domId: '_Tips-Control-Central-Menu'
+            },
+            mbar: {
+                operation: '2041',
+                domId: '_Tips-Control-Central-Mbar'
+            },
+            choose: {
+                operation: '2042',
+                domId: '_Tips-Control-Central-Choose'
+            },
+            confirm: {
+                operation: '2043',
+                domId: '_Tips-Control-Central-Confirm'
+            }
+        },
+        // 控制模式应答同意
+        controlResponse: {
+            menu: {
+                operation: '205',
+                domId: '_Tips-Control-Response-Menu'
+            },
+            choose: {
+                operation: '2052',
+                domId: '_Tips-Control-Response-Choose'
+            },
+            agree: {
+                operation: '2053',
+                domId: '_Tips-Control-Response-Agree'
+            },
+            refuse: {
+                operation: '2054',
+                domId: '_Tips-Control-Response-Refuse'
+            }
+        }
+    },
+
+    // 信号机操作
+    Signal: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '399'
+            }
+        },
+        // 故障
+        stoppage: {
+            menu: {
+                operation: '300'
+            }
+        },
+        // 查询进路
+        query: {
+        },
+        // 排列进路
+        arrangementRoute: {
+            button: {
+                operation: '3010',
+                domId: '_Tips-Signal-ArrangementRoute-Mbm{TOP}'
+            },
+            menu: {
+                operation: '301',
+                domId: '_Tips-Signal-ArrangementRoute-Menu'
+            },
+            choose: {
+                operation: '3011',
+                domId: '_Tips-Signal-ArrangementRoute-Choose'
+            },
+            confirm: {
+                operation: '3012',
+                domId: '_Tips-Signal-ArrangementRoute-Confirm'
+            }
+        },
+        // 取消进路
+        cancelTrainRoute: {
+            button: {
+                operation: '3030',
+                domId: '_Tips-Signal-CancelTrainRoute-Mbm{TOP}'
+            },
+            menu: {
+                operation: '303',
+                domId: '_Tips-Signal-CancelTrainRoute-Menu'
+            },
+            confirm: {
+                operation: '3031',
+                domId: '_Tips-Signal-CancelTrainRoute-Confirm'
+            }
+        },
+        // 信号重开
+        reopenSignal: {
+            button: {
+                operation: '3040',
+                domId: '_Tips-Signal-Reopen-Mbm'
+            },
+            menu: {
+                operation: '304',
+                domId: '_Tips-Signal-Reopen-Menu'
+            },
+            confirm: {
+                operation: '3041',
+                domId: '_Tips-Signal-Reopen-Confirm'
+            }
+        },
+        // 人解列车进路 (总人解)
+        humanTrainRoute: {
+            button: {
+                operation: '3050',
+                domId: '_Tips-Signal-HumanTrainRoute-Mbm{TOP}'
+            },
+            menu: {
+                operation: '305',
+                domId: '_Tips-Signal-HumanTrainRoute-Menu'
+            },
+            confirm: {
+                operation: '3051',
+                domId: '_Tips-Signal-HumanTrainRoute-Confirm'
+            }
+        },
+        // 封锁
+        lock: {
+            menu: {
+                operation: '306',
+                domId: '_Tips-Signal-Lock-Menu'
+            },
+            confirm: {
+                operation: '3061',
+                domId: '_Tips-Signal-Lock-Confirm'
+            }
+        },
+        // 解锁
+        unlock: {
+            menu: {
+                operation: '307',
+                domId: '_Tips-Signal-Unlock-Menu'
+            },
+            order: {
+                operation: '3071',
+                domId: '_Tips-Signal-Unlock-Order'
+            },
+            confirm: {
+                operation: '3072',
+                domId: '_Tips-Signal-Unlock-Confirm'
+            },
+            confirm1: {
+                operation: '3073',
+                domId: '_Tips-Signal-Unlock-Confirm1'
+            },
+            confirm2: {
+                operation: '3074',
+                domId: '_Tips-Signal-Unlock-Confirm2'
+            },
+            stop: {
+                operation: '3075',
+                domId: '_Tips-Signal-Unlock-Stop'
+            }
+        },
+        // 引导
+        guide: {
+            button: {
+                operation: '3080',
+                domId: '_Tips-Signal-Guide-Mbm{TOP}'
+            },
+            menu: {
+                operation: '308',
+                domId: '_Tips-Signal-Guide-Menu'
+            },
+            order: {
+                operation: '3081',
+                domId: '_Tips-Signal-Guide-Order'
+            },
+            confirm: {
+                operation: '3082',
+                domId: '_Tips-Signal-Guide-Confirm'
+            },
+            confirm1: {
+                operation: '3083',
+                domId: '_Tips-Signal-Guide-Confirm1'
+            },
+            confirm2: {
+                operation: '3084',
+                domId: '_Tips-Signal-Guide-Confirm2'
+            },
+            stop: { // 福州线 关闭弹窗操作
+                operation: '3085',
+                domId: '_Tips-Signal-Guide-Stop'
+            },
+            choose: {
+                operation: '3086',
+                domId: '_Tips-Signal-Guide-Choose'
+            }
+        },
+        // 设置联锁自动进路
+        setAutoInterlock: {
+            button: {
+                operation: '3090',
+                domId: '_Tips-Signal-SetAutoInterlock-Mbm'
+            },
+            menu: {
+                operation: '309',
+                domId: '_Tips-Signal-SetAutoInterlock-Menu'
+            }
+        },
+        // 取消联锁自动进路
+        cancelAutoInterlock: {
+            menu: {
+                operation: '310',
+                domId: '_Tips-Signal-CancelAutoInterlock-Menu'
+            }
+        },
+        // 设置联锁自动触发
+        setAutoTrigger: {
+            menu: {
+                operation: '311',
+                domId: '_Tips-Signal-SetAutoTrigger-Menu'
+            }
+        },
+        // 取消联锁自动触发
+        cancelAutoTrigger: {
+            menu: {
+                operation: '312',
+                domId: '_Tips-Signal-CancelAutoTrigger-Menu'
+            }
+        },
+        // 信号关灯
+        signalClose: {
+            menu: {
+                operation: '313',
+                domId: '_Tips-Signal-SignalClose-Menu'
+            },
+            confirm: {
+                operation: '3131',
+                domId: '_Tips-Signal-SignalClose-Confirm'
+            }
+        },
+        // 进路交人工控
+        humanControl: {
+            button: {
+                operation: '3140',
+                domId: '_Tips-Signal-HumanControl-Button{TOP}'
+            },
+            menu: {
+                operation: '314',
+                domId: '_Tips-Signal-HumanControl-Menu'
+            },
+            choose: {
+                operation: '3141',
+                domId: '_Tips-Signal-HumanControl-Choose'
+            },
+            confirm: {
+                operation: '3142',
+                domId: '_Tips-Signal-HumanControl-Confirm'
+            }
+        },
+        // 进路交自动控
+        atsAutoControl: {
+            button: {
+                operation: '3150',
+                domId: '_Tips-Signal-AtsAutoControl-Button{TOP}'
+            },
+            menu: {
+                operation: '315',
+                domId: '_Tips-Signal-AtsAutoControl-Menu'
+            },
+            choose: {
+                operation: '3151',
+                domId: '_Tips-Signal-AtsAutoControl-Choose'
+            },
+            confirm: {
+                operation: '3152',
+                domId: '_Tips-Signal-AtsAutoControls-Confirm'
+            }
+        },
+        // 查询进路状态
+        detail: {
+            menu: {
+                operation: '316',
+                domId: '_Tips-Signal-Detail-Menu'
+            }
+        },
+        // 查询进路状态
+        singalPassModel: {
+            menu: {
+                operation: '317',
+                domId: '_Tips-Signal-SingalPassModel-Menu'
+            }
+        }
+    },
+
+    // 物理区段操作
+    Section: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '499'
+            }
+        },
+        // 故障
+        stoppage: {
+            menu: {
+                operation: '400'
+            }
+        },
+        // 设置计轴失效
+        alxeFailure: {
+            menu: {
+                operation: '4001'
+            }
+        },
+
+        // 查询区段详情
+        query: {
+            menu: {
+                operation: '401',
+                domId: '_Tips-Section-Query-Menu'
+            }
+        },
+        // 区故解
+        fault: {
+            button: {
+                operation: '4020',
+                domId: '_Tips-Section-Fault-Mbm{TOP}'
+            },
+            menu: {
+                operation: '402',
+                domId: '_Tips-Section-Fault-Menu'
+            },
+            prepare: {
+                operation: '4021',
+                domId: '_Tips-Section-Fault-Prepare'
+            },
+            select: {
+                operation: '4022',
+                domId: '_Tips-Section-Fault-Select'
+            },
+            confirm: {
+                operation: '4023',
+                domId: '_Tips-Section-Fault-Confirm'
+            },
+            confirm1: {
+                operation: '4024',
+                domId: '_Tips-Section-Fault-Confirm1'
+            },
+            confirm2: {
+                operation: '4025',
+                domId: '_Tips-Section-Fault-Confirm2'
+            },
+            order: {
+                operation: '4026',
+                domId: '_Tips-Section-Fault-Order'
+            },
+            stop: {
+                operation: '4027',
+                domId: '_Tips-Section-Fault-Stop'
+            }
+        },
+        // 封锁
+        lock: {
+            menu: {
+                operation: '403',
+                domId: '_Tips-Section-Lock-Menu'
+            }
+        },
+        // 解锁
+        unlock: {
+            menu: {
+                operation: '404',
+                domId: '_Tips-Section-Unlock-Menu'
+            },
+            order: {
+                operation: '4041',
+                domId: '_Tips-Section-Unlock-Order'
+            },
+            confirm: {
+                operation: '4042',
+                domId: '_Tips-Section-Unlock-Confirm'
+            },
+            confirm1: {
+                operation: '4043',
+                domId: '_Tips-Section-Unlock-Confirm1'
+            },
+            confirm2: {
+                operation: '4044',
+                domId: '_Tips-Section-Unlock-Confirm2'
+            },
+            stop: {
+                operation: '4045',
+                domId: '_Tips-Section-Unlock-Stop'
+            }
+        },
+        // 切除
+        split: {
+            menu: {
+                operation: '405',
+                domId: '_Tips-Section-split-Menu'
+            },
+            mbar: {
+                operation: '4051',
+                domId: '_Tips-Section-split-Mbar'
+            }
+        },
+        // 激活
+        active: {
+            menu: {
+                operation: '406',
+                domId: '_Tips-Section-Active-Menu'
+            },
+            mbar: {
+                operation: '4061',
+                domId: '_Tips-Section-Active-mbar'
+            }
+        },
+        // 设置速度
+        setSpeed: {
+            menu: {
+                operation: '407',
+                domId: '_Tips-Section-SetSpeed-Menu'
+            },
+            order: {
+                operation: '4071',
+                domId: '_Tips-Section-SetSpeed-Order'
+            },
+            confirm: {
+                operation: '4072',
+                domId: '_Tips-Section-SetSpeed-Confirm'
+            },
+            confirm1: {
+                operation: '4073',
+                domId: '_Tips-Section-SetSpeed-Confirm1'
+            },
+            confirm2: {
+                operation: '4074',
+                domId: '_Tips-Section-SetSpeed-Confirm2'
+            },
+            stop: {
+                operation: '4075',
+                domId: '_Tips-Section-SetSpeed-Stop'
+            },
+            choose: {
+                operation: '4076',
+                domId: '_Tips-Section-SetSpeed-Choose'
+            }
+        },
+        // 取消速度
+        cancelSpeed: {
+            menu: {
+                operation: '408',
+                domId: '_Tips-Section-CancelSpeed-Menu'
+            },
+            order: {
+                operation: '4081',
+                domId: '_Tips-Section-CancelSpeed-Order'
+            },
+            confirm: {
+                operation: '4082',
+                domId: '_Tips-Section-CancelSpeed-Confirm'
+            },
+            confirm1: {
+                operation: '4083',
+                domId: '_Tips-Section-CancelSpeed-Confirm1'
+            },
+            confirm2: {
+                operation: '4084',
+                domId: '_Tips-Section-CancelSpeed-Confirm2'
+            },
+            stop: {
+                operation: '4085',
+                domId: '_Tips-Section-CancelSpeed-Stop'
+            }
+        },
+        // 计轴预复位
+        axlePreReset: {
+            button: {
+                operation: '4090',
+                domId: '_Tips-Section-AxlePreReset-Mbm'
+            },
+            menu: {
+                operation: '409',
+                domId: '_Tips-Section-AxlePreReset-Menu'
+            },
+            order: {
+                operation: '4091',
+                domId: '_Tips-Section-AxlePreReset-Order'
+            },
+            confirm: {
+                operation: '4092',
+                domId: '_Tips-Section-AxlePreReset-Confirm'
+            },
+            confirm1: {
+                operation: '4093',
+                domId: '_Tips-Section-AxlePreReset-Confirm1'
+            },
+            confirm2: {
+                operation: '4094',
+                domId: '_Tips-Section-AxlePreReset-Confirm2'
+            },
+            stop: {
+                operation: '4095',
+                domId: '_Tips-Section-AxlePreReset-Stop'
+            }
+        },
+        // 设备状态
+        detail: {
+            menu: {
+                operation: '410',
+                domId: '_Tips-Section-detail-Menu'
+            }
+        },
+        // 新建列车
+        newtrain: {
+            menu: {
+                operation: '411',
+                domId: '_Tips-Section-Newtrain-Menu'
+            }
+        },
+        // 确认计轴有效
+        alxeEffective: {
+            menu: {
+                operation: '412',
+                domId: '_Tips-Section-Alxe-Effective-Menu'
+            },
+            choose1: {
+                operation: '4121',
+                domId: '_Tips-Section-Alxe-Effective-Choose-1'
+            },
+            choose2: {
+                operation: '4122',
+                domId: '_Tips-Section-Alxe-Effective-Choose-2'
+            },
+            confirm1: {
+                operation: '4123',
+                domId: '_Tips-Section-Alxe-Effective-Confirm-1'
+            },
+            confirm2: {
+                operation: '4124',
+                domId: '_Tips-Section-Alxe-Effective-Confirm-2'
+            }
+        },
+        // 设置临时限速
+        setLimitSpeed: {
+            menu: {
+                operation: '413',
+                domId: '_Tips-Section-SetLimitSpeed-Menu'
+            },
+            openConversation: {
+                operation: '4131',
+                domId: '_Tips-Section-SetLimitSpeed-OpenConversation'
+            },
+            closeConversation: {
+                operation: '4132',
+                domId: '_Tips-Section-SetLimitSpeed-CloseConversation'
+            },
+            firstLimitSpeed: {
+                operation: '4133',
+                domId: '_Tips-Section-SetLimitSpeed-FirstLimitSpeed{TOP}'
+            },
+            firstStartSection: {
+                operation: '4134',
+                domId: '_Tips-Section-SetLimitSpeed-FirstStartSection{TOP}'
+            },
+            firstStartvalue: {
+                operation: '4135',
+                domId: '_Tips-Section-SetLimitSpeed-FirstStartvalue'
+            },
+            firstEndSection: {
+                operation: '4136',
+                domId: '_Tips-Section-SetLimitSpeed-FirstEndSection{TOP}'
+            },
+            firstEndvalue: {
+                operation: '4137',
+                domId: '_Tips-Section-SetLimitSpeed-FirstEndvalue'
+            },
+            firstCheck: {
+                operation: '4138',
+                domId: '_Tips-Section-SetLimitSpeed-FirstCheck'
+            },
+            firstComfirm: {
+                operation: '4139',
+                domId: '_Tips-Section-SetLimitSpeed-FirstComfirm'
+            },
+            secondLimitSpeed: {
+                operation: '41310',
+                domId: '_Tips-Section-SetLimitSpeed-SecondLimitSpeed{TOP}'
+            },
+            secondStartSection: {
+                operation: '41311',
+                domId: '_Tips-Section-SetLimitSpeed-SecondStartSection{TOP}'
+            },
+            secondStartvalue: {
+                operation: '41312',
+                domId: '_Tips-Section-SetLimitSpeed-SecondStartvalue{TOP}'
+            },
+            secondEndSection: {
+                operation: '41313',
+                domId: '_Tips-Section-SetLimitSpeed-SecondEndSection{TOP}'
+            },
+            secondEndvalue: {
+                operation: '41314',
+                domId: '_Tips-Section-SetLimitSpeed-SecondEndvalue{TOP}'
+            },
+            secondCheck: {
+                operation: '41315',
+                domId: '_Tips-Section-SetLimitSpeed-SecondCheck'
+            },
+            secondComfirm: {
+                operation: '41316',
+                domId: '_Tips-Section-SetLimitSpeed-SecondComfirm'
+            },
+            domIdClose: {
+                operation: '41317',
+                domId: '_Tips-Section-SetLimitSpeed-DomIdClose'
+            },
+            close: {
+                operation: '41318',
+                domId: '_Tips-Section-SetLimitSpeed-close'
+            }
+        },
+        // 确认临时限速
+        confirmLimit: {
+            menu: {
+                operation: '414',
+                domId: '_Tips-Section-Confirm-Limit-Menu'
+            }
+        }
+    },
+
+    // 站台
+    StationStand: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '599'
+            }
+        },
+        // 故障
+        stoppage: {
+            menu: {
+                operation: '500'
+            }
+        },
+        // 提前发车
+        earlyDeparture: {
+            menu: {
+                operation: '501',
+                domId: '_Tips-Stand-EarlyDeparture-Menu'
+            },
+            upSelect: {
+                operation: '5011',
+                domId: '_Tips-Stand-EarlyDeparture-upSelect'
+            },
+            downSelect: {
+                operation: '5012',
+                domId: '_Tips-Stand-EarlyDeparture-downSelect'
+            }
+        },
+        // 设置跳停
+        setJumpStop: {
+            menu: {
+                operation: '502',
+                domId: '_Tips-Stand-SetJumpStop-Menu'
+            },
+            choose: {
+                operation: '5021',
+                domId: '_Tips-Stand-SetJumpStop-Choose'
+            },
+            select: {
+                operation: '5022',
+                domId: '_Tips-Stand-SetJumpStop-Select'
+            },
+            selfStationStand: {
+                operation: '5023',
+                domId: '_Tips-Stand-SetJumpStop-selfStationStand'
+            },
+            otherStationStand: {
+                operation: '5024',
+                domId: '_Tips-Stand-SetJumpStop-otherStationStand'
+            }
+        },
+        // 取消跳停
+        cancelJumpStop: {
+            menu: {
+                operation: '503',
+                domId: '_Tips-Stand-CancelJumpStop-Menu'
+            },
+            choose: {
+                operation: '5031',
+                domId: '_Tips-Stand-CancelJumpStop-Choose'
+            },
+            select: {
+                operation: '5032',
+                domId: '_Tips-Stand-CancelJumpStop-Select'
+            },
+            selfStationStand: {
+                operation: '5033',
+                domId: '_Tips-Stand-CancelJumpStop-selfStationStand'
+            },
+            otherStationStand: {
+                operation: '5034',
+                domId: '_Tips-Stand-CancelJumpStop-otherStationStand'
+            }
+        },
+        // 设置扣车
+        setDetainTrain: {
+            menu: {
+                operation: '504',
+                domId: '_Tips-Stand-SetDetainTrain-Menu'
+            }
+        },
+        // 取消扣车
+        cancelDetainTrain: {
+            menu: {
+                operation: '505',
+                domId: '_Tips-Stand-CancelDetainTrain-Menu'
+            },
+            choose: {
+                operation: '5051',
+                domId: '_Tips-Stand-cancelDetainTrain-Choose'
+            }
+        },
+        // 强制取消扣车
+        cancelDetainTrainForce: {
+            menu: {
+                operation: '506',
+                domId: '_Tips-Stand-CancelDetainTrainForce-Menu'
+            }
+        },
+        // 站台详细信息
+        detail: {
+            menu: {
+                operation: '507',
+                domId: '_Tips-Stand-Detail-Menu'
+            }
+        },
+        // 全线取消扣车
+        cancelDetainTrainAll: {
+            menu: {
+                operation: '508',
+                domId: '_Tips-Stand-CancelDetainTrainAll-Menu'
+            },
+            choose: {
+                operation: '5081',
+                domId: '_Tips-Stand-CancelDetainTrainAll-Choose'
+            },
+            mbar: {
+                operation: '5082',
+                domId: '_Tips-Stand-CancelDetainTrainAll-Mbar'
+            },
+            confirm: {
+                operation: '5083',
+                domId: '_Tips-Stand-CancelDetainTrainAll-Confirm'
+            }
+        },
+        // 设置停站时间
+        setStopTime: {
+            menu: {
+                operation: '509',
+                domId: '_Tips-Stand-SetStopTime-Menu'
+            },
+            confirm: {
+                operation: '5091',
+                domId: '_Tips-Stand-SetStopTime-Confirm'
+            },
+            choose1: {
+                operation: '5092',
+                domId: '_Tips-Stand-SetStopTime-Choose-1'
+            },
+            choose2: {
+                operation: '5093',
+                domId: '_Tips-Stand-SetStopTime-Choose-2'
+            },
+            input: {
+                operation: '5094',
+                domId: '_Tips-Stand-SetStopTime-Input'
+            }
+        },
+        // 设置运行等级
+        setRunLevel: {
+            menu: {
+                operation: '510',
+                domId: '_Tips-Stand-SetRunLevel-Menu'
+            },
+            choose: {
+                operation: '5101',
+                domId: '_Tips-Stand-SetRunLevel-Choose'
+            },
+            confirm: {
+                operation: '5102',
+                domId: '_Tips-Stand-SetRunLevel-confirm'
+            },
+            check: {
+                operation: '5103',
+                domId: '_Tips-Stand-SetRunLevel-check'
+            },
+            chooseLevel: {
+                operation: '5104',
+                domId: '_Tips-Stand-SetRunLevel-chooseLevel'
+            },
+            chooseTrain: {
+                operation: '5105',
+                domId: '_Tips-Stand-SetRunLevel-chooseTrain'
+            },
+            choose1: {
+                operation: '5106',
+                domId: '_Tips-Stand-SetRunLevel-Choose-1'
+            },
+            choose2: {
+                operation: '5107',
+                domId: '_Tips-Stand-SetRunLevel-Choose-2'
+            }
+        },
+        // 设置折返策略
+        setBackStrategy: {
+            menu: {
+                operation: '511',
+                domId: '_Tips-Stand-SetBackStrategy-Menu'
+            },
+            choose: {
+                operation: '5111',
+                domId: '_Tips-Stand-setBackStrategy-Choose'
+            },
+            confirm: {
+                operation: '5112',
+                domId: '_Tips-Stand-setBackStrategy-confirm'
+            }
+        },
+        // 设置全线扣车
+        setDetainTrainAll: {
+            menu: {
+                operation: '512',
+                domId: '_Tips-Stand-SetBackStrategy-Menu'
+            },
+            mbar: {
+                operation: '5121',
+                domId: '_Tips-Stand-setDetainTrainAll-Mbar'
+            },
+            confirm: {
+                operation: '5122',
+                domId: '_Tips-Stand-setDetainTrainAll-confirm'
+            }
+        },
+        cancelUpDetainTrainAll: {
+            menu: {
+                operation: '513',
+                domId: '_Tips-Stand-SetBackStrategy-Menu'
+            },
+            mbar: {
+                operation: '5131',
+                domId: '_Tips-Stand-clearUpCar-Mbar'
+            },
+            confirm: {
+                operation: '5132',
+                domId: '_Tips-Stand-clearUpCar-confirm'
+            }
+        },
+        cancelDownDetainTrainAll: {
+            menu: {
+                operation: '514',
+                domId: '_Tips-Stand-SetBackStrategy-Menu'
+            },
+            mbar: {
+                operation: '5141',
+                domId: '_Tips-Stand-clearDownCar-Mbar'
+            },
+            confirm: {
+                operation: '5142',
+                domId: '_Tips-Stand-clearDownCar-confirm'
+            }
+        },
+        // 批量扣车
+        setBulkBuckleTrain: {
+            menu: {
+                operation: '515',
+                domId: '_Tips-Stand-setBulkBuckleTrain-Menu'
+            }
+        },
+        // 批量取消扣车
+        cancelBulkBuckleTrain: {
+            menu: {
+                operation: '516',
+                domId: '_Tips-Stand-cancelBulkBuckleTrain-Menu'
+            }
+        },
+        // 区间列车数量限制
+        setDetainTrainAuto: {
+            menu: {
+                operation: '515',
+                domId: '_Tips-Stand-setDetainTrainAuto-Menu'
+            }
+        },
+        // 取消区间列车数量限制
+        cancelDetainTrainAuto: {
+            menu: {
+                operation: '516',
+                domId: '_Tips-Stand-cancelDetainTrainAuto-Menu'
+            }
+        }
+    },
+
+    Station: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '699'
+            }
+        },
+        // 故障
+        stoppage: {
+            menu: {
+                operation: '600'
+            }
+        },
+        // 全站设置联锁自动触发
+        setAutoTrigger: {
+            menu: {
+                operation: '601',
+                domId: '_Tips-Station-SetAutoTrigger-Menu'
+            }
+        },
+        // 全站取消联锁自动触发
+        cancelAutoTrigger: {
+            menu: {
+                operation: '602',
+                domId: '_Tips-Station-CancelAutoTrigger-Menu'
+            }
+        },
+        // 上电解锁
+        powerUnLock: {
+            menu: {
+                operation: '603',
+                domId: '_Tips-Station-PowerUnLock-Menu'
+            },
+            order: {
+                operation: '6031',
+                domId: '_Tips-Station-PowerUnLock-Order'
+            },
+            confirm: {
+                operation: '6032',
+                domId: '_Tips-Station-PowerUnLock-Confirm'
+            },
+            confirm1: {
+                operation: '6033',
+                domId: '_Tips-Station-PowerUnLock-Confirm1'
+            },
+            confirm2: {
+                operation: '6034',
+                domId: '_Tips-Station-PowerUnLock-Confirm2'
+            },
+            stop: {
+                operation: '6035',
+                domId: '_Tips-Station-PowerUnLock-Stop'
+            }
+        },
+        // 执行关键操作测试
+        execKeyOperationTest: {
+            menu: {
+                operation: '604',
+                domId: '_Tips-Station-ExecKeyOperationTest-Menu'
+            },
+            order: {
+                operation: '6041',
+                domId: '_Tips-Station-ExecKeyOperationTest-Order'
+            },
+            confirm: {
+                operation: '6042',
+                domId: '_Tips-Station-ExecKeyOperationTest-Confirm'
+            },
+            confirm1: {
+                operation: '6043',
+                domId: '_Tips-Station-ExecKeyOperationTest-Confirm1'
+            },
+            confirm2: {
+                operation: '6044',
+                domId: '_Tips-Station-ExecKeyOperationTest-Confirm2'
+            },
+            stop: {
+                operation: '6045',
+                domId: '_Tips-Station-ExecKeyOperationTest-Stop'
+            }
+        },
+        // 所有进路自排关
+        humanControlALL: {
+            menu: {
+                operation: '605',
+                domId: '_Tips-Station-HumanControlALL-Menu'
+            }
+        },
+        // 所有进路自排开
+        atsAutoControlALL: {
+            menu: {
+                operation: '606',
+                domId: '_Tips-Station-AtsAutoControlALL-Menu'
+            }
+        },
+        split: {
+            mbar: {
+                operation: '6071',
+                domId: '_Tips-Stand-Split-Mbar'
+            },
+            choose: {
+                operation: '6072',
+                domId: '_Tips-Stand-Split-Mbar'
+            },
+            confirm: {
+                operation: '6073',
+                domId: '_Tips-Stand-Split-confirm'
+            }
+        },
+        active: {
+            mbar: {
+                operation: '6081',
+                domId: '_Tips-Stand-Active-Mbar'
+            },
+            choose: {
+                operation: '6082',
+                domId: '_Tips-Stand-Split-Mbar'
+            },
+            confirm: {
+                operation: '6083',
+                domId: '_Tips-Stand-Active-confirm'
+            }
+        }
+    },
+
+    // 列车
+    Train: {
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '799'
+            }
+        },
+        // 故障
+        stoppage: {
+            menu: {
+                operation: '700'
+            }
+        },
+        // 添加列车识别号
+        addTrainId: {
+            menu: {
+                operation: '701',
+                domId: '_Tips-Train-AddTrainId-Menu'
+            },
+            trainNumberChange: {
+                operation: '7011',
+                domId: '_Tips-Train-AddTrainId-TrainNumberChange'
+            },
+            trainTypeChange: {
+                operation: '7012',
+                domId: '_Tips-Train-AddTrainId-trainTypeChange'
+            },
+            serverNoChange: {
+                operation: '7013',
+                domId: '_Tips-Train-AddTrainId-serverNoChange'
+            },
+            trainNoChange: {
+                operation: '7014',
+                domId: '_Tips-Train-AddTrainId-trainNoChange'
+            },
+            targetCodeChange: {
+                operation: '7015',
+                domId: '_Tips-Train-AddTrainId-targetCodeChange'
+            },
+            confirm: {
+                operation: '7016',
+                domId: '_Tips-Train-AddTrainId-Confirm'
+            },
+            input: {
+                operation: '7017',
+                domId: '_Tips-Train-AddTrainId-Input'
+            }
+        },
+        // 修改列车识别号
+        editTrainId: {
+            menu: {
+                operation: '702',
+                domId: '_Tips-Train-EditTrainId-Menu'
+            },
+            trainNumberChange: {
+                operation: '7021',
+                domId: '_Tips-Train-EditTrainId-TrainNumberChange'
+            },
+            trainTypeChange: {
+                operation: '7022',
+                domId: '_Tips-Train-EditTrainId-trainTypeChange'
+            },
+            serverNoChange: {
+                operation: '7023',
+                domId: '_Tips-Train-EditTrainId-serverNoChange'
+            },
+            trainNoChange: {
+                operation: '7024',
+                domId: '_Tips-Train-EditTrainId-trainNoChange'
+            },
+            targetCodeChange: {
+                operation: '7025',
+                domId: '_Tips-Train-EditTrainId-targetCodeChange'
+            },
+            confirm: {
+                operation: '7026',
+                domId: '_Tips-Train-EditTrainId-Confirm'
+            },
+            input: {
+                operation: '7027',
+                domId: '_Tips-Train-EditTrainId-Input'
+            }
+        },
+        // 删除列车识别号
+        delTrainId: {
+            menu: {
+                operation: '703',
+                domId: '_Tips-Train-DelTrainId-Menu'
+            },
+            trainNumberChange: {
+                operation: '7031',
+                domId: '_Tips-Train-DelTrainId-TrainNumberChange'
+            },
+            confirm: {
+                operation: '7032',
+                domId: '_Tips-Train-DelTrainId-Confirm'
+            },
+            input: {
+                operation: '7033',
+                domId: '_Tips-Train-DelTrainId-Input'
+            }
+        },
+        // 移动列车识别号
+        moveTrainId: {
+            menu: {
+                operation: '704',
+                domId: '_Tips-Train-MoveTrainId-Menu'
+            },
+            confirm: {
+                operation: '7041',
+                domId: '_Tips-Train-MoveTrainId-Confirm'
+            }
+        },
+
+        // 交换列车识别号
+        switchTrainId: {
+            menu: {
+                operation: '705',
+                domId: '_Tips-Train-SwitchTrainId-Menu'
+            },
+            confirm: {
+                operation: '7051',
+                domId: '_Tips-Train-SwitchTrainId-Confirm'
+            }
+        },
+        // 修改车组号
+        editTrainNo: {
+            menu: {
+                operation: '706',
+                domId: '_Tips-Train-DditTrainNo-Menu'
+            },
+            confirm: {
+                operation: '7061',
+                domId: '_Tips-Train-DditTrainNo-Confirm'
+            }
+        },
+        // 限速行驶
+        limitSpeed: {
+            menu: {
+                operation: '707',
+                domId: '_Tips-Train-LimitSpeed-Menu'
+            }
+        },
+        // 设置计划车
+        setPlanTrainId: {
+            menu: {
+                operation: '708',
+                domId: '_Tips-Train-SetPlanTrainId-Menu'
+            },
+            confirm: {
+                operation: '7081',
+                domId: '_Tips-Train-SetPlanTrainId-Confirm'
+            },
+            trainSource: {
+                operation: '7082',
+                domId: '_Tips-Train-SetPlanTrainId-TrainSource'
+            }
+        },
+        // 添加计划车
+        addPlanTrainId: {
+            menu: {
+                operation: '709',
+                domId: '_Tips-Train-addPlanTrainId-Menu'
+            },
+            confirm: {
+                operation: '7091',
+                domId: '_Tips-Train-addPlanTrainId-Confirm'
+            },
+            trainSource: {
+                operation: '7092',
+                domId: '_Tips-Train-addPlanTrainId-TrainSource'
+            }
+        },
+        // 平移计划车
+        moveEventlyTrainId: {
+            menu: {
+                operation: '70a',
+                domId: '_Tips-Train-moveEventlyTrainId-Menu'
+            },
+            confirm: {
+                operation: '70a1',
+                domId: '_Tips-Train-moveEventlyTrainId-Confirm'
+            },
+            trainSource: {
+                operation: '70a2',
+                domId: '_Tips-Train-moveEventlyTrainId-TrainSource'
+            }
+        },
+        // 删除计划车
+        deletePlanTrainId: {
+            menu: {
+                operation: '70b',
+                domId: '_Tips-Train-deletePlanTrainId-Menu'
+            },
+            confirm: {
+                operation: '70b1',
+                domId: '_Tips-Train-deletePlanTrainId-Confirm'
+            },
+            trainSource: {
+                operation: '70b2',
+                domId: '_Tips-Train-deletePlanTrainId-TrainSource'
+            }
+        },
+        // 设目的地车
+        destinationTrainId: {
+            menu: {
+                operation: '70c',
+                domId: '_Tips-Train-destinationTrainId-Menu'
+            }
+        },
+        // 设人工车
+        artificialTrainId: {
+            menu: {
+                operation: '70d',
+                domId: '_Tips-Train-artificialTrainId-Menu'
+            }
+        }
+
+    },
+
+    // 取消全线临时限速
+    LimitControl: {
+        CancelAllLimit: {
+            menu: {
+                operation: '800',
+                domId: '_Tips-Cancel-Limit-All-Menu'
+            },
+            openMessage: {
+                operation: '8001',
+                domId: '_Tips-Cancel-Limit-open-message-Menu'
+            },
+            closeMessage: {
+                operation: '8002',
+                domId: '_Tips-Cancel-Limit-close-message-Menu'
+            },
+            confirm1: {
+                operation: '8003',
+                domId: '_Tips-Cancel-Limit-close-confirm1-Menu'
+            },
+            confirm2: {
+                operation: '8004',
+                domId: '_Tips-Cancel-Limit-close-confirm2-Menu'
+            },
+            confirm: {
+                operation: '8005',
+                domId: '_Tips-Cancel-Limit-confirm-Menu'
+            },
+            close: {
+                operation: '8006',
+                domId: '_Tips-Cancel-Limit-close-Menu'
+            }
+        }
+    },
+
+    // 混合指令
+    MixinCommand: {
+        /** 控制模式操作 */
+        remoteControl: {
+            mbar: {
+                operation: '2999',
+                domId: '_Tips-Control-StationControl-Mbar'
+            }
+        },
+        // 封锁
+        block: {
+            button: {
+                operation: '2991',
+                domId: '_Tips-Block-Button{TOP}'
+            }
+        },
+        // 解封
+        unblock: {
+            button: {
+                operation: '2992',
+                domId: '_Tips-Unblock-Button{TOP}'
+            }
+        },
+        // 功能按钮
+        functionButton: {
+            button: {
+                operation: '2993',
+                domId: '_Tips-FunctionButton-Button{TOP}'
+            }
+        }
+    }
+
+};
+
+class OperationHandler {
+    constructor() {
+        this.domIdOperationRel = {};
+        this.generateDomIdOperationRel();
+    }
+
+    generateDomIdOperationRel() {
+        this.domIdOperationRel = {};
+        for (const deviceType in OperationEvent) {
+            for (const op in OperationEvent[deviceType]) {
+                for (const orderType in OperationEvent[deviceType][op]) {
+                    if (OperationEvent[deviceType][op][orderType].operation) {
+                        this.domIdOperationRel[OperationEvent[deviceType][op][orderType].operation] = OperationEvent[deviceType][op][orderType].domId;
+                    }
+                }
+            }
+        }
+    }
+
+    getDomIdByOperation(operation) {
+        if (!this.domIdOperationRel) {
+            this.domIdOperationRel = this.generateDomIdOperationRel();
+        }
+
+        return this.domIdOperationRel[operation];
+    }
+
+    checkOperationIsCurrentOperate(operation, op) {
+        for (const order in op) {
+            if (op[order] &&
+                op[order].operation === operation) {
+                return true;
+            }
+        }
+    }
+}
+
+export default new OperationHandler();
diff --git a/src/scripts/cmdPlugin/ParamEnum.js b/src/scripts/cmdPlugin/ParamEnum.js
new file mode 100644
index 000000000..327b42704
--- /dev/null
+++ b/src/scripts/cmdPlugin/ParamEnum.js
@@ -0,0 +1,27 @@
+export default {
+    P_SECTION_CODE: {label: '区段CODE', value: 'Section_Code' },
+    P_SIGNAL_CODE: {label: '信号机CODE', value: 'Signal_Code'},
+    P_SWITCH_CODE: {label: '道岔CODE', value: 'Switch_Code'},
+
+    P_CONTROLMODE_CODE: {label: '控制模式CODE', value: 'ControlMode_Code'},
+
+    P_STATIONSTAND_CODE: {label: '站台CODE', value: 'StationStand_Code'},
+
+    P_ROUTE_CODE: {label: '进路CODE', value: 'Route_Code'},
+    P_ROUTE_CODE_LIST: {label: '进路CODE列表', value: 'Route_Code_List'},
+
+    P_STAND_ALWAYS_VALID: {label: '站台一直有效', value: 'Stand_AlwaysValid'},
+    P_STAND_STOP_CONTROL: {label: '站台控制方式', value: 'Stand_StopControl'},
+    P_STAND_RUNLEVEL: {label: '站台运行等级', value: 'Stand_RunLevel'},
+    P_STAND_STOPTIME: {label: '站台停站时间', value: 'Stand_StopTime'},
+    P_STAND_REENTRY_STRATEGY: {label: '站台控制策略', value: 'Stand_ReentryStrategy'},
+    P_STAND_ALLLINE: {label: '站台全线', value: 'Stand_AllLine'},
+    P_STAND_SPEED_LIMIT_VALUE: {label: '临时限速值', value: 'SpeedLimit_Value'},
+    P_STAND_CHECK_CONFLICT: {label: '站台检查冲突', value: 'CheckConflict'},
+    P_STAND_JUMPSTOP_RANGE: {label: '列车跳停范围', value: 'Stand_JumpStop_Range'},
+    P_REPLY_COMMAND_ID: {label: '回复指令ID', value: 'Reply_Command_Id'},
+    P_CONTROLMODE_REPLY: {label: '控制模式转换回复', value: 'ControlMode_Reply'},
+    P_Train_GroupNo: {label: '车组号', value: 'Train_GroupNo'},
+    P_STAND_STOPTIME_MODE: {label: '站台停战时间模式（自动/全人工）', value: 'Stand_StopTime_Mode'}
+};
+
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
new file mode 100644
index 000000000..8451c307b
--- /dev/null
+++ b/src/scripts/cmdPlugin/ValidateHandler.js
@@ -0,0 +1,70 @@
+import store from '@/store';
+import LangStorage from '@/utils/lang';
+import Handler from './Handler.js';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { Message } from 'element-ui';
+
+class ValidateHandler {
+    vaildate(mode, operate) {
+        switch (mode) {
+        case TrainingMode.EDIT: 	// 编辑制作模式
+            return this.vaildate_edit(operate);
+        case TrainingMode.PRACTICE: // 练习模式
+            return this.vaildate_tips(operate);
+        case TrainingMode.TEACH: 	// 教学模式
+            return this.vaildate_tips(operate);
+        }
+
+        return true;
+    }
+
+    vaildate_edit(operate) {
+        let vaild = true;
+        if (Handler.getOperateBreakStatus()) {
+            const tip = LangStorage.getLang() == 'en' ? 'Please enter a hint and click next' : '请输入提示并点击下一步';
+            Message.error(tip);
+            Handler.pop();
+            vaild = false;
+        }
+
+        if (Handler.getTrainingStart()) {
+            store.dispatch('training/setTempStep', operate);
+        }
+
+        return vaild;
+    }
+
+    vaildate_tips(operate) {
+        let valid = true;
+        if (Handler.getTrainingStart()) {
+            valid = this.judge(operate);
+        } else {
+            Handler.clear();
+            valid = false;
+        }
+
+        return valid;
+    }
+
+    /** 判断操作步骤是否正确 */
+    judge (operate) {
+        const steps = Handler.getSteps();
+        const order = Handler.getOrder();
+
+        let valid = false;
+        if (order < steps.length) {
+            const standard = steps[order];
+            if (operate && standard &&
+					operate.code == standard.code &&
+					operate.operation == standard.operation &&
+					operate.val == standard.val) {
+                valid = true;
+            }
+        }
+
+        return valid;
+    }
+
+}
+
+export default new ValidateHandler();
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 7e1c3aed6..c87fa964c 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -495,6 +495,22 @@ const map = {
                 });
             }
 
+            return device;
+        },
+
+        // 查询所属车站关联的控制模式
+        getDeviceStationCodeByStationCode: (state) => (code) => {
+            let device = null;
+            if (code &&
+				state.map &&
+				state.map.stationList && state.map.stationList.length) {
+                state.map.stationList.forEach(elem => {
+                    if (elem.code == code) {
+                        device = state.mapDevice[elem.code];
+                    }
+                });
+            }
+
             return device;
         }
     },
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index 4fbfc9676..016e35293 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -3,6 +3,7 @@ import { TrainingMode } from '@/scripts/ConstDic';
 import OperateHandler from '@/scripts/plugin/OperateHandler';
 import deviceType from '../../jmap/constant/deviceType';
 import LangStorage from '@/utils/lang';
+import Handler from '@/scripts/cmdPlugin/Handler';
 
 /**
  * 实训状态数据
@@ -201,6 +202,9 @@ const training = {
         },
         setGroup: (state, group) => {
             state.group = group;
+        },
+        notifyGetCommandDefinition: (state, lineCode) => {
+            Handler.notify(lineCode);
         }
     },
 
@@ -252,6 +256,7 @@ const training = {
         start: ({ commit }) => {
             // 清空操作组
             OperateHandler.cleanOperates();
+            Handler.clear(); // 两种方式
             // 清空计时器以及得分
             commit('stopCountTime');
             commit('resetUsedTime');
@@ -372,6 +377,50 @@ const training = {
             });
         },
 
+        /**
+		 * 下一步
+		 */
+        nextNew: ({ commit, state }, operate) => {
+            return new Promise((resolve, reject) => {
+                commit('setOperate', operate);
+
+                if (!state.started && !state.mode) {
+                    commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
+                    return;
+                }
+
+                try {
+                    // 处理operation
+                    Handler.handle(operate).then(rtn => {
+                        if (state.started) {
+                        // 教学和联系模式需要给出过程步骤提示
+                            if (TrainingMode.TEACH === state.mode || TrainingMode.PRACTICE === state.mode) {
+                                if (rtn && rtn.valid) {
+                                    commit('next');
+                                    commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green' });
+                                    commit('tipEventIncrement');
+                                } else {
+                                    if (!operate.repeat) {
+                                        commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'operation mistake!' : '操作错误！', color: 'red' });
+                                    }
+                                }
+                            } else if (TrainingMode.EXAM === state.mode || TrainingMode.TEST === state.mode) {
+                            // 测试和考试不给提示
+                                rtn && rtn.valid && commit('next');
+                            }
+                        }
+                        resolve(rtn);
+                    }).catch(error => {
+                        console.error(error);
+                        reject(error);
+                    });
+                } catch (error) {
+                    console.error(error);
+                    reject(error);
+                }
+            });
+        },
+
         /**
 		 * 提示消息重新加载
 		 */
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 1e9afea51..5550c465d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -7,7 +7,7 @@ export function getBaseUrl() {
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
index 2fcb3fb20..1d6add39f 100644
--- a/src/views/display/designIndex.vue
+++ b/src/views/display/designIndex.vue
@@ -237,6 +237,7 @@ export default {
     },
     async beforeDestroy() {
         await this.clearAllTimer();
+        await this.quit();
         await this.$store.dispatch('training/reset');
         await this.$store.dispatch('map/mapClear');
         EventBus.$off('clearCheckLogin');
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index 345de9d23..25c98764b 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -235,6 +235,7 @@ export default {
     },
     async beforeDestroy() {
         await this.clearAllTimer();
+        await this.quit();
         await this.$store.dispatch('training/reset');
         await this.$store.dispatch('map/mapClear');
         EventBus.$off('clearCheckLogin');
diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue
index 71731ad60..d275e359d 100644
--- a/src/views/display/menuDemon.vue
+++ b/src/views/display/menuDemon.vue
@@ -35,9 +35,9 @@ import { getGoodsTryUse } from '@/api/management/goods';
 import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
 import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
-import { runDiagramIsStart, quitScript } from '@/api/simulation';
+import { runDiagramIsStart, runDiagramQuit, quitScript } from '@/api/simulation';
 import { timeFormat } from '@/utils/date';
-import { getToken } from '@/utils/auth';
+// import { getToken } from '@/utils/auth';
 
 export default {
     name: 'MenuDemon',
@@ -189,7 +189,8 @@ export default {
                 this.$messageBox(this.$t('display.demon.exitTaskFail'));
             });
         },
-        back() {
+        async back() {
+            await runDiagramQuit(this.group);
             this.$store.dispatch('training/over').then(() => {
                 history.go(-1);
                 Notification.closeAll();
diff --git a/src/views/display/menuExam.vue b/src/views/display/menuExam.vue
index e872c4ee2..9d44b1690 100644
--- a/src/views/display/menuExam.vue
+++ b/src/views/display/menuExam.vue
@@ -139,7 +139,7 @@ export default {
             }).catch(error => {
                 // 如果时50009则表示考试已完成，不能再次进行y
                 if (error.code === 500009) {
-                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
+                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
                 } else {
                     this.$messageBox(this.$t('display.exam.refreshListError'));
                 }
diff --git a/src/views/display/tipExamList.vue b/src/views/display/tipExamList.vue
index 16945466f..91f83f6b9 100644
--- a/src/views/display/tipExamList.vue
+++ b/src/views/display/tipExamList.vue
@@ -93,7 +93,7 @@ export default {
                 name: '',
                 remarks: ''
             },
-            isShrink: false,
+            isShrink: true,
             examName: '',
             courseModel: {
                 id: '',
@@ -197,13 +197,12 @@ export default {
             }).catch(error => {
                 // 如果时50009则表示考试已完成，不能再次进行y
                 if (error.code === 500009) {
-                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem } });
+                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
                 } else {
                     this.$messageBox(this.$t('display.exam.refreshListError'));
 
                 }
             });
-            this.shrink();
         },
         scanCommit() {
             this.clearScanCommit();
@@ -281,7 +280,7 @@ export default {
         submit() {
             this.$store.dispatch('exam/over').then(() => {
                 this.$store.dispatch('trainingList/clearTrainingList');
-                this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
+                this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
             });
         },
         shrink() {
diff --git a/src/views/display/tipTrainingDetail.vue b/src/views/display/tipTrainingDetail.vue
index 4ec3b1363..23edcf08d 100644
--- a/src/views/display/tipTrainingDetail.vue
+++ b/src/views/display/tipTrainingDetail.vue
@@ -117,8 +117,6 @@ export default {
                     this.$message.error(this.$t('display.training.getCourseInformationFail') + ':' + error.message);
                 });
             }
-
-            this.shrink();
         },
         jump(obj) {
             const query = {
diff --git a/src/views/exam/result.vue b/src/views/exam/result.vue
index dc48a3382..5f3589a6d 100644
--- a/src/views/exam/result.vue
+++ b/src/views/exam/result.vue
@@ -108,7 +108,7 @@ export default {
         },
         back() {
             const examId = this.resultModel.examId;
-            this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`, query: { subSystem: this.$route.query.subSystem }});
+            this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId }});
         }
     }
 };
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index a8054c892..14d11f9fb 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -23,12 +23,12 @@
 import Vue from 'vue';
 import localStore from 'storejs';
 import Jlmap from '@/jmap/map';
-// import JlmapNew from '@/jmapNew/map';
 import ZoomBox from './zoom/zoom';
 import ProgressBar from '@/views/components/progressBar/index';
 import { mapGetters } from 'vuex';
 import { TrainingMode } from '@/scripts/ConstDic';
 import { EventBus } from '@/scripts/event-bus';
+import Theme from '@/jmap/theme/factory';
 
 export default {
     name: 'JlmapVisual',
@@ -142,47 +142,26 @@ export default {
             if (path.includes('design/userlist/map/draw')) {
                 mouseWheelFlag = true;
             }
-            if (this.$store.state.config.switchMap === 'new') {
-                Vue.prototype.$jlmap = new Jlmap({
-                    dom: document.getElementById(this.canvasId),
-                    config: {
-                        renderer: 'canvas',
-                        width: this.width,
-                        height: this.height
-                    },
-                    options: {
-                        scaleRate: 1,
-                        offsetX: 0,
-                        offsetY: 0,
-                        zoomOnMouseWheel: mouseWheelFlag
-                    },
-                    methods: {
-                        dataLoaded: this.handleDataLoaded,
-                        viewLoaded: this.handleViewLoaded,
-                        stateLoaded: this.handleStateLoaded
-                    }
-                });
-            } else {
-                Vue.prototype.$jlmap = new Jlmap({
-                    dom: document.getElementById(this.canvasId),
-                    config: {
-                        renderer: 'canvas',
-                        width: this.width,
-                        height: this.height
-                    },
-                    options: {
-                        scaleRate: 1,
-                        offsetX: 0,
-                        offsetY: 0,
-                        zoomOnMouseWheel: mouseWheelFlag
-                    },
-                    methods: {
-                        dataLoaded: this.handleDataLoaded,
-                        viewLoaded: this.handleViewLoaded,
-                        stateLoaded: this.handleStateLoaded
-                    }
-                });
-            }
+            Vue.prototype.$theme = new Theme();
+            Vue.prototype.$jlmap = new Jlmap({
+                dom: document.getElementById(this.canvasId),
+                config: {
+                    renderer: 'canvas',
+                    width: this.width,
+                    height: this.height
+                },
+                options: {
+                    scaleRate: 1,
+                    offsetX: 0,
+                    offsetY: 0,
+                    zoomOnMouseWheel: mouseWheelFlag
+                },
+                methods: {
+                    dataLoaded: this.handleDataLoaded,
+                    viewLoaded: this.handleViewLoaded,
+                    stateLoaded: this.handleStateLoaded
+                }
+            });
 
             this.$jlmap.on('dataZoom', this.onDataZoom, this);
             this.$jlmap.on('selected', this.onSelected, this);
diff --git a/src/views/jointTraining/menuDemon.vue b/src/views/jointTraining/menuDemon.vue
index 8dc49bf5c..b3fa9a1cc 100644
--- a/src/views/jointTraining/menuDemon.vue
+++ b/src/views/jointTraining/menuDemon.vue
@@ -2,6 +2,7 @@
   <div>
     <div class="display-draft">
       <el-button-group>
+        <el-button v-if="isProject" type="primary" @click="setRelDevice">设置真实设备</el-button>
         <el-button v-if="isDriver" type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
         <template v-if="isAdmin">
           <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
@@ -12,6 +13,7 @@
     </div>
     <qr-code ref="qrCode" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
+    <real-device ref="realDevice" />
   </div>
 </template>
 
@@ -23,12 +25,15 @@ import { exitFullscreen } from '@/utils/screen';
 import { putJointTrainingSimulationUser } from '@/api/chat';
 import { timeFormat } from '@/utils/date';
 import { EventBus } from '@/scripts/event-bus';
+import { getSessionStorage } from '@/utils/auth';
+import RealDevice from './menuDraft/realDevice';
 
 export default {
     name: 'MenuDemonJoint',
     components: {
         QrCode,
-        SetTime
+        SetTime,
+        RealDevice
     },
     props: {
         group: {
@@ -83,6 +88,9 @@ export default {
         },
         isBigScreen() {
             return this.userRole == 'BigScreen';
+        },
+        isProject() {
+            return getSessionStorage('project').endsWith('gzb');
         }
     },
     watch: {
@@ -308,6 +316,9 @@ export default {
         },
         jumpjlmap3d() {
             this.$emit('hidepanel');
+        },
+        setRelDevice() {
+            this.$refs.realDevice.doShow();
         }
     }
 };
diff --git a/src/views/jointTraining/menuDraft/realDevice.vue b/src/views/jointTraining/menuDraft/realDevice.vue
new file mode 100644
index 000000000..ff799591e
--- /dev/null
+++ b/src/views/jointTraining/menuDraft/realDevice.vue
@@ -0,0 +1,247 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    :visible.sync="dialogShow"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+    center
+  >
+    <div>
+      <ul>
+        <li v-for="(node, index) in options" :key="index" style="height: 45px">
+          <span>{{ handleDeviceTitle(node) }}</span>
+          <div style="float: right;">
+            <el-select
+              v-if="node.projectDeviceType ==='PSD'"
+              v-model="node.deviceCode"
+              :placeholder="$t('global.choose')"
+              filterable
+              clearable
+              size="mini"
+              @change="psdDeviceChange"
+            >
+              <el-option
+                v-for="item in doorList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+                :disabled="item.disabled"
+                style="margin-left: 10px"
+              />
+            </el-select>
+            <el-select
+              v-else-if="node.projectDeviceType ==='SWITCH'"
+              v-model="node.deviceCode"
+              :placeholder="$t('global.choose')"
+              filterable
+              clearable
+              size="mini"
+              @change="switchDeviceChange"
+            >
+              <el-option
+                v-for="item in switchList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+                :disabled="item.disabled"
+                style="margin-left: 10px"
+              />
+            </el-select>
+            <el-select
+              v-else-if="node.projectDeviceType ==='SIGNAL'"
+              v-model="node.deviceCode"
+              :placeholder="$t('global.choose')"
+              filterable
+              clearable
+              size="mini"
+              @change="signalDeviceChange"
+            >
+              <el-option
+                v-for="item in signalList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+                :disabled="item.disabled"
+                style="margin-left: 10px"
+              />
+            </el-select>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getRealDevicesNew, undateRealDevicesNew } from '@/api/chat';
+import { hasDoorStationList } from '@/api/jmap/map';
+import {getAllDeviceInProject} from '@/api/project';
+import { mapGetters } from 'vuex';
+import { getSessionStorage } from '@/utils/auth';
+export default {
+    name: 'RealDevice',
+    data() {
+        return {
+            dialogShow: false,
+            options: [],
+            loading: false,
+            doorList: [],
+            deviceRelList: [],
+            title: '设置真实设备连接'
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList',
+            'stationStandList',
+            'switchList',
+            'signalList'
+        ])
+    },
+    mounted() {
+    },
+    methods: {
+        handleDeviceTitle(node) {
+            const online = node.online ? '[在线]' : '[离线]';
+            return node.projectDeviceCode + online;
+        },
+        psdDeviceChange() {
+            const psdDevices = [];
+            this.options.forEach(item => {
+                if (item.projectDeviceType === 'PSD' || item.deviceCode) {
+                    psdDevices.push(item.deviceCode);
+                }
+            });
+            this.doorList.forEach(it => {
+                it.disabled = psdDevices.includes(it.code);
+            });
+        },
+        switchDeviceChange() {
+            const switchDevices = [];
+            this.options.forEach(item => {
+                if (item.projectDeviceType === 'SWITCH' || item.deviceCode) {
+                    switchDevices.push(item.deviceCode);
+                }
+            });
+            this.switchList.forEach(it => {
+                it.disabled = switchDevices.includes(it.code);
+            });
+        },
+        signalDeviceChange() {
+            const signalDevices = [];
+            this.options.forEach(item => {
+                if (item.projectDeviceType === 'SIGNAL' || item.deviceCode) {
+                    signalDevices.push(item.deviceCode);
+                }
+            });
+            this.signalList.forEach(it => {
+                it.disabled = signalDevices.includes(it.code);
+            });
+        },
+        doShow() {
+            this.dialogShow = true;
+            this.options = [];
+            const projectCode = getSessionStorage('project').toUpperCase();
+            this.getDoorList(this.$route.query.mapId, this.stationList);
+            getAllDeviceInProject({projectCode: projectCode}).then(resp => {
+                getRealDevicesNew(this.$route.query.group).then(res => {
+                    resp.data.forEach((it, index) => {
+                        this.options.push({
+                            deviceCode: '',
+                            id: null,
+                            online: it.online,
+                            projectDeviceId: it.id,
+                            projectDeviceCode: it.code,
+                            projectDeviceType: it.type,
+                            roomId: this.$route.query.roomId
+                        });
+                        res.data.forEach(item => {
+                            if (it.id == item.projectDeviceId) { // it.id为int item.projectDeviceId为string
+                                this.options[index].id = item.id;
+                                this.options[index].deviceCode = item.deviceCode;
+                            }
+                        });
+                    });
+                    this.psdDeviceChange();
+                    this.switchDeviceChange();
+                    this.signalDeviceChange();
+                });
+            }).catch(() => {
+                this.$message.error('获取真实设备失败！');
+            });
+        },
+        async getDoorList(mapId, stationList) {
+            const doorList = [];
+            hasDoorStationList(mapId).then(res =>{
+                stationList.forEach(item => {
+                    res.data.forEach(it =>{
+                        if (item.code === it.stationCode) {
+                            const direction = parseInt(it.doorLocationType) % 2 === 0 ? this.$t('trainRoom.uplinkPlatform') : this.$t('trainRoom.downlinkPlatform');
+                            doorList.push({code: it.code, name: item.name + direction});
+                        }
+                    });
+                });
+                this.doorList = doorList;
+            }).catch(() => {
+                this.$messageBox(this.$t('error.getScreenDoorsListFailed'));
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.options = [];
+            this.doorList = [];
+            this.deviceRelList = [];
+        },
+        doSave() {
+            const paramsList = [];
+            this.options.forEach(item => {
+                if (item.deviceCode || item.id) {
+                    paramsList.push(item);
+                }
+            });
+            undateRealDevicesNew(this.$route.query.group, paramsList).then(res => {
+                this.$message.success('更新真实设备连接关系成功！');
+                this.doClose();
+            }).catch(() => {
+                this.$message.error('更新真实设备连接关系失败！');
+            });
+        }
+    }
+};
+
+</script>
+
+<style scoped lang="scss">
+    /deep/ {
+        .el-dialog__body {
+            padding: 0px 20px;
+        }
+    }
+
+    .listBox {
+        margin: 0px;
+        max-height: 270px;
+        overflow-y: auto;
+        padding-inline-start: 0px;
+        width: 100%;
+
+        .listLi {
+            list-style: none;
+            height: 30px;
+            line-height: 30px;
+        }
+    }
+
+    .tipLable {
+        line-height: 33px;
+    }
+</style>
diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue
index 315381c4c..4b40228f0 100644
--- a/src/views/newMap/displayNew/designIndex.vue
+++ b/src/views/newMap/displayNew/designIndex.vue
@@ -234,6 +234,7 @@ export default {
     },
     async beforeDestroy() {
         await this.clearAllTimer();
+        await this.quit();
         await this.$store.dispatch('training/reset');
         await this.$store.dispatch('map/mapClear');
         EventBus.$off('clearCheckLogin');
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 36efab200..47b6027e0 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -240,6 +240,7 @@ export default {
     },
     async beforeDestroy() {
         await this.clearAllTimer();
+        await this.quit();
         await this.$store.dispatch('training/reset');
         await this.$store.dispatch('map/mapClear');
         EventBus.$off('clearCheckLogin');
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 6a3074fff..00414cc84 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -35,9 +35,9 @@ import { getGoodsTryUse } from '@/api/management/goods';
 import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
 import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
-import { runDiagramIsStart, quitScript } from '@/api/simulation';
-import { timeFormat } from '@/utils/date';
-import { getToken } from '@/utils/auth';
+import { runDiagramIsStart, runDiagramQuit, quitScript } from '@/api/simulation';
+// import { timeFormat } from '@/utils/date';
+// import { getToken } from '@/utils/auth';
 
 export default {
     name: 'MenuDemon',
@@ -189,7 +189,8 @@ export default {
                 this.$messageBox(this.$t('display.demon.exitTaskFail'));
             });
         },
-        back() {
+        async back() {
+            await runDiagramQuit(this.group);
             this.$store.dispatch('training/over').then(() => {
                 history.go(-1);
                 Notification.closeAll();
diff --git a/src/views/newMap/displayNew/menuExam.vue b/src/views/newMap/displayNew/menuExam.vue
index e872c4ee2..9d44b1690 100644
--- a/src/views/newMap/displayNew/menuExam.vue
+++ b/src/views/newMap/displayNew/menuExam.vue
@@ -139,7 +139,7 @@ export default {
             }).catch(error => {
                 // 如果时50009则表示考试已完成，不能再次进行y
                 if (error.code === 500009) {
-                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
+                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
                 } else {
                     this.$messageBox(this.$t('display.exam.refreshListError'));
                 }
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 8d5ba0cb3..4a4962bbf 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -34,7 +34,7 @@ import AddQuest from './demon/addQuest';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { getStationList, queryRunPlan } from '@/api/runplan';
-import { getEveryDayRunPlanData } from '@/api/simulation';
+import { getEveryDayRunPlanNew } from '@/api/simulation';
 import {getRpDetailByUserMapId} from '@/api/designPlatform';
 
 // 右上角操作
@@ -134,7 +134,7 @@ export default {
                                 }
 
                             } else {
-                                // getEveryDayRunPlanData(this.group).then(resp => {
+                                // getEveryDayRunPlanNew(this.group).then(resp => {
                                 //     this.$store.dispatch('runPlan/setPlanData', resp.data);
                                 //     this.viewDisabled = false;
                                 // }).catch(error => {
diff --git a/src/views/newMap/displayNew/tipExamList.vue b/src/views/newMap/displayNew/tipExamList.vue
index 16945466f..91f83f6b9 100644
--- a/src/views/newMap/displayNew/tipExamList.vue
+++ b/src/views/newMap/displayNew/tipExamList.vue
@@ -93,7 +93,7 @@ export default {
                 name: '',
                 remarks: ''
             },
-            isShrink: false,
+            isShrink: true,
             examName: '',
             courseModel: {
                 id: '',
@@ -197,13 +197,12 @@ export default {
             }).catch(error => {
                 // 如果时50009则表示考试已完成，不能再次进行y
                 if (error.code === 500009) {
-                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem } });
+                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
                 } else {
                     this.$messageBox(this.$t('display.exam.refreshListError'));
 
                 }
             });
-            this.shrink();
         },
         scanCommit() {
             this.clearScanCommit();
@@ -281,7 +280,7 @@ export default {
         submit() {
             this.$store.dispatch('exam/over').then(() => {
                 this.$store.dispatch('trainingList/clearTrainingList');
-                this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
+                this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
             });
         },
         shrink() {
diff --git a/src/views/newMap/displayNew/tipTrainingDetail.vue b/src/views/newMap/displayNew/tipTrainingDetail.vue
index 4ec3b1363..23edcf08d 100644
--- a/src/views/newMap/displayNew/tipTrainingDetail.vue
+++ b/src/views/newMap/displayNew/tipTrainingDetail.vue
@@ -117,8 +117,6 @@ export default {
                     this.$message.error(this.$t('display.training.getCourseInformationFail') + ':' + error.message);
                 });
             }
-
-            this.shrink();
         },
         jump(obj) {
             const query = {
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index 54c25ea0c..a57b10750 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -37,6 +37,7 @@ import ProgressBar from '@/views/components/progressBar/index';
 import { mapGetters } from 'vuex';
 import { TrainingMode } from '@/scripts/ConstDic';
 import { EventBus } from '@/scripts/event-bus';
+import Theme from '@/jmapNew/theme/factory';
 
 export default {
     name: 'JlmapVisual',
@@ -152,6 +153,7 @@ export default {
                 mouseWheelFlag = true;
             }
 
+            Vue.prototype.$theme = new Theme();
             Vue.prototype.$jlmap = new Jlmap({
                 dom: document.getElementById(this.canvasId),
                 config: {
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index f38d367b9..e94a7b2e2 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -49,6 +49,7 @@ export default {
             const lineCode = this.$jlmap.lineCode;
             if (lineCode) {
                 this.menus = this.$theme.loadMenuComponent(lineCode);
+                this.$store.commit('training/notifyGetCommandDefinition', lineCode);
             }
         }
     },
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index ad8b8ae25..e5f9f2c58 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -483,6 +483,8 @@ export default {
         },
         handleOtherSectionChange(model) { // 处理该区段改变导致的相关区段的变化
             const models = [];
+            const pointModel = [];
+            const slope1 = (this.oldPoint[this.oldPoint.length - 1].y - this.oldPoint[0].y) / (this.oldPoint[this.oldPoint.length - 1].x - this.oldPoint[0].x);
             this.sectionList.forEach(section => {
                 if (section.parentCode === model.code) {
                     const copySection = deepAssign({}, section);
@@ -491,16 +493,6 @@ export default {
                 } else if (model.code !== section.code && (section.type === '01' || section.type === '03')) {
                     const copySection = deepAssign({}, section);
                     let updataFlag = false;
-                    if (this.checkPointsCoincide(this.oldPoint[0], section.points[section.points.length - 1])) {
-                        copySection.points[copySection.points.length - 1].x = model.points[0].x;
-                        copySection.points[copySection.points.length - 1].y = model.points[0].y;
-                        updataFlag = true;
-                    }
-                    if (this.checkPointsCoincide(this.oldPoint[this.oldPoint.length - 1], section.points[0])) {
-                        copySection.points[0].x = model.points[model.points.length - 1].x;
-                        copySection.points[0].y = model.points[model.points.length - 1].y;
-                        updataFlag = true;
-                    }
                     if (model.leftSectionCode !== this.oldLeftSectionCode) {
                         if (copySection.code === model.leftSectionCode) {
                             copySection.rightSectionCode = model.code;
@@ -520,11 +512,35 @@ export default {
 
                         }
                     }
+                    if (this.checkPointsCoincide(this.oldPoint[0], section.points[section.points.length - 1])) {
+                        pointModel.push(copySection);
+                    }
+                    if (this.checkPointsCoincide(this.oldPoint[this.oldPoint.length - 1], section.points[0])) {
+                        pointModel.push(copySection);
+                    }
                     if (updataFlag) {
                         models.push(copySection);
                     }
                 }
             });
+            pointModel.forEach(item => {
+                const slope2 = (item.points[item.points.length - 1].y - item.points[0].y) / (item.points[item.points.length - 1].x - item.points[0].x);
+                // console.log(slope1, slope2, pointModel, '-----斜率----');
+                if (this.checkPointsCoincide(this.oldPoint[0], item.points[item.points.length - 1])) {
+                    if ((slope1 >= 0 && slope2 >= 0) || (slope1 <= 0 && slope2 <= 0)) {
+                        item.points[item.points.length - 1].x = model.points[0].x;
+                        item.points[item.points.length - 1].y = model.points[0].y;
+                    }
+                }
+                if (this.checkPointsCoincide(this.oldPoint[this.oldPoint.length - 1], item.points[0])) {
+                    if ((slope1 >= 0 && slope2 >= 0) || (slope1 <= 0 && slope2 <= 0)) {
+                        item.points[0].x = model.points[model.points.length - 1].x;
+                        item.points[0].y = model.points[model.points.length - 1].y;
+                    }
+                }
+                models.push(item);
+            });
+
             return models;
         },
         getSectionByCode(code) { // 根据sectionCode 获取深拷贝的section对象
diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue
index 47ad1c2a3..cdc282d36 100644
--- a/src/views/orderauthor/author/index.vue
+++ b/src/views/orderauthor/author/index.vue
@@ -104,7 +104,7 @@ export default {
                     },
                     {
                         title: this.$t('orderAuthor.founder'),
-                        prop: 'creatorUserName'
+                        prop: 'creatorNickname'
                     },
                     {
                         title: this.$t('orderAuthor.describtion'),
diff --git a/src/views/orderauthor/permission/index.vue b/src/views/orderauthor/permission/index.vue
index fc4ad1e85..f8f412623 100644
--- a/src/views/orderauthor/permission/index.vue
+++ b/src/views/orderauthor/permission/index.vue
@@ -74,7 +74,7 @@ export default {
                     },
                     {
                         title: this.$t('orderAuthor.founder'),
-                        prop: 'userName'
+                        prop: 'userNickname'
                     },
                     {
                         title: this.$t('orderAuthor.publicOrPrivate'),
diff --git a/src/views/orderauthor/rules/index.vue b/src/views/orderauthor/rules/index.vue
index 6f390b298..aa634c300 100644
--- a/src/views/orderauthor/rules/index.vue
+++ b/src/views/orderauthor/rules/index.vue
@@ -91,7 +91,7 @@ export default {
                     {
                         title: this.$t('permission.nickName'),
                         width: '200',
-                        prop: 'userNickName'
+                        prop: 'userNickname'
                     },
                     {
                         title: this.$t('permission.permissionName'),
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index fb824ae6b..e936838e5 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -21,7 +21,6 @@ export default {
             param: '',
             WhetherTypeList: [],
             // EffectiveTypeList: [],
-            PermissionTypeList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -50,13 +49,6 @@ export default {
                         width: '210',
                         prop: 'permissionName'
                     },
-                    {
-                        title: this.$t('permission.permissionType'),
-                        prop: 'permissionType',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.permissionType ? row.permissionType : '', this.PermissionTypeList, ['value', 'label']); },
-                        tagType: (row) => { return ''; }
-                    },
                     {
                         title: this.$t('permission.permissionUseType'),
                         prop: 'canDistribute',
@@ -129,35 +121,6 @@ export default {
         },
         loadInitData() {
             this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
-            this.$Dictionary.permissionType().then(list => {
-                if (LangStorage.getLang() === 'en') {
-                    list.forEach(elem => {
-                        elem.value = elem.code;
-                        switch (elem.value) {
-                        case '01':
-                            elem.label = 'Teaching system';
-                            break;
-                        case '02':
-                            elem.label = 'Exam system';
-                            break;
-                        case '03':
-                            elem.label = 'Simulation system';
-                            break;
-                        case '04':
-                            elem.label = elem.name;
-                            break;
-                        }
-                    });
-                    list.push({value: '', label: 'Omnipotent permission'});
-                } else {
-                    list.forEach(elem => {
-                        elem.value = elem.code;
-                        elem.label = elem.name;
-                    });
-                    list.push({value: '', label: '万能权限'});
-                }
-                this.PermissionTypeList = list;
-            });
         },
         formatterDate(row, porpInfo) {
             return row[porpInfo.property] ? row[porpInfo.property] : this.$t('global.perpetual');
diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue
index 3aef4c25c..5528e74b7 100644
--- a/src/views/publish/examRule/draft/examFrom.vue
+++ b/src/views/publish/examRule/draft/examFrom.vue
@@ -231,8 +231,12 @@ export default {
         submitForm() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                    this.form.startDate = this.getDate(this.form.startDate);
-                    this.form.endDate = this.getDate(this.form.endDate);
+                    if (this.form.startDate) {
+                        this.form.startDate = this.getDate(this.form.startDate);
+                    }
+                    if (this.form.endDate) {
+                        this.form.endDate = this.getDate(this.form.endDate);
+                    }
                     this.form['trial'] = this.trial;
                     this.$store.dispatch('exam/setCourseDetail', this.form);
                     this.$emit('definition', this.form);
diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue
index db422efe9..38ec37f30 100644
--- a/src/views/publish/examRule/index.vue
+++ b/src/views/publish/examRule/index.vue
@@ -72,7 +72,7 @@ export default {
                     },
                     {
                         title: this.$t('publish.creator'),
-                        prop: 'creatorName'
+                        prop: 'creatorNickname'
                     },
                     {
                         title: this.$t('global.isTry'),
diff --git a/src/views/system/commandDictionary/edit.vue b/src/views/system/commandDictionary/edit.vue
index 184bad629..06116e109 100644
--- a/src/views/system/commandDictionary/edit.vue
+++ b/src/views/system/commandDictionary/edit.vue
@@ -51,7 +51,7 @@ import { createCommand, editCommand, getCommandDetail } from '@/api/management/d
 import CommandEdit from './editParam';
 import { getLineCodeList } from '@/api/management/mapline';
 import EditCondition from './editCondition';
-import CommandEnum from '@/scripts/plugin/CommandEnum';
+import CommandEnum from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'DictionaryEdit',
diff --git a/src/views/system/commandDictionary/index.vue b/src/views/system/commandDictionary/index.vue
index 6215e2460..ec5a52116 100644
--- a/src/views/system/commandDictionary/index.vue
+++ b/src/views/system/commandDictionary/index.vue
@@ -9,7 +9,7 @@
 import { getCommandList, delCommand } from '@/api/management/dictionary';
 import { getLineCodeList } from '@/api/management/mapline';
 import ShowCondition from './showCondition';
-import CommandEnum from '@/scripts/plugin/CommandEnum';
+import CommandEnum from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'CommandDictionary',
diff --git a/src/views/system/deviceManage/add.vue b/src/views/system/deviceManage/add.vue
new file mode 100644
index 000000000..b94e6edf2
--- /dev/null
+++ b/src/views/system/deviceManage/add.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { createDevice, deviceIsExist} from '@/api/project';
+export default {
+    name: 'DeviceAdd',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                code: '',
+                type: '',
+                projectCode: ''
+            },
+            LessonList: [],
+            UserList: [],
+            UserLoading: false,
+            deviceTypeList:[{label: '道岔', value: 'SWITCH'}, {label: '信号机', value:'SIGNAL'}, {label: '屏蔽门', value: 'PSD'}],
+            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}],
+            gatewayList: []
+        };
+    },
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'code', label: '设备编码', type: 'text', required: true, placeholder: '请输入设备编码' },
+                    { prop: 'type', label: '设备类型', type: 'select', required: true, options: this.deviceTypeList, placeholder: '请选择设备类型' },
+                    { prop: 'projectCode', label: '所属项目', type: 'select', required: true, options: this.projectList, placeholder: '请选择设备所属项目'}
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                code: [
+                    { required: true, message: '请输入设备编码', trigger: 'blur' }
+                ],
+                type: [
+                    { required: true, message: '请选择设备类型', trigger: 'change' }
+                ],
+                projectCode: [
+                    { required: true, message: '请选择所属项目', trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return '创建项目设备';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        show(data) {
+            this.dialogVisible = true;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                const params = {
+                    code: this.formModel.code,
+                    type: this.formModel.type,
+                    projectCode: this.formModel.projectCode
+                };
+                deviceIsExist(params.projectCode, params.code).then(response => {
+                    if (!response.data) {
+                        createDevice(params).then(response => {
+                            self.$message.success('创建项目设备成功！');
+                            self.handleClose();
+                            self.$emit('reloadTable');
+                        }).catch(error => {
+                            self.$message.error(this.$t('error.addFailed') + error.message);
+                        });
+                    } else {
+                        self.$message.error('已存在该设备编号，请修改设备编号后创建！');
+                    }
+                });
+
+            });
+        },
+        handleClose(done) {
+            this.formModel = {
+                code: '',
+                type: '',
+                projectCode: ''
+            };
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue
new file mode 100644
index 000000000..df70113f4
--- /dev/null
+++ b/src/views/system/deviceManage/editConfig.vue
@@ -0,0 +1,405 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="60%" :before-close="handleClose" center :close-on-click-modal="false">
+    <data-form ref="datatop" :form="formTop" :form-model="formModel" :rules="topRules" />
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>输入配置:</span>
+          </div>
+          <div style="margin-top: 20px">
+            <data-form ref="dataleft" :form="formLeft" :form-model="formModel" :rules="leftRules" />
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>输出配置:</span>
+          </div>
+          <div style="margin-top: 20px">
+            <data-form ref="dataright" :form="formRight" :form-model="formModel" :rules="rightRules" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getDeviceDetail, setPsdConfig, setSignalConfig, setSwitchConfig } from '@/api/project';
+
+export default {
+    name: 'EditConfig',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {},
+            formLeft: {},
+            formRight: {},
+            leftRules: {},
+            rightRules: {},
+            gatewayList: [],
+            setDeviceConfigFunction: null,
+            data: null,
+            psdLeftValue: [
+                {label: '输入-是否关门位', value: 'i_c'},
+                {label: '输入-PSL关门按钮位', value: 'i_dc_b'},
+                {label: '输入-PSL开门按钮位', value: 'i_do_b'},
+                {label: '输入-互锁解除钥匙开关位', value: 'i_ir'},
+                {label: '输入-是否锁闭位', value: 'i_l'},
+                {label: '输入-PSL允许钥匙开关位', value: 'i_psl'},
+                {label: '输入-PSL试灯按钮位', value: 'i_ts_b'}
+            ],
+            psdRightValue: [
+                {label: '输出-关门位', value: 'o_c'},
+                {label: '输出-关门信号灯控制位', value: 'o_dc_s'},
+                {label: '输出-关门且锁闭信号灯控制位', value: 'o_dcl_s'},
+                {label: '输出-开门信号灯控制位', value: 'o_do_s'},
+                {label: '输出-互锁解除信号灯控制位', value: 'o_ir_s'},
+                {label: '输出-锁闭位', value: 'o_l'},
+                {label: '输出-开门位', value: 'o_o'},
+                {label: '输出-PSL信号灯控制位', value: 'o_psl_s'}
+            ],
+            switchLeftValue: [
+                {label: '输入-故障挤岔表示位', value: 'i_f'},
+                {label: '输入-定位表示位', value: 'i_n'},
+                {label: '输入-反位表示位', value: 'i_r'}
+            ],
+            switchRightValue: [
+                {label: '输出-设置故障控制位', value: 'o_f'},
+                {label: '输出-定操控制位', value: 'o_n'},
+                {label: '输出-反操控制位', value: 'o_r'}
+            ],
+            signalLeftValue: [
+                {label: '输入-故障表示位', value: 'i_f'},
+                {label: '输入-绿灯表示位', value: 'i_g'},
+                {label: '输入-红灯表示位', value: 'i_r'},
+                {label: '输入-黄灯表示位', value: 'i_y'}
+            ],
+            signalRightValue: [
+                {label: '输出-故障控制位', value: 'o_f'},
+                {label: '输出-绿灯控制位', value: 'o_g'},
+                {label: '输出-红灯控制位', value: 'o_r'},
+                {label: '输出-黄灯控制位', value: 'o_y'}
+            ]
+        };
+    },
+    computed: {
+        formTop() {
+            const form = {
+                labelWidth: '220px',
+                items: [
+                    { prop: 'gatewayCode', label: '网关编码:', type: 'select', required: true, options: this.gatewayList, placeholder: '请选择网关编码' }
+                ]
+            };
+            return form;
+        },
+        topRules() {
+            const crules = {
+                gatewayCode: [
+                    { required: true, message: '请输入网关编码', trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return '编辑设备配置';
+        }
+    },
+    methods: {
+        initForm(row) {
+            var validateDevice = (rule, value, callback) => {
+                const list = [];
+                rule.list.forEach(item=> {
+                    if (item.value !== rule.field && this.formModel[item.value] === value) {
+                        list.push(item.label);
+                    } else if (item.value === rule.field) {
+                        list.push(item.label);
+                    }
+                });
+                if (!value) {
+                    callback(new Error(rule.messageEmpty));
+                } else if (list.length > 1) {
+                    let repeatedValue = '';
+                    list.forEach((item, index) => {
+                        repeatedValue += item;
+                        if (index !== list.length - 1) {
+                            repeatedValue += '与';
+                        }
+                    });
+                    callback(new Error(repeatedValue + '位置重复，请调整！'));
+                } else {
+                    callback();
+                }
+            };
+            var validateAddr = (rule, value, callback) => {
+                if (!value) {
+                    callback(new Error(rule.messageEmpty));
+                } else if (this.formModel.i_addr === this.formModel.o_addr) {
+                    callback(new Error('输入网关字地址与输出网关字地址不能相同！'));
+                } else {
+                    callback();
+                }
+            };
+            switch (row.type) {
+            case 'PSD': {
+                this.setDeviceConfigFunction = setPsdConfig;
+                this.formLeft = {
+                    labelWidth: '220px',
+                    items: [
+                        { prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_c', label: '输入-是否关门位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_dc_b', label: '输入-PSL关门按钮位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_do_b', label: '输入-PSL开门按钮位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_ir', label: '输入-互锁解除钥匙开关位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_l', label: '输入-是否锁闭位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_psl', label: '输入-PSL允许钥匙开关位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_ts_b', label: '输入-PSL试灯按钮位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0}
+                    ]
+                };
+                this.leftRules = {
+                    i_addr: [
+                        { validator: validateAddr, messageEmpty: '请填写输入网关字地址', trigger: 'blur' }
+                    ],
+                    i_c: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-是否关门位', list: this.psdLeftValue, trigger: 'blur' }
+                    ],
+                    i_dc_b: [
+                        {validator: validateDevice, messageEmpty: '请填写输入-PSL关门按钮位', list: this.psdLeftValue, trigger: 'blur' }
+                    ],
+                    i_do_b: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-PSL开门按钮位', list: this.psdLeftValue, trigger: 'blur' }
+                    ],
+                    i_ir: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-互锁解除钥匙开关位', list: this.psdLeftValue, trigger: 'blur' }
+                    ],
+                    i_l: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-是否锁闭位', list: this.psdLeftValue, trigger: 'blur' }
+                    ],
+                    i_psl: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-PSL允许钥匙开关位', list: this.psdLeftValue, trigger: 'blur' }
+                    ],
+                    i_ts_b: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-PSL试灯按钮位', list: this.psdLeftValue, trigger: 'blur' }
+                    ]
+                };
+                this.formRight = {
+                    labelWidth: '220px',
+                    items: [
+                        { prop: 'o_addr', label: '输出网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_c', label: '输出-关门位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_dc_s', label: '输出-关门信号灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_dcl_s', label: '输出-关门且锁闭信号灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_do_s', label: '输出-开门信号灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_ir_s', label: '输出-互锁解除信号灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_l', label: '输出-锁闭位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_o', label: '输出-开门位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_psl_s', label: '输出-PSL信号灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0}
+                    ]
+                };
+                this.rightRules = {
+                    o_addr: [
+                        { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' }
+                    ],
+                    o_c: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-关门位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_dc_s: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-关门信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_dcl_s: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-关门且锁闭信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_do_s: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-开门信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_ir_s: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-互锁解除信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_l: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-锁闭位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_o: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-开门位', list: this.psdRightValue, trigger: 'blur' }
+                    ],
+                    o_psl_s: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-PSL信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
+                    ]
+                };
+                break;
+            }
+            case 'SIGNAL': {
+                this.setDeviceConfigFunction = setSignalConfig;
+                this.formTop.labelWidth = '150px';
+                this.formLeft = {
+                    labelWidth: '150px',
+                    items: [
+                        { prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_f', label: '输入-故障表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_g', label: '输入-绿灯表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_r', label: '输入-红灯表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_y', label: '输入-黄灯表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0}
+                    ]
+                };
+                this.leftRules = {
+                    i_addr: [
+                        { validator: validateAddr, messageEmpty: '请填写输入网关字地址', trigger: 'blur' }
+                    ],
+                    i_f: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-故障表示位', list: this.signalLeftValue, trigger: 'blur' }
+                    ],
+                    i_g: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-绿灯表示位', list: this.signalLeftValue, trigger: 'blur' }
+                    ],
+                    i_r: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-红灯表示位', list: this.signalLeftValue, trigger: 'blur' }
+                    ],
+                    i_y: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-黄灯表示位', list: this.signalLeftValue, trigger: 'blur' }
+                    ]
+                };
+                this.formRight = {
+                    labelWidth: '150px',
+                    size: 'mini',
+                    items: [
+                        { prop: 'o_addr', label: '输出网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_f', label: '输出-故障控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_g', label: '输出-绿灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_r', label: '输出-红灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_y', label: '输出-黄灯控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0}
+                    ]
+                };
+                this.rightRules = {
+                    o_addr: [
+                        { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' }
+                    ],
+                    o_f: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-故障控制位', list: this.signalRightValue, trigger: 'blur' }
+                    ],
+                    o_g: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-绿灯控制位', list: this.signalRightValue, trigger: 'blur' }
+                    ],
+                    o_r: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-红灯控制位', list: this.signalRightValue, trigger: 'blur' }
+                    ],
+                    o_y: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-黄灯控制位', list: this.signalRightValue, trigger: 'blur' }
+                    ]
+                };
+                break;
+            }
+            case 'SWITCH': {
+                this.setDeviceConfigFunction = setSwitchConfig;
+                this.formTop.labelWidth = '160px';
+                this.formLeft = {
+                    labelWidth: '160px',
+                    items: [
+                        { prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_f', label: '输入-故障挤岔表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_n', label: '输入-定位表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'i_r', label: '输入-反位表示位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0}
+                    ]
+                };
+                this.leftRules = {
+                    i_addr: [
+                        { validator: validateAddr, messageEmpty: '请填写输入网关字地址', trigger: 'blur' }
+                    ],
+                    i_f: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-故障挤岔表示位', list: this.switchLeftValue, trigger: 'blur' }
+                    ],
+                    i_n: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-定位表示位', list: this.switchLeftValue, trigger: 'blur' }
+                    ],
+                    i_r: [
+                        { validator: validateDevice, messageEmpty: '请填写输入-反位表示位', list: this.switchLeftValue, trigger: 'blur' }
+                    ]
+                };
+                this.formRight = {
+                    labelWidth: '160px',
+                    items: [
+                        { prop: 'o_addr', label: '输出网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_f', label: '输出-故障挤岔控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_n', label: '输出-定操控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0},
+                        { prop: 'o_r', label: '输出-反操控制位:', type: 'number', min: 1, max: 16, step: 1, precisionFlag: true, precision: 0}
+                    ]
+                };
+                this.rightRules = {
+                    o_addr: [
+                        { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' }
+                    ],
+                    o_f: [
+                        { validator: validateDevice, messageEmpty: '请填写输出-故障挤岔控制位', list: this.switchRightValue, trigger: 'blur' }
+                    ],
+                    o_n: [
+                        { validator: validateDevice, messageEmpty: '请填写输出-定操控制位', list: this.switchRightValue, trigger: 'blur' }
+                    ],
+                    o_r: [
+                        { validator: validateDevice, messageEmpty: '请填写输出-反操控制位', list: this.switchRightValue, trigger: 'blur' }
+                    ]
+                };
+                break;
+            }
+            }
+        },
+        initData(row) {
+            getDeviceDetail(row.id).then(resp => {
+                if (resp.data.config) {
+                    this.formModel = resp.data.config;
+                }
+            }).catch(()=> {
+                this.$message.error('获取项目设备详情失败！');
+            });
+            if (row.projectCode === 'XTY') {
+                this.gatewayList = [{lable:'XTY', value: 'XTY'}];
+            } else if (row.projectCode === 'GZB') {
+                this.gatewayList = [{label: 'GZB_1', value: 'GZB_1'}];
+            }
+        },
+        doShow(row) {
+            this.initData(row);
+            this.initForm(row);
+            this.dialogVisible = true;
+            this.data = row;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.datatop.validateForm(() => {
+                self.$refs.dataleft.validateForm(()=> {
+                    self.$refs.dataright.validateForm(()=> {
+                        this.setDeviceConfigFunction(this.data.id, this.formModel).then(response => {
+                            self.$message.success('设置设备网关映射配置成功');
+                            self.handleClose();
+                            self.$emit('reloadTable');
+                        }).catch(error => {
+                            self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
+                        });
+                    });
+                });
+            });
+        },
+        handleClose(done) {
+            this.formModel = {};
+            this.formLeft = {};
+            this.formRight = {};
+            this.leftRules = {};
+            this.rightRules = {};
+            this.gatewayList = [];
+            this.dialogVisible = false;
+            this.$refs.datatop.resetForm();
+            this.$refs.dataleft.resetForm();
+            this.$refs.dataright.resetForm();
+        }
+    }
+};
+</script>
diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue
new file mode 100644
index 000000000..24aa7c4d2
--- /dev/null
+++ b/src/views/system/deviceManage/index.vue
@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <deivce-add ref="add" @reloadTable="reloadTable" />
+    <edit-config ref="editConfig" @reloadTable="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { getProjectDeviceList, deleteProjectDevice } from '@/api/project';
+import DeivceAdd from './add';
+import EditConfig from './editConfig';
+export default {
+    name: 'DeviceManage',
+    components: {
+        DeivceAdd,
+        EditConfig
+    },
+    data() {
+        return {
+            examResultList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            deviceTypeList:[{label: '道岔', value: 'SWITCH'}, {label: '信号机', value:'SIGNAL'}, {label: '屏蔽门', value: 'PSD'}],
+            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}],
+            queryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    projectCode: {
+                        type: 'select',
+                        label: '项目编码',
+                        config: {
+                            data: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}]
+                        }
+                    },
+                    code: {
+                        type: 'text',
+                        label: '设备编号'
+                    },
+                    type: {
+                        type: 'select',
+                        label: '设备类型',
+                        config: {
+                            data: [{label: '道岔', value: 'SWITCH'}, {label: '信号机', value:'SIGNAL'}, {label: '屏蔽门', value: 'PSD'}]
+                        }
+                    }
+                }
+
+            },
+            queryList: {
+                query: getProjectDeviceList,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '设备编号',
+                        prop: 'code'
+                    },
+                    {
+                        title: '项目名称',
+                        prop: 'projectCode',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.projectCode, this.projectList, ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '设备类型',
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.type, this.deviceTypeList, ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    // {
+                    //     title: this.$t('system.trainingUseTime'),
+                    //     prop: 'duration',
+                    //     type: 'tag',
+                    //     columnValue: (row) => { return this.computation(row.duration); },
+                    //     tagType: (row) => { return 'success'; }
+                    // },
+                    // {
+                    //     title: '网关唯一编码',
+                    //     prop: 'config',
+                    //     columnValue: (row) => { return row.config; }
+                    // },
+                    {
+                        title: '创建时间',
+                        prop: 'createTime',
+                        type: 'tag',
+                        columnValue: (row) => { return this.handleTime(row.createTime); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    // {
+                    //     title: '创建人',
+                    //     prop: 'creator'
+                    // },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: '编辑配置',
+                                handleClick: this.editConfig
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createProjectDevice}
+                ]
+            },
+            currentModel: {}
+        };
+    },
+    created() {
+    },
+    methods: {
+        createProjectDevice() {
+            this.$refs.add.show();
+        },
+        computation(fieldValue, type) {
+            let list = [];
+            if (type === 'projectType') {
+                list = this.projectList;
+            } else if ( type === 'deviceType' ) {
+                list = this.deviceTypeList;
+            }
+            let value = '';
+            list.forEach((elem) => {
+                elem.label = fieldValue;
+                value = elem.value;
+            });
+            console.log(value, fieldValue, type);
+            return value;
+        },
+        handleTime(time) {
+            const timeList = time.split('T');
+            let newTime = '';
+            timeList.forEach(elem => {
+                newTime += elem;
+            });
+            return newTime;
+        },
+        // 删除
+        handleDelete(index, row) {
+            this.$confirm('此操作将删除该项目设备！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteProjectDevice(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        editConfig(index, row) {
+            this.$refs.editConfig.doShow(row);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
diff --git a/src/views/system/userExam/index.vue b/src/views/system/userExam/index.vue
index 9274c1fe9..c1a5f3ac2 100644
--- a/src/views/system/userExam/index.vue
+++ b/src/views/system/userExam/index.vue
@@ -10,129 +10,129 @@ import { getPublishExam, delPublishExam } from '@/api/management/userexam';
 import PublishExamEdit from './edit';
 
 export default {
-	name: 'PublishExam',
-	components: {
-		PublishExamEdit
-	},
-	data() {
-		return {
-			examResultList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '150px',
-				reset: true,
-				queryObject: {
-					examName: {
-						type: 'text',
-						label: this.$t('system.examName')
-					},
-					userName: {
-						type: 'text',
-						label: this.$t('system.examUser')
-					},
-					result: {
-						type: 'select',
-						label: this.$t('system.examResult'),
-						config: {
-							data: this.$ConstSelect.examResultList
-						}
-					}
-				}
+    name: 'PublishExam',
+    components: {
+        PublishExamEdit
+    },
+    data() {
+        return {
+            examResultList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '150px',
+                reset: true,
+                queryObject: {
+                    examName: {
+                        type: 'text',
+                        label: this.$t('system.examName')
+                    },
+                    userName: {
+                        type: 'text',
+                        label: this.$t('system.examUser')
+                    },
+                    result: {
+                        type: 'select',
+                        label: this.$t('system.examResult'),
+                        config: {
+                            data: this.$ConstSelect.examResultList
+                        }
+                    }
+                }
 
-			},
-			queryList: {
-				query: getPublishExam,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('system.examName'),
-						prop: 'examName'
-					},
-					{
-						title: this.$t('system.examResult'),
-						prop: 'result',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); },
-						tagType: (row) => {
-							switch (row.result) {
-							case '01': return 'warning';
-							case '02': return 'success';
-							case '03': return 'danger';
-							case '04': return 'danger';
-							}
-						}
-					},
-					{
-						title: this.$t('system.examScore'),
-						prop: 'score'
-					},
-					{
-						title: this.$t('system.examUser'),
-						prop: 'userName'
-					},
-					{
-						title: this.$t('global.mobile'),
-						prop: 'userMobile'
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '250',
-						buttons: [
-							{
-								name: this.$t('global.edit'),
-								handleClick: this.edit
-							},
-							{
-								name: this.$t('global.delete'),
-								handleClick: this.handleDelete,
-								type: 'danger'
-							}
-						]
-					}
-				]
-			},
+            },
+            queryList: {
+                query: getPublishExam,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('system.examName'),
+                        prop: 'examName'
+                    },
+                    {
+                        title: this.$t('system.examResult'),
+                        prop: 'result',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); },
+                        tagType: (row) => {
+                            switch (row.result) {
+                            case '01': return 'warning';
+                            case '02': return 'success';
+                            case '03': return 'danger';
+                            case '04': return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('system.examScore'),
+                        prop: 'score'
+                    },
+                    {
+                        title: this.$t('system.examUser'),
+                        prop: 'userNickname'
+                    },
+                    {
+                        title: this.$t('global.mobile'),
+                        prop: 'userMobile'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: this.$t('global.edit'),
+                                handleClick: this.edit
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	created() {
-		this.loadInitData();
-	},
-	methods: {
-		loadInitData() {
+            currentModel: {}
+        };
+    },
+    created() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
 
-		},
+        },
 
-		// 编辑
-		edit(index, row) {
-			this.$refs.edit.show(row);
-		},
+        // 编辑
+        edit(index, row) {
+            this.$refs.edit.show(row);
+        },
 
-		// 删除
-		handleDelete(index, row) {
-			this.$confirm(this.$t('system.wellDelExamResult'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				delPublishExam(row.id).then(response => {
-					this.$message.success(this.$t('system.deleteSuccess'));
-					this.reloadTable();
-				}).catch(() => {
-					this.reloadTable();
-					this.$messageBox(this.$t('error.deleteFailed'));
-				});
-			});
-		},
+        // 删除
+        handleDelete(index, row) {
+            this.$confirm(this.$t('system.wellDelExamResult'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                delPublishExam(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
 
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
diff --git a/src/views/system/userSimulation/index.vue b/src/views/system/userSimulation/index.vue
index a523ebaf1..7ecfac0a5 100644
--- a/src/views/system/userSimulation/index.vue
+++ b/src/views/system/userSimulation/index.vue
@@ -46,7 +46,7 @@ export default {
                 columns: [
                     {
                         title: this.$t('system.userName'),
-                        prop: 'userName'
+                        prop: 'userNickname'
                     },
                     {
                         title: this.$t('global.mobile'),
diff --git a/src/views/system/userTraining/index.vue b/src/views/system/userTraining/index.vue
index 727a9443b..b5815f11d 100644
--- a/src/views/system/userTraining/index.vue
+++ b/src/views/system/userTraining/index.vue
@@ -45,7 +45,7 @@ export default {
                 columns: [
                     {
                         title: this.$t('system.userName'),
-                        prop: 'userName'
+                        prop: 'userNickname'
                     },
                     {
                         title: this.$t('global.mobile'),
diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue
index 1be30c355..89d0b41b7 100644
--- a/src/views/trainRoom/e-roles.vue
+++ b/src/views/trainRoom/e-roles.vue
@@ -75,6 +75,7 @@
             @delUser="handleDelUser"
           />
           <e-device
+            v-if="isXtyProject"
             class="role"
             title-i18n="trainRoom.realDevice"
             device-type="StationStand"
@@ -113,6 +114,7 @@ import AddPerson from './add-person';
 import QrCode from '@/components/QrCode';
 import { getJoinTrainCode, startJointTraining, deljointTrainRoom, putJointTrainingExit, putJointTrainingSimulation, putUserRoles, setRealDevice, delRealDevice } from '@/api/chat';
 import { getPlcGateway } from '@/api/simulation';
+import { getSessionStorage } from '@/utils/auth';
 
 export default {
     components : {
@@ -163,6 +165,9 @@ export default {
         rolesHeight() {
             return this.height - 100;
         },
+        isXtyProject() {
+            return getSessionStorage('project').endsWith('xty');
+        },
         group() {
             return this.$route.query.group;
         },
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index 650bbfc70..60df7bebd 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -246,7 +246,7 @@ export default {
             const room = this.room;
             await putJointTrainingSimulationEntrance(room.group);
             const rest = await getPublishMapInfo(room.mapId);
-            const query = { lineCode: rest.data.lineCode, mapId: room.mapId, group: room.group };
+            const query = { lineCode: rest.data.lineCode, mapId: room.mapId, group: room.group, roomId: room.id };
             this.$router.replace({ path: `/jointTraining`, query: query });
             // 清空房间信息
             this.$store.dispatch('socket/setJointRoomInfo');