Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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
+    });
+}

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}`,

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'
+    });
+}

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
+    });
+}

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
+    });
+}

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"

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',

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'
 };

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',

src/i18n/langs/zh/exam.js

@@ -18,7 +18,7 @@ export default {
     courseName: '课程名称',
     permissionsDetails: '权限详情',
     buy: '购买',
-    distributePermission: '权限分发(考试)',
+    distributePermission: '权限分发',
     viewCoursePapers: '查看课程试卷',
     nameOfTestPaper: '试卷名称',
     examStartTime: '考试时间',

src/i18n/langs/zh/router.js

@@ -72,5 +72,6 @@ export default {
     subsystemGeneration: '子系统生成',
     newsBulletin: '消息公告',
     commandDictionary: '指令字典',
-    configLine: '线路管理'
+    configLine: '线路管理',
+    deviceManage: '设备管理'
 };

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: '返回课程列表'
 };

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];
                     }
                 });

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>
+</style>

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>
+</style>

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>
+</style>

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmSignalUnlock.vue

@@ -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>

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>
+</style>

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>
+</style>

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>

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>
+</style>

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>

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>

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>

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>

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>

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>

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>
+};
+</script>

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>

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>
+</style>

src/jmapNew/theme/chengdu_03/menus/dialog/stationCmdControl.vue

@@ -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>

src/jmapNew/theme/chengdu_03/menus/dialog/switchCmdControl.vue

@@ -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>

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>

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();
                 }

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();
                 }

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();
                 }

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();
 				}

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();
                 }

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();
                     }

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();
                 }

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>
+</style>

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();
                 }

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>
+</style>

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>
 

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>

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);
             }

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>
+</script>

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>
+</style>

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>
+</style>

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>
+</style>

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>
+</style>

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>
+</style>

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>
+</style>

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>
+</style>

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>
+</style>

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);

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>
+</style>

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>
+</style>

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>
+</script>

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();

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();

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();

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>

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>

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>

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>

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>

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>

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>
 

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>

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>
+</style>

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>
+</style>

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>
+</script>

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: [] };

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',

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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) {

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
             };
 

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: '' });

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
             };
 

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();
                 }

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };
 

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
             };