diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 4bcbd7bdc..2eff0fbc2 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -1,7 +1,6 @@
 /*
 *	信号机
 */
-
 import ESigPost from './ESigPost';
 import ESigLamp from './ESigLamp';
 import ESigAuto from './ESigAuto';
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
index 97c59122f..3e3e986fb 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
@@ -36,13 +36,13 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
+// import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteControl',
@@ -127,64 +127,35 @@ export default {
         },
         // 取消列车进路
         cancelTrainRoute() {
-            this.cancelTrainRouteFunc();
-        },
-        cancelTrainRouteFunc() {
-            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(error => {
+            commitOperate(menuOperate.Signal.cancelTrainRoute, {}, 2).then((data)=>{
+                this.doClose();
+            }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 信号关灯
         signalClose() {
-            const operate = {
-                operation: OperationEvent.Signal.signalClose.menu.operation,
-                messages: [`信号关灯: ${this.signalName}`]
-            };
-
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            commitOperate(menuOperate.Signal.signalClose, {}, 1).then((data)=>{
+                this.doClose();
+                this.$refs.confirmControl.doShow(data.operate);
+            }).catch(() => {
                 this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.confirmControl.doShow(operate);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.doClose();
             });
         },
         // 信号重开
         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/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(error => {
+            commitOperate(menuOperate.Signal.reopenSignal, {}, 2).then((data)=>{
+                this.doClose();
+            }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 取消
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
index 849320b3e..e3556db61 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
@@ -1,53 +1,69 @@
 <template>
-    <div>
-        <el-dialog class="beijing-01__systerm route-detail" :title="title" :visible.sync="show" width="340px"
-            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-            <el-row class="header">
-                <el-col :span="10"><span>车站</span></el-col>
-                <el-col :span="10" :offset="2"><span>始端信号机</span></el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="10">
-                    <el-input v-model="stationName" size="small" disabled></el-input>
-                </el-col>
-                <el-col :span="10" :offset="2">
-                    <el-input v-model="signalName" size="small" disabled></el-input>
-                </el-col>
-            </el-row>
-            <div class="table">
-                <span>进路列表</span>
-                <el-table ref="tempTable" :data="tempData" border style="width: 100%" size="mini" highlight-current-row
-                    :height="140">
-                    <el-table-column label="进路">
-                        <template slot-scope="scope">
-                            <span>{{scope.row.name}}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="status" label="控制状态" width="180">
-                        <template slot-scope="scope">
-                            {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </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>
-    </div>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="beijing-01__systerm route-detail"
+      :title="title"
+      :visible.sync="show"
+      width="340px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-row class="header">
+        <el-col :span="10"><span>车站</span></el-col>
+        <el-col :span="10" :offset="2"><span>始端信号机</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-input v-model="stationName" size="small" disabled />
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-input v-model="signalName" size="small" disabled />
+        </el-col>
+      </el-row>
+      <div class="table">
+        <span>进路列表</span>
+        <el-table
+          ref="tempTable"
+          :data="tempData"
+          border
+          style="width: 100%"
+          size="mini"
+          highlight-current-row
+          :height="140"
+        >
+          <el-table-column label="进路">
+            <template slot-scope="scope">
+              <span>{{ scope.row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="控制状态" width="180">
+            <template slot-scope="scope">
+              {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </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>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
-import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
     name: 'RouteDetail',
@@ -61,8 +77,8 @@ export default {
             selected: null,
             tempData: [],
             stationName: '',
-            signalName: '',
-        }
+            signalName: ''
+        };
     },
     computed: {
         ...mapGetters('map', [
@@ -78,24 +94,24 @@ export default {
             return this.dialogShow ? OperationEvent.Signal.detail.menu.domId : '';
         },
         title() {
-            return '查询进路状态'
+            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
-                    let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
                     if (station) {
                         this.stationName = station.name;
                     }
@@ -115,11 +131,10 @@ export default {
             mouseCancelState(this.selected);
         },
         commit() {
-            let operate = {
+            const operate = {
                 send: true,
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Signal.detail.menu.operation
-            }
+            };
 
             this.loading = true;
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -134,10 +149,9 @@ export default {
             });
         },
         cancel() {
-            let operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.cancel.menu.operation,
-            }
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -148,5 +162,5 @@ export default {
             });
         }
     }
-}
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
index 5422480fa..d4d6e3abb 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
@@ -80,7 +80,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 
 export default {
     name: 'RouteHandControl',
@@ -278,47 +278,24 @@ export default {
         },
         // 进路交人工控
         humanControl() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Signal.humanControl.menu.operation,
-                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
-                param:{
-                    routeCodeList:this.selection
-                }
-            };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
+            commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 进路交自动控
         atsAutoControl() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
-                cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
-                param:{
-                    routeCodeList:this.selection
-                }
-            };
-
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
+            commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         cancel() {
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
index c192bb5b6..acf3dee42 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
@@ -61,11 +61,11 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import { deepAssign } from '@/utils/index';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 
 export default {
     name: 'RouteSelection',
@@ -210,7 +210,6 @@ export default {
 
                     // 设置选中指令
                     const operate = {
-                        type: MapDeviceType.Signal.type,
                         operation: OperationEvent.Signal.arrangementRoute.choose.operation,
                         val: row.code
                     };
@@ -225,34 +224,20 @@ export default {
         },
         commit() {
             if (this.row && this.row.canSetting) {
-                const operate = {
-                    over: true,
-                    operation: OperationEvent.Signal.arrangementRoute.menu.operation,
-                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
-                    param: {
-                        routeCode: this.row.code
-                    }
-                };
-
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
+                commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:this.row.code}, 2).then((data)=>{
+                    this.doClose();
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(operate, error.message);
+                    this.$refs.noticeInfo.doShow({}, error.message);
                 });
             }
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Signal.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue
index 1cfc2f0b5..a4672738c 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue
@@ -45,10 +45,11 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 
 export default {
     name: 'SectionControl',
@@ -75,12 +76,14 @@ 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.split.menu.operation) {
+                this.radio = '2';
                 return '区段控制';
             } else if (this.operation == OperationEvent.Section.active.menu.operation) {
+                this.radio = '1';
                 return '区段控制';
             } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
                 return '区故解';
@@ -157,48 +160,24 @@ export default {
         },
         // 区故解
         faultUnlock() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Section.fault.menu.operation,
-                cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-            };
-            this.sendCommand(operate);
+            this.sendCommand(menuOperate.Section.fault);
         },
         // 计轴预复位
         axlePreReset() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Section.axlePreReset.menu.operation,
-                cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-            };
-            this.sendCommand(operate);
+            this.sendCommand(menuOperate.Section.axlePreReset);
         },
         // 轨道区段切除
         split() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Section.split.menu.operation,
-                cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-            };
-
-            this.sendCommand(operate);
+            this.sendCommand(menuOperate.Section.split);
         },
         // 轨道区段激活
         active() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Section.active.menu.operation,
-                cmdType: CMD.Section.CMD_SECTION_ACTIVE
-            };
-
-            this.sendCommand(operate);
+            this.sendCommand(menuOperate.Section.active);
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Section.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
@@ -207,18 +186,14 @@ export default {
                 this.doClose();
             });
         },
-
         sendCommand(operate) { // 发送指令
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
+            commitOperate(operate, {}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         }
     }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue
index 18bf1c290..27d62b79e 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue
@@ -1,78 +1,104 @@
 <template>
-    <div>
-        <el-dialog class="beijing-01__systerm section-cmd-speed" :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="6">
-                            <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="6">
-                            <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="6">
-                            <el-form-item :label="nameLabel" label-width="80px">
-                                <el-input v-model="name" size="small" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item label="限速值" label-width="80px">
-                                <el-select v-model="speed" :id="domIdChoose" size="small" :disabled="spdDisabled"
-                                    @change="speedSelectChange">
-                                    <el-option v-for="item in speedList" :key="item.value" :label="item.name"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-            </div>
-            <el-table class="table" ref="table" :data="tableData" 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>
-        <confirm-control-speed ref="confirmControlSpeed" @setOperate="getOperate"></confirm-control-speed>
-    </div>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="beijing-01__systerm section-cmd-speed"
+      :title="title"
+      :visible.sync="show"
+      width="800px"
+      :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">命令信息</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="6">
+              <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-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="车站名称" label-width="80px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="nameLabel" label-width="80px">
+                <el-input v-model="name" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="限速值" label-width="80px">
+                <el-select
+                  :id="domIdChoose"
+                  v-model="speed"
+                  size="small"
+                  :disabled="spdDisabled"
+                  @change="speedSelectChange"
+                >
+                  <el-option
+                    v-for="item in speedList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </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-column prop="order" :width="50" label="序号" />
+        <el-table-column prop="date" :width="160" label="时间" />
+        <el-table-column prop="context" :width="180" label="执行过程" />
+        <el-table-column prop="result" label="执行结果" />
+      </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>
+    <confirm-control-speed ref="confirmControlSpeed" @setOperate="getOperate" />
+  </div>
 </template>
 <script>
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -107,7 +133,7 @@ export default {
             stationName: '',
             name: '',
             speed: ''
-        }
+        };
     },
     computed: {
         nameLabel() {
@@ -117,14 +143,14 @@ export default {
             } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation ||
                 this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
                 return '道岔名称';
-            }else{
+            } else {
                 return '';
             }
         },
         speedList() {
-            let list = [{ name: '不限速', value: '-1' }];
+            const list = [{ name: '不限速', value: '-1' }];
             for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
-                let speed = String(i * this.speedSpace);
+                const speed = String(i * this.speedSpace);
                 list.push({ name: speed, value: speed });
             }
             return list;
@@ -134,8 +160,8 @@ export default {
                 { code: OperationEvent.Section.setSpeed.menu.operation, name: '区段设置限速' },
                 { code: OperationEvent.Section.cancelSpeed.menu.operation, name: '区段取消限速' },
                 { code: OperationEvent.Switch.setSpeed.menu.operation, name: '区段设置限速' },
-                { code: OperationEvent.Switch.cancelSpeed.menu.operation, name: '区段取消限速' },
-            ]
+                { code: OperationEvent.Switch.cancelSpeed.menu.operation, name: '区段取消限速' }
+            ];
         },
         title() {
             if (this.dialogShow) {
@@ -264,9 +290,9 @@ export default {
             }
         },
         isCancelSpeed() {
-            return this.operation == OperationEvent.Section.cancelSpeed.menu.operation
-                || this.operation == OperationEvent.Switch.cancelSpeed.menu.operation
-        },
+            return this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
+                this.operation == OperationEvent.Switch.cancelSpeed.menu.operation;
+        }
     },
     watch: {
         cmdDisabled: {
@@ -294,7 +320,7 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-        })
+        });
         this.timer = setInterval(() => {
             if (!this.$store.state.menuOperation.break) {
                 if (this.timeCountCommand > 0) {
@@ -310,7 +336,7 @@ export default {
                     this.timeCountConfirm = -1;
                 }
             }
-        }, 1000)
+        }, 1000);
     },
     beforeDestroy() {
         clearInterval(this.timer);
@@ -326,20 +352,20 @@ export default {
                         operate.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
                         if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
                             if (selected.type === '02') {
-                                let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                                const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
                                 if (section) {
-                                    this.name += section.name
+                                    this.name += section.name;
                                 }
                             }
-                            this.name += selected.name
+                            this.name += selected.name;
                         }
                     } else if (operate.operation == OperationEvent.Switch.setSpeed.menu.operation) {
                         if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                            this.name = selected.name
+                            this.name = selected.name;
                         }
                     }
 
-                    let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
                     if (station) {
                         this.stationName = station.name;
                     }
@@ -373,17 +399,17 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         speedSelectChange(val) {
-            let operate = {
+            const operate = {
                 type: this.type,
-                val: val,
-            }
+                val: val
+            };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.choose.operation
+                operate.operation = OperationEvent.Section.setSpeed.choose.operation;
             } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
                 /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.choose.operation
+                operate.operation = OperationEvent.Switch.setSpeed.choose.operation;
             }
 
             this.setMessage('请点击“下达”按钮，下达命令！');
@@ -392,12 +418,12 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
                 }
-            })
+            });
         },
         command() {
-            let operate = {
-                type: this.type,
-            }
+            const operate = {
+                type: this.type
+            };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
@@ -429,12 +455,12 @@ export default {
                 }
             }).catch(() => {
                 this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
-            })
+            });
         },
         confirm1() {
-            let operate = {
-                type: this.type,
-            }
+            const operate = {
+                type: this.type
+            };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
@@ -464,17 +490,17 @@ export default {
                 }
             }).catch(() => {
                 this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
-            })
+            });
         },
         confirm2() {
-            let operate = {
+            const operate = {
                 over:true,
                 type: this.type,
                 val: this.speed,
                 param: {
                     speedLimitValue: `${this.speed}`
                 }
-            }
+            };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
@@ -509,12 +535,12 @@ export default {
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
                 this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
-            })
+            });
         },
         stop() {
-            let operate = {
-                type: this.type,
-            }
+            const operate = {
+                type: this.type
+            };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
                 /** 区段设置限速*/
@@ -541,13 +567,13 @@ export default {
                 }
             }).catch(() => {
                 this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
-            })
+            });
         },
         close() {
-            let operate = {
+            const operate = {
                 type: this.type,
-                operation: OperationEvent.Command.close.menu.operation,
-            }
+                operation: OperationEvent.Command.close.menu.operation
+            };
             this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' });
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -581,8 +607,8 @@ export default {
                         elem[prop] = param[prop];
                     }
                 }
-            })
+            });
         }
     }
-}
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
index b9e760881..12907020b 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
@@ -1,41 +1,58 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-run-level" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="font-size: 16px; margin-bottom: 5px;">变通节点</div>
-        <div style="margin-bottom: 5px;">
-            <el-input v-model="stationName" size="mini" disabled></el-input>
-        </div>
-        <div style="font-size: 16px; margin-bottom: 5px;">当前变通策略</div>
-        <div style="margin-bottom: 5px;">
-            <el-input v-model="stationStrategy" size="mini" disabled></el-input>
-        </div>
-        <div style="font-size: 16px; margin-bottom: 5px;">变通策略选项</div>
-        <el-table ref="table" :data="strategyList" border :cell-style="tableStyle" style="width: 100%; margin-top:10px"
-            size="mini" @row-click="clickEvent" height="120" highlight-current-row :show-header="false">
-            <el-table-column prop="label" :id="domIdChoose" style="margin-left:30px">
-            </el-table-column>
-        </el-table>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
-                    确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm stand-run-level"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="font-size: 16px; margin-bottom: 5px;">变通节点</div>
+    <div style="margin-bottom: 5px;">
+      <el-input v-model="stationName" size="mini" disabled />
+    </div>
+    <div style="font-size: 16px; margin-bottom: 5px;">当前变通策略</div>
+    <div style="margin-bottom: 5px;">
+      <el-input v-model="stationStrategy" size="mini" disabled />
+    </div>
+    <div style="font-size: 16px; margin-bottom: 5px;">变通策略选项</div>
+    <el-table
+      ref="table"
+      :data="strategyList"
+      border
+      :cell-style="tableStyle"
+      style="width: 100%; margin-top:10px"
+      size="mini"
+      height="120"
+      highlight-current-row
+      :show-header="false"
+      @row-click="clickEvent"
+    >
+      <el-table-column :id="domIdChoose" prop="label" style="margin-left:30px" />
+    </el-table>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
+          确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
 import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -65,7 +82,7 @@ export default {
                 {
                     value: '04',
                     label: '关闭'
-                },
+                }
             ],
             stationName: '',
             stationStrategy: '',
@@ -73,13 +90,13 @@ export default {
             isConfirm: false,
             strategy: '',
             tableStyle: {
-                'border-bottom': 'none',
+                'border-bottom': 'none'
             }
-        }
+        };
     },
     computed: {
         ...mapGetters('map', [
-            'stationList',
+            'stationList'
         ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -100,17 +117,17 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-        })
+        });
     },
     methods: {
         loadInitData(selected, opts) {
             this.tempData = [];
-            let stationList = [...this.stationList];
-            const station = this.stationList.find(n => n.code == selected.stationCode)
+            const stationList = [...this.stationList];
+            const station = this.stationList.find(n => n.code == selected.stationCode);
             this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy });
             this.$nextTick(() => {
                 this.$refs.table.setCurrentRow(null);
-            })
+            });
         },
         doShow(operate, selected, opts) {
             this.selected = selected;
@@ -125,7 +142,7 @@ export default {
                             if (item.value == opts.reentryStrategy) {
                                 this.stationStrategy = item.label;
                             }
-                        })
+                        });
                     }
                 }
                 this.loadInitData(selected, opts);
@@ -138,7 +155,7 @@ export default {
         },
         clickEvent(row, column, event) {
             const operate = {
-                operation: OperationEvent.StationStand.setBackStrategy.choose.operation,
+                operation: OperationEvent.StationStand.setBackStrategy.choose.operation
             };
             this.strategy = row.value;
             this.isConfirm = true;
@@ -146,7 +163,7 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
-            })
+            });
         },
         checkTableDataSelction(data) {
             const selection = [];
@@ -155,10 +172,10 @@ export default {
                     if (row.check && !row.disabled) {
                         selection.push(row);
                     }
-                })
+                });
             }
 
-            this.disabledSend = selection.length ? false : true;
+            this.disabledSend = !selection.length;
             if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
                 this.selection = selection;
             }
@@ -171,25 +188,13 @@ export default {
         },
         commit() {
             if (this.isConfirm) {
-                const operate = {
-                    over:true,
-                    operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
-                    cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
-                    param:{
-                        standReentryStrategy: this.strategy
-                    }
-                };
-
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
+                commitOperate(menuOperate.StationStand.setBackStrategy, {standReentryStrategy: this.strategy}, 2).then((data)=>{
+                    this.doClose();
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(operate, [error.message]);
+                    this.$refs.noticeInfo.doShow({}, error.message);
                 });
             } else {
                 this.doClose();
@@ -197,7 +202,7 @@ export default {
         },
         cancel() {
             const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation,
+                operation: OperationEvent.Command.cancel.menu.operation
             };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -209,5 +214,5 @@ export default {
             });
         }
     }
-}
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
index c085f2079..cf415927c 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
@@ -110,10 +110,11 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 
 export default {
     name: 'StandDetainTrain',
@@ -142,7 +143,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },
         upRadioId() {
             return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.upSelect.domId : '';
@@ -252,65 +253,25 @@ export default {
         },
         // 设置扣车
         setDetainTrain() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
+            this.sendCommand(menuOperate.StationStand.setDetainTrain);
         },
         // 取消扣车
         cancelDetainTrain() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
+            this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
         },
 
         // 提前发车
         earlyDeparture() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
-            };
-
+            this.sendCommand(menuOperate.StationStand.earlyDeparture);
+        },
+        sendCommand(operate) { // 发送指令
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
+            commitOperate(operate, {}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         cancel() {
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
index 262ffda89..f0176fb40 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
@@ -103,9 +103,10 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '../utils/menuItemStatus';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
@@ -163,7 +164,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() {
             return '跳停';
@@ -243,65 +244,29 @@ export default {
         },
         // 设置跳停
         setJumpStop() {
-            // let val = this.model.val1;
-            // if (this.model.val2) {
-            //     val = this.model.val2 + '::' + this.model.tripNumber;
-            // }
-            const operate = {
-                over: true,
-                cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-                param:{
-                    trainGroupNumber:this.model.tripNumber
-                }
-                // val: this.selected.direction    //站台的上下行方向, 01:下行 /02:上行
-                // val: val
-            };
-
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
+            commitOperate(menuOperate.StationStand.setJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
 
         // 取消跳停
         cancelJumpStop() {
-            // let val = this.model.val1;
-            // if (this.model.val2) {
-            //     val = this.model.val2 + '::' + this.model.tripNumber;
-            // }
-            const operate = {
-                over: true,
-                cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-                param:{
-                    trainGroupNumber:this.model.tripNumber
-                }
-                // val: val // 站台的上下行方向, 01:下行 /02:上行
-            };
-
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
+            commitOperate(menuOperate.StationStand.cancelJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.StationStand.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standRunLevel.vue
index 701682405..b6bbff0d6 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standRunLevel.vue
@@ -89,7 +89,7 @@
 import { mapGetters } from 'vuex';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
@@ -311,27 +311,13 @@ export default {
         },
         commit() {
             if (this.isConfirm) {
-                const operate = {
-                    over: true,
-                    operation: OperationEvent.StationStand.setRunLevel.menu.operation,
-                    cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
-                    param: {
-                        runLevelTime: this.time,
-                        runLevelTimeForever: !!this.tempData[0].check
-                    }
-                };
-
                 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 });
-                    }
+                commitOperate(menuOperate.StationStand.setRunLevel, {runLevelTime: this.time, runLevelTimeForever: !!this.tempData[0].check}, 2).then((data)=>{
+                    this.doClose();
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(operate, [error.message]);
+                    this.$refs.noticeInfo.doShow({}, error.message);
                 });
             } else {
                 this.doClose();
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
index ccbfff692..2f590d0c1 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
@@ -69,7 +69,7 @@
 import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
 
 export default {
     name: 'StandStopTime',
@@ -210,28 +210,13 @@ export default {
         //     });
         // },
         commit() {
-            const operate = {
-                send: true,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
-                param: {
-                    parkingTime: this.control == '01' ? -1 : 1,
-                    parkingAlwaysValid: this.effective == '1'
-                }
-                // messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`]
-            };
-
             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 });
-                }
+            commitOperate(menuOperate.StationStand.setStopTime, {parkingTime: this.control == '01' ? -1 : 1, parkingAlwaysValid: this.effective == '1'}, 2).then((data)=>{
+                this.doClose();
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         cancel() {
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
index 7561350c1..7afc3d543 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
@@ -173,7 +173,7 @@ export default {
         // },
         // 故障解锁
         faultUnlock(selectType) {
-            commitOperate(menuOperate.Section.fault, selectType, [selectType.code]).then((data)=>{
+            commitOperate(menuOperate.Section.fault, {sectionCode:selectType.code}, 0).then((data)=>{
                 this.$refs.sectionControl.doShow(data.operate, data.selected);
             });
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
index bf35a12d4..b15abc755 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
@@ -333,13 +333,7 @@ export default {
         // 设置进路
         arrangementRoute() {
             commitOperate(menuOperate.Signal.arrangementRoute, {signalCode:this.selected.code}, 0).then((data)=>{
-                const routes = [];
-                this.routeList.forEach(elem => {
-                    if (elem.startSignalCode === this.selected.code) {
-                        routes.push(elem);
-                    }
-                });
-                this.$refs.routeSelection.doShow(data.operate, this.selected, routes);
+                this.$refs.routeSelection.doShow(data.operate, this.selected, this.getRouteList(this.selected));
             });
         },
         // 现地设置进路
@@ -399,25 +393,13 @@ export default {
         // 进路交人工控
         humanControl() {
             commitOperate(menuOperate.Signal.humanControl, {signalCode:this.selected.code}, 0).then((data)=>{
-                const routes = [];
-                this.routeList.forEach(elem => {
-                    if (elem.startSignalCode === this.selected.code) {
-                        routes.push(elem);
-                    }
-                });
-                this.$refs.routeHandControl.doShow(data.operate, this.selected, routes);
+                this.$refs.routeHandControl.doShow(data.operate, this.selected, this.getRouteList(this.selected));
             });
         },
         // 进路交自动控
         atsAutoControl() {
             commitOperate(menuOperate.Signal.atsAutoControl, {signalCode:this.selected.code}, 0).then((data)=>{
-                const routes = [];
-                this.routeList.forEach(elem => {
-                    if (elem.startSignalCode === this.selected.code) {
-                        routes.push(elem);
-                    }
-                });
-                this.$refs.routeHandControl.doShow(data.operate, this.selected, routes);
+                this.$refs.routeHandControl.doShow(data.operate, this.selected, this.getRouteList(this.selected));
             });
         },
         // 设置通过模式
@@ -437,15 +419,19 @@ export default {
         // 查询进路状态
         detail() {
             commitOperate(menuOperate.Signal.detail, {signalCode:this.selected.code}, 0).then((data)=>{
-                const routes = [];
-                this.routeList.forEach(elem => {
-                    if (elem.startSignalCode === this.selected.code) {
-                        routes.push(elem);
-                    }
-                });
-                this.$refs.routeDetail.doShow(data.operate, this.selected, routes);
+                this.$refs.routeDetail.doShow(data.operate, this.selected, this.getRouteList(this.selected));
             });
         },
+        // 获取进路列表
+        getRouteList(selectType) {
+            const routes = [];
+            this.routeList.forEach(elem => {
+                if (elem.startSignalCode === selectType.code) {
+                    routes.push(elem);
+                }
+            });
+            return routes;
+        },
         passWordCommit(data) {
             const operate = {
                 operation: data.operation,
diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
index 19cf0d451..2d4a13385 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
@@ -27,6 +27,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mouseCancelState } from './utils/menuItemStatus';
+import {menuOperate, commitOperate} from './utils/menuOperate';
 
 export default {
     name: 'StationStandMenu',
@@ -242,75 +243,28 @@ export default {
         },
         // 现地设置扣车
         setDetainTrainByLow(selectType) {
-            const operate = {
-                start: true,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
-                param:{
-                    standCode:selectType.code
-                },
-                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+            commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:selectType.code}, 3).then((data)=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         /** 取消扣车 */
         cancleDetainTrainByLow(selectType) {
-            const operate = {
-                start: true,
-                over: true,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
-                param:{
-                    standCode:selectType.code
-                },
-                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+            commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:selectType.code}, 3).then((data)=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 设置扣车
         setDetainTrain() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standControl.doShow(data.operate, this.selected);
             });
         },
         // 取消扣车
         cancelDetainTrain() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standControl.doShow(data.operate, this.selected);
             });
         },
         // 强制取消扣车
@@ -331,131 +285,44 @@ export default {
         // },
         // 设置跳停
         setJumpStop() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standJumpStopControl.doShow(data.operate, this.selected);
             });
         },
         // 取消跳停
         cancelJumpStop() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.StationStand.cancelJumpStop, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standJumpStopControl.doShow(data.operate, this.selected);
             });
         },
         // 停站时间控制
         setStopTime() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const tempData = [];
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standStopTime.doShow(operate, this.selected, tempData);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+            commitOperate(menuOperate.StationStand.setStopTime, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standStopTime.doShow(data.operate, this.selected, []);
             });
         },
         // 运行时间控制
         setRunLevel() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const tempData = [];
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standRunLevel.doShow(operate, this.selected, tempData);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+            commitOperate(menuOperate.StationStand.setRunLevel, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standRunLevel.doShow(data.operate, this.selected, []);
             });
         },
         // 设置提前发车
         earlyDeparture() {
-            const operate = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.StationStand.earlyDeparture, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standControl.doShow(data.operate, this.selected);
             });
         },
         // 设置折返策略
         setBackStrategy() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
-                param:{
-                    standCode:this.selected.code
-                }
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const tempData = [];
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standBackStrategy.doShow(operate, this.selected, tempData);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+            commitOperate(menuOperate.StationStand.setBackStrategy, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standBackStrategy.doShow(data.operate, this.selected);
             });
         },
         // 查询站台状态
         detail() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.StationStand.detail.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const tempData = [];
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standDetail.doShow(operate, this.selected, tempData);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+            commitOperate(menuOperate.StationStand.detail, {standCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.standDetail.doShow(data.operate, this.selected, []);
             });
         }
     }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
index 928db10dd..ae5053bd7 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
@@ -23,6 +23,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mouseCancelState } from './utils/menuItemStatus';
+import {menuOperate, commitOperate} from './utils/menuOperate';
 
 export default {
     name: 'SwitchMenu',
@@ -237,167 +238,63 @@ export default {
         },
         // 道岔单锁
         lock(selectType) {
-            const operate = {
-                start: true,
-                over: true,
-                operation: OperationEvent.Switch.lock.menu.operation,
-                param: {
-                    switchCode: selectType.code
-                },
-                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+            commitOperate(menuOperate.Switch.lock, {switchCode:selectType.code}, 3).then((data)=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 道岔解锁
         unlock(selectType) {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Switch.unlock.menu.operation,
-                param: {
-                    switchCode: selectType.code
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, selectType);
-                }
-            }).catch(error => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+            commitOperate(menuOperate.Switch.unlock, {switchCode:selectType.code}, 0).then((data)=>{
+                this.$refs.switchControl.doShow(data.operate, selectType);
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
-
         // 现地道岔强扳
         switchTurnoutForce(selectType) {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Switch.turnoutForce.menu.operation,
-                param:{
-                    switchCode:selectType.code
-                }
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.Switch.turnoutForce, {switchCode:selectType.code}, 0).then((data)=>{
+                this.$refs.switchControl.doShow(data.operate, selectType);
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
-
         // 单操到定位
         locate(selectType) {
-            const operate = {
-                start: true,
-                over: true,
-                operation: OperationEvent.Switch.locate.menu.operation,
-                param: {
-                    switchCode: selectType.code
-                },
-                cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+            commitOperate(menuOperate.Switch.locate, {switchCode:selectType.code}, 3).then((data)=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
-
         // 单操到反位
         reverse(selectType) {
-            const operate = {
-                start: true,
-                over: true,
-                operation: OperationEvent.Switch.reverse.menu.operation,
-                param: {
-                    switchCode: selectType.code
-                },
-                cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+            commitOperate(menuOperate.Switch.reverse, {switchCode:selectType.code}, 3).then((data)=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
-
         // 区段切除
         split() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Switch.split.menu.operation,
-                param: {
-                    switchCode: `${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);
-                }
+            commitOperate(menuOperate.Switch.split, {switchCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.switchControl.doShow(data.operate, this.selected);
             });
         },
         // 区段激活
         active() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Switch.active.menu.operation,
-                param: {
-                    switchCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.Switch.active, {switchCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.switchControl.doShow(data.operate, this.selected);
             });
         },
         // 设置临时限速
         setSpeed() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Switch.setSpeed.menu.operation,
-                param: {
-                    switchCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedLimitControl.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.Switch.setSpeed, {switchCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.speedLimitControl.doShow(data.operate, this.selected);
             });
         },
         // 确认计轴有效
         alxeEffective() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Switch.alxeEffective.menu.operation,
-                param: {
-                    switchCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.alxeEffective.doShow(operate, this.selected);
-                }
+            commitOperate(menuOperate.Switch.alxeEffective, {switchCode:this.selected.code}, 0).then((data)=>{
+                this.$refs.alxeEffective.doShow(data.operate, this.selected);
             });
         },
         undeveloped() {
diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
index b6936687f..80366922c 100644
--- a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js
@@ -2,43 +2,37 @@ import store from '@/store';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-// 控制禁用
+// 操作
 export const menuOperate = {
     Section:{
         active:{
             // 区段激活
             operation: OperationEvent.Section.active.menu.operation,
-            param:['sectionCode'],
             cmdType: CMD.Section.CMD_SECTION_ACTIVE
         },
         alxeEffective:{
             // 确认计轴有效
             operation: OperationEvent.Section.alxeEffective.menu.operation,
-            param:['sectionCode'],
             cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
         },
         split:{
             // 区段切除
             operation: OperationEvent.Section.split.menu.operation,
-            param:['sectionCode'],
             cmdType: CMD.Section.CMD_SECTION_CUT_OFF
         },
         setSpeed:{
             // 设置速度
             operation: OperationEvent.Section.setSpeed.menu.operation,
-            param:['sectionCode'],
             cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
         },
         axlePreReset:{
             // 区段计轴预复位
             operation: OperationEvent.Section.axlePreReset.menu.operation,
-            param:['sectionCode'],
             cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
         },
         fault:{
             // 区段故障解锁
             operation: OperationEvent.Section.fault.menu.operation,
-            param:['sectionCode'],
             cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
         }
     },
@@ -92,6 +86,100 @@ export const menuOperate = {
             // 查询进路状态
             operation: OperationEvent.Signal.detail.menu.operation
         }
+    },
+    Switch:{
+        lock:{
+            // 道岔单锁
+            operation: OperationEvent.Switch.lock.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+        },
+        unlock:{
+            // 道岔解锁
+            operation: OperationEvent.Switch.unlock.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+        },
+        turnoutForce:{
+            // 道岔强扳
+            operation: OperationEvent.Switch.turnoutForce.menu.operation
+        },
+        locate:{
+            // 单操到定位
+            operation: OperationEvent.Switch.locate.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
+        },
+        reverse:{
+            // 单操到反位
+            operation: OperationEvent.Switch.reverse.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
+        },
+        split:{
+            // 区段切除
+            operation: OperationEvent.Switch.split.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
+        },
+        active:{
+            // 区段激活
+            operation: OperationEvent.Switch.active.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
+        },
+        setSpeed:{
+            // 设置临时限速
+            operation: OperationEvent.Switch.setSpeed.menu.operation,
+            cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+        },
+        alxeEffective:{
+            // 确认计轴有效
+            operation: OperationEvent.Switch.alxeEffective.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
+        }
+
+    },
+    StationStand:{
+        setDetainTrain:{
+            // 设置扣车
+            operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+        },
+        cancelDetainTrain:{
+            // 取消扣车
+            operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+        },
+        setJumpStop:{
+            // 设置跳停
+            operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+        },
+        cancelJumpStop:{
+            // 取消跳停
+            operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+        },
+        setStopTime:{
+            // 停站时间控制
+            operation: OperationEvent.StationStand.setStopTime.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+        },
+        setRunLevel:{
+            // 运行时间控制
+            operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
+        },
+        earlyDeparture:{
+            // 设置提前发车
+            operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
+        },
+        setBackStrategy:{
+            // 设置折返策略
+            operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
+        },
+        detail:{
+            // 查询站台状态
+            operation: OperationEvent.StationStand.detail.menu.operation
+        }
+
     }
 };
 
@@ -102,8 +190,8 @@ export function commitOperate(operate, paramList, over) {
         param:{}
     };
     step.param = paramList;
-    // isOnce 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
-    if (over != 0) {
+    // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
+    if (over != 0 && over != 3) {
         delete step.start;
     }
     if (over == 2 || over == 3) {
diff --git a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue
index c67973b00..4612fcdf4 100644
--- a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue
+++ b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue
@@ -39,7 +39,7 @@
             <div v-if="scope.$index == 9" class="table-9-top">状态比较</div>
           </template>
         </el-table-column>
-        <el-table-column prop="province" width="120">
+        <el-table-column prop="code" width="120">
           <template slot="header">
             <div style="width: 100%">模式</div>
             <div style="width: 100%">编号</div>
@@ -47,31 +47,31 @@
         </el-table-column>
         <el-table-column label="大系统模式表">
           <el-table-column label="新风机">
-            <el-table-column prop="province" label="FAF-1" width="120" />
-            <el-table-column prop="city" label="FAF-2" width="120" />
+            <el-table-column prop="faf1" label="FAF-1" width="120" />
+            <el-table-column prop="faf2" label="FAF-2" width="120" />
           </el-table-column>
           <el-table-column label="组合式空调器">
-            <el-table-column prop="province" label="AHU-1" width="120" />
-            <el-table-column prop="city" label="AHU-2" width="120" />
+            <el-table-column prop="ahu1" label="AHU-1" width="120" />
+            <el-table-column prop="ahu2" label="AHU-2" width="120" />
           </el-table-column>
           <el-table-column label="回排风机">
-            <el-table-column prop="province" label="RAF/SEF-1" width="120" />
-            <el-table-column prop="city" label="RAF/SEF-2" width="120" />
+            <el-table-column prop="raf1" label="RAF/SEF-1" width="120" />
+            <el-table-column prop="raf2" label="RAF/SEF-2" width="120" />
           </el-table-column>
           <el-table-column label="风机1">
-            <el-table-column prop="province" label="MD-1" width="120" />
-            <el-table-column prop="province" label="MD-2" width="120" />
-            <el-table-column prop="province" label="MD-3" width="120" />
-            <el-table-column prop="province" label="MD-4" width="120" />
-            <el-table-column prop="province" label="MD-5" width="120" />
-            <el-table-column prop="province" label="MD-6" width="120" />
-            <el-table-column prop="province" label="MD-7" width="120" />
-            <el-table-column prop="province" label="MD-8" width="120" />
-            <el-table-column prop="province" label="MD-9" width="120" />
-            <el-table-column prop="province" label="MD-10" width="120" />
-            <el-table-column prop="province" label="MD-11" width="120" />
-            <el-table-column prop="province" label="MD-12" width="120" />
-            <el-table-column prop="province" label="MD-13" width="120" />
+            <el-table-column prop="md1" label="MD-1" width="120" />
+            <el-table-column prop="md1" label="MD-2" width="120" />
+            <el-table-column prop="md1" label="MD-3" width="120" />
+            <el-table-column prop="md1" label="MD-4" width="120" />
+            <el-table-column prop="md1" label="MD-5" width="120" />
+            <el-table-column prop="md1" label="MD-6" width="120" />
+            <el-table-column prop="md1" label="MD-7" width="120" />
+            <el-table-column prop="md1" label="MD-8" width="120" />
+            <el-table-column prop="md1" label="MD-9" width="120" />
+            <el-table-column prop="md1" label="MD-10" width="120" />
+            <el-table-column prop="md1" label="MD-11" width="120" />
+            <el-table-column prop="md1" label="MD-12" width="120" />
+            <el-table-column prop="md1" label="MD-13" width="120" />
           </el-table-column>
         </el-table-column>
       </el-table>
@@ -107,65 +107,95 @@ export default {
             tableTitleStyle: 'text-align: center; height: 28px; padding: 0;background: #45607B;',
             rowStyle: 'text-align: center;height: 28px; padding: 0; background: #45607B;',
             tableData: [{
-                date: '2016-05-03',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '101',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '关闭'
             }, {
-                date: '2016-05-02',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '102',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '103',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '关闭'
             }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '104',
+                faf1: '打开',
+                faf2: '关闭',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }, {
-                date: '2016-05-08',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '105',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '关闭'
             }, {
-                date: '2016-05-06',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '106',
+                faf1: '打开',
+                faf2: '关闭',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }, {
-                date: '2016-05-07',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '107',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }, {
-                date: '2016-05-07',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '108',
+                faf1: '打开',
+                faf2: '关闭',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }, {
-                date: '2016-05-07',
-                name: '王小虎',
-                province: '上海',
-                city: '普陀区',
-                zip: 200333
+                code: '',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }, {
-                date: '',
-                name: '',
-                province: '',
-                city: '',
-                zip: ''
+                code: '',
+                faf1: '打开',
+                faf2: '打开',
+                ahu1: '打开',
+                ahu2: '打开',
+                raf1: '打开',
+                raf2: '打开',
+                md1: '打开'
             }]
         };
     },
diff --git a/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue b/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
index 2ce124d25..2717ced1e 100644
--- a/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
+++ b/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
@@ -1,82 +1,93 @@
 <template>
   <div>
-    <div style="position: absolute; left: 48%; top: 15%;font-size: 20px;color: #9EEBEF;">语音广播</div>
-    <div class="area-selection">
-      <el-row><div style="margin-top: 10px;margin-bottom: 5px; color: #9EEBEF;">特定区域</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedAll">全线</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedBatch('站厅')">全站厅</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedBatch('上行站台')">全上行站台</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedBatch('下行站台')">全下行站台</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedBatch('办公区')">全办公区</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedBatch('出入口')">全出入口</div></el-row>
-      <el-row><div class="area-selection-button" @click="selectedBatch('换乘通道')">全换乘通道</div></el-row>
-    </div>
-    <div class="broadcast-form">
-      <div v-for="(item,i) in verticalHeader" :key="i" :style="{width: tableWidth+'px'}" class="iscs-pa-table">
-        <div class="left-header">{{ item.name }}</div>
-        <div style="position: relative; left: 5%;">
-          <div v-for="(it, j) in stationList" :key="j" class="table-grid">
-            <div v-if="item.type==='header'" class="pa-table-header" @click="selectedStation(it)">
-              <div style="cursor: default;">{{ it }}</div>
-            </div>
-            <div v-else>
-              <div class="pa-table-content" @click="clickArea(i,j)">
-                <div class="pa-table-content-inside" :style="{background: selectedAreaList.includes(i + '-' + j)? '#2EFF74':'#CDCDCD'}" />
+    <div style="margin: 20px auto 0;text-align: center;font-size: 20px;color: #9EEBEF;">语音广播</div>
+    <div style="overflow: hidden;">
+      <div class="area-selection">
+        <el-row><div style="margin-top: 10px;margin-bottom: 5px; color: #9EEBEF;">特定区域</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedAll">全线</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedBatch('站厅')">全站厅</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedBatch('上行站台')">全上行站台</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedBatch('下行站台')">全下行站台</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedBatch('办公区')">全办公区</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedBatch('出入口')">全出入口</div></el-row>
+        <el-row><div class="area-selection-button" @click="selectedBatch('换乘通道')">全换乘通道</div></el-row>
+      </div>
+      <div class="broadcast-form">
+        <div style="width: 120px; height: 300px; float: left; position: absolute; top: 20px;">
+          <div v-for="(item,i) in verticalHeader" :key="i" :style="{top: i * 31.5 +'px'}" class="left-header">{{ item.name }}</div>
+        </div>
+        <div style="float: left; overflow-x: auto; width: 100%; height: 314px;">
+          <div v-for="(item,i) in verticalHeader" :key="i" :style="{width: tableWidth+'px'}" class="iscs-pa-table">
+            <div style="position: relative; left: 80px;">
+              <div v-for="(it, j) in stationList" :key="j" class="table-grid">
+                <div v-if="item.type==='header'" class="pa-table-header" @click="selectedStation(it)">
+                  <div style="cursor: default;">{{ it }}</div>
+                </div>
+                <div v-else>
+                  <div class="pa-table-content" @click="clickArea(i,j)">
+                    <div class="pa-table-content-inside" :style="{background: selectedAreaList.includes(i + '-' + j)? '#2EFF74':'#CDCDCD'}" />
+                  </div>
+                  <div style="display: inline-block;margin-left: 5px;height: 18px;line-height: 18px;transform: translateY(-25%);color: #192780;">0</div>
+                </div>
               </div>
-              <div style="display: inline-block;margin-left: 5px;height: 18px;line-height: 18px;transform: translateY(-25%);color: #192780;">0</div>
             </div>
           </div>
         </div>
       </div>
+      <div style="float: right; width: 11%; margin-right: 1%;margin-top: 63px;">
+        <div class="broadcast-mode">
+          <el-row>
+            <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">实时广播</div></el-col>
+            <el-col :span="12"><div class="broadcast-mode-button">广播</div></el-col>
+          </el-row>
+        </div>
+        <div class="broadcast-operations">
+          <el-row>
+            <el-col :span="12"><div style="height: 80px;text-align: center; background: #000088;color: #fff;padding-top: 30px">预备<br>广播</div></el-col>
+            <el-col :span="12">
+              <div class="broadcast-mode-button" @click="selectedVideoMode('common')">
+                <div class="pa-check-box" :style="{background: videoMode==='common'?'#2EFF74':'#CDCDCD'}" />
+                <div style="position: relative; left: 5px;display: inline-block;">普通预录</div>
+              </div>
+              <br>
+              <div class="broadcast-mode-button" @click="selectedVideoMode('emergency')">
+                <div class="pa-check-box" :style="{background: videoMode==='emergency'?'#2EFF74':'#CDCDCD'}" />
+                <div style="position: relative; left: 5px;display: inline-block; color: #f00;">紧急预录</div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row style="padding-bottom: 10px">
+            <el-col :span="12">
+              <div class="broadcast-mode-button" @click="showBroadcastContent">广播内容</div>
+            </el-col>
+            <el-col :span="12">
+              <div class="broadcast-mode-button">广播停止</div>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="background-music">
+          <el-row>
+            <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">背景音乐</div></el-col>
+          </el-row>
+          <el-row style="padding-bottom: 10px">
+            <el-col :span="12"><div class="broadcast-mode-button">播放音乐</div></el-col>
+            <el-col :span="12"><div class="broadcast-mode-button">停止音乐</div></el-col>
+          </el-row>
+        </div>
+      </div>
     </div>
-    <div class="broadcast-mode">
-      <el-row>
-        <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">实时广播</div></el-col>
-        <el-col :span="12"><div class="broadcast-mode-button">广播</div></el-col>
-      </el-row>
-    </div>
-    <div class="broadcast-operations">
-      <el-row>
-        <el-col :span="12"><div style="height: 80px;text-align: center; background: #000088;color: #fff;padding-top: 30px">预备<br>广播</div></el-col>
-        <el-col :span="12">
-          <div class="broadcast-mode-button" @click="selectedVideoMode('common')">
-            <div class="pa-check-box" :style="{background: videoMode==='common'?'#2EFF74':'#CDCDCD'}" />
-            <div style="position: relative; left: 5px;display: inline-block;">普通预录</div>
-          </div>
-          <br>
-          <div class="broadcast-mode-button" @click="selectedVideoMode('emergency')">
-            <div class="pa-check-box" :style="{background: videoMode==='emergency'?'#2EFF74':'#CDCDCD'}" />
-            <div style="position: relative; left: 5px;display: inline-block; color: #f00;">紧急预录</div>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row style="padding-bottom: 10px">
-        <el-col :span="12">
-          <div class="broadcast-mode-button" @click="showBroadcastContent">广播内容</div>
-        </el-col>
-        <el-col :span="12">
-          <div class="broadcast-mode-button">广播停止</div>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="background-music">
-      <el-row>
-        <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">背景音乐</div></el-col>
-      </el-row>
-      <el-row style="padding-bottom: 10px">
-        <el-col :span="12"><div class="broadcast-mode-button">播放音乐</div></el-col>
-        <el-col :span="12"><div class="broadcast-mode-button">停止音乐</div></el-col>
-      </el-row>
-    </div>
-    <div class="pa-grey-box" />
-    <div class="pa-statements">
-      <state-table />
+    <div>
+      <div class="pa-grey-box" />
+      <div class="pa-statements">
+        <state-table />
+      </div>
     </div>
     <voice-broadcast ref="voiceBroadcast" />
   </div>
 </template>
 
 <script>
+import { getByGroupStationList } from '@/api/jmap/map';
 import MusicIcon from '@/assets/iscs_icon/music_icon.png';
 import StateTable from './stateTable';
 import VoiceBroadcast from './voiceBroadcast';
@@ -100,7 +111,7 @@ export default {
             ],
             musicIcon: MusicIcon,
             selectedAreaList: [],
-            stationList: ['会展中心站', '世纪大道站', '交通大学站', '市图书馆站', '中心医院站', '未来路站', '火车站', '人民广场站', '体育中心站'],
+            stationList: [],
             videoMode: 'common'
         };
     },
@@ -109,6 +120,18 @@ export default {
             return this.stationList.length * 120 + 80;
         }
     },
+    async created () {
+        // 请求当前线路车站列表
+        const res = await getByGroupStationList(this.$route.query.group);
+        if (res.code == 200) {
+            this.stationList = [];
+            res.data.forEach(station => {
+                if (!station.depot) {
+                    this.stationList.push(station.name);
+                }
+            });
+        }
+    },
     methods: {
         clickArea(i, j) {
             if (this.selectedAreaList.includes(i + '-' + j)) {
@@ -210,9 +233,9 @@ export default {
         border-right: 3px solid #fff;
         border-bottom: 3px solid #fff;
         width: 5%;
-        position: absolute;
-        top: 200px;
-        left: 1%;
+        float: left;
+        margin-top: 63px;
+        margin-left: 1%;
     }
     .area-selection-button{
         width: 90%;
@@ -242,12 +265,13 @@ export default {
         border-right: 3px solid #fff;
         border-bottom: 3px solid #fff;
         width: 80%;
-        height: 40%;
-        top: 200px;
-        position: absolute;
-        left: 7%;
+        height: 340px;
+        margin-left: 10px;
+        float: left;
+        margin-top: 63px;
         overflow-x: auto;
         padding-top: 20px;
+        position: relative;
     }
     .table-grid{
         width: 120px;
@@ -258,14 +282,15 @@ export default {
     }
     .left-header{
         width: 120px;
-        height: 30px;
+        height: 32px;
         display: inline-block;
         padding-left: 20px;
         font-size: 14px;
         text-align: left;
         color: #A2E8EB;
-        position:fixed;
-        left: 7.15%;
+        position: absolute;
+        top: 0;
+        left: 0;
         background: #45607B;
         z-index: 10;
     }
@@ -309,11 +334,12 @@ export default {
         border-bottom: 2px solid #898888;
     }
     .pa-grey-box{
-        position: absolute;
-        left: 4%;
-        top: 64%;
-        width: 81%;
-        height: 30%;
+        float: left;
+        margin-left: 5%;
+        margin-top: 10px;
+        top: 500px;
+        width: 78%;
+        height: 240px;
         background: #DDDDDD;
         border-top: 3px solid #898888;
         border-left: 3px solid #898888;
@@ -321,24 +347,21 @@ export default {
         border-bottom: 3px solid #fff;
     }
     .pa-statements{
-        position: absolute;
-        left: 86%;
-        top: 64%;
-        width: 13%;
+        float: right;
+        margin-right: 1%;
+        margin-top: 50px;
+        width: 15%;
         height: 30%;
         font-size: 12px;
         color: #fff;
     }
     .broadcast-mode{
-        position: absolute;
-        left: 88%;
-        top: 25%;
         border-top: 3px solid #898888;
         border-left: 3px solid #898888;
         border-right: 3px solid #fff;
         border-bottom: 3px solid #fff;
-        width: 11%;
         font-size: 12px;
+        margin-bottom: 13px;
     }
     .broadcast-mode-button{
         height: 30px;
@@ -364,16 +387,13 @@ export default {
         }
     }
     .broadcast-operations{
-        position: absolute;
-        left: 88%;
-        top: 32%;
         border-top: 3px solid #898888;
         border-left: 3px solid #898888;
         border-right: 3px solid #fff;
         border-bottom: 3px solid #fff;
-        width: 11%;
         font-size: 12px;
         background: #778899;
+        margin-bottom: 13px;
     }
     .pa-check-box{
         position: relative;
@@ -388,14 +408,10 @@ export default {
         border-bottom: 2px solid #fff;
     }
     .background-music{
-        position: absolute;
-        left: 88%;
-        top: 48%;
         border-top: 3px solid #898888;
         border-left: 3px solid #898888;
         border-right: 3px solid #fff;
         border-bottom: 3px solid #fff;
-        width: 11%;
         font-size: 12px;
         background: #778899;
     }
diff --git a/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue b/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue
index f97a8af40..e3e216733 100644
--- a/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue
+++ b/src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%; overflow-y: auto;">
     <center-home v-if="currentSystem === 'center'" />
     <station-home v-else-if="currentSystem === 'local'" />
   </div>
diff --git a/src/views/iscs/iscsSystem/config/index.vue b/src/views/iscs/iscsSystem/config/index.vue
index 7730a8f1c..a47a57e76 100644
--- a/src/views/iscs/iscsSystem/config/index.vue
+++ b/src/views/iscs/iscsSystem/config/index.vue
@@ -11,7 +11,7 @@
     <emergency-release v-else-if="mode === 'EmergencyRelease'" />
     <controlBAS v-else-if="mode === 'controlBAS'" />
     <controlPermissionBAS v-else-if="mode === 'controlPermissionBAS'" />
-    <mainScreenPA v-else-if="mode === 'mainScreenPA'" />
+    <!-- <mainScreenPA v-else-if="mode === 'mainScreenPA'" /> -->
     <radioListeningPA v-else-if="mode === 'radioListeningPA'" />
     <timePreviewPA v-else-if="mode === 'timePreviewPA'" />
     <controlCCTV v-else-if="mode === 'controlCCTV'" />
@@ -39,7 +39,7 @@ import StationNetwork from './pis/stationNetwork';
 import EmergencyRelease from './pis/emergencyRelease';
 import controlBAS from './bas/controlBAS';
 import controlPermissionBAS from './bas/controlPermissionBAS';
-import mainScreenPA from './pa/mainScreenPA';
+// import mainScreenPA from './pa/mainScreenPA';
 import radioListeningPA from './pa/radioListeningPA';
 import timePreviewPA from './pa/timePreviewPA';
 import controlCCTV from './cctv/controlCCTV';
@@ -66,7 +66,7 @@ export default {
         EmergencyRelease,
         controlBAS,
         controlPermissionBAS,
-        mainScreenPA,
+        // mainScreenPA,
         radioListeningPA,
         timePreviewPA,
         controlCCTV,
diff --git a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
index 6da6ed1ca..de40a951f 100644
--- a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
+++ b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
@@ -84,6 +84,7 @@
   </div>
 </template>
 <script>
+import { getByGroupStationList } from '@/api/jmap/map';
 import InfoBroadcast from './infoBroadcast';
 export default {
     name:'MainScreen',
@@ -92,92 +93,31 @@ export default {
     },
     data() {
         return {
-            stationList:[
-                {
-                    stationName:'会展中心站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'世纪大道站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'交通大学站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'市图书馆站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'中心医院站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'未来路站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'火车站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'人民广场站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                },
-                {
-                    stationName:'体育中心站',
-                    children:[
-                        {status:'none'}, {status:'default'},
-                        {status:'default'}, {status:'default'},
-                        {status:'none'}, {status:'none'},
-                        {status:'none'}, {status:'default'}
-                    ]
-                }
-            ],
+            stationList:[],
             selectedAreaList: []
         };
     },
+    async created () {
+        // 请求当前线路车站列表
+        const res = await getByGroupStationList(this.$route.query.group);
+        if (res.code == 200) {
+            this.stationList = [];
+            res.data.forEach(station => {
+                if (!station.depot) {
+                    const param = {
+                        stationName: station.name,
+                        children:[
+                            {status:'none'}, {status:'default'},
+                            {status:'default'}, {status:'default'},
+                            {status:'none'}, {status:'none'},
+                            {status:'none'}, {status:'default'}
+                        ]
+                    };
+                    this.stationList.push(param);
+                }
+            });
+        }
+    },
     methods:{
         showInfoBrroadcast() {
             this.$refs.infoBroadcast.doShow();
@@ -318,7 +258,7 @@ border-top: 2px solid #8c8a89;border-left: 2px solid #8c8a89;border-right: 2px s
     vertical-align: top;
 }
 .screen_status_active::after{content:'';border-top: 2px solid #a6a2a6;border-left: 2px solid #a5aca5;border-right: 2px solid #ececec;border-bottom: 2px solid #e4e4e4;background: #00ff00;min-width: 10px;height: 10px;display: inline-block;vertical-align: top;}
-.screen_left_text_group{width:180px;padding: 0px 10px 10px 10px;font-size: 14px;color: #9de4e8;display: inline-block;}
+.screen_left_text_group{width:210px;padding: 0px 10px 10px 10px;font-size: 14px;color: #9de4e8;display: inline-block;}
 .each_data_info{margin-top:10px;height:20px;}
 .screen_right_group{display: inline-block;vertical-align: top;font-size:0;overflow-x: auto;min-height:100%;}
 .each_station_info{width:130px;display: inline-block;vertical-align:top;padding-right: 10px;}