北京一号线新版指令操作代码调整

src/jmapNew/shape/Section/index.js

@@ -591,10 +591,6 @@ export default class Section extends Group {
                 this.remove(this.speedLimitLeft);
                 this.remove(this.speedLimitRight);
             }
-            // if (this.style.Section.trainPosition.display) {
-            //     this.triangleL.hide();
-            //     this.triangleR.hide();
-            // }
 
         }
     }

src/jmapNew/shape/Train/ETriangle.js

@@ -32,13 +32,6 @@ export default class ETriangle extends Group {
 
     updateTriangle(model, right) {
         const trainRight = right == 1 ? 1 : -1;
-        // const data = this.angle.shape.points;
-        // this.angle.shape.points.pop();
-        // this.angle.shape.points.pop();
-        // this.angle.shape.points.pop();
-        // this.angle.shape.points.push([model.x + 10 * trainRight, model.y]);
-        // this.angle.shape.points.push([model.x, model.y - 6]);
-        // this.angle.shape.points.push([model.x, model.y + 6]);
         const data = [[model.x + 10 * trainRight, model.y], [model.x, model.y - 6], [model.x, model.y + 6]];
         // this.angle.shape.points.push([model.x + 10 * trainRight, model.y]);
         // this.angle.attr('shape', { points: this.angle.shape.points });
@@ -47,16 +40,12 @@ export default class ETriangle extends Group {
                 points:data
             }
         });
-        // const object = this.angle;
         this.angle.animateTo({
             shape: {
                 points:data
             }
         }, 10, 0, 'elasticOut', function () {
-            // done
-            // object.stopAnimation(true);
         });
-        // this.angle.setS
         this.dirty();
     }
 }

src/jmapNew/shape/Train/index.js

@@ -3,7 +3,6 @@ import TrainHead from './TrainHead';
 import TrainBody from './TrainBody';
 import BoundingRect from 'zrender/src/core/BoundingRect';
 import Rect from 'zrender/src/graphic/shape/Rect';
-import { deepAssign } from '@/utils/index';
 import ETriangle from '../Train/ETriangle';
 import store from '@/store';
 

src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue

@@ -159,23 +159,6 @@ export default {
                 return '提前发车';
             }
             return '';
-            // this.earlyDepar = false;
-            // if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-            //     this.radio1 = '1';
-            //     return '扣车';
-            // } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-            //     this.radio1 = '2';
-            //     return '取消扣车';
-            // } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-            //     this.earlyDepar = true;
-            //     if (this.selected.direction == '01') {
-            //         this.radio2 = '2';
-            //     } else {
-            //         this.radio2 = '1';
-            //     }
-            //     return '提前发车';
-            // }
-            // return '';
         }
     },
     mounted() {

src/jmapNew/theme/beijing_01/menus/dialog/standDetainTrainAll.vue

@@ -1,180 +0,0 @@
-<template>
-    <el-dialog class="beijing-01__systerm stand-detain-train-all" :title="title" :visible.sync="show" width="340px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 10px 20px; border: 1px double lightgray; ">
-            <span class="base-label">范围</span>
-            <el-row>
-                <el-radio-group v-model="upDown" @change="choose">
-                    <el-col :span="10">
-                        <el-radio label="02" :id="upDown == '01' ? domIdChoose : ''">上行全线</el-radio>
-                    </el-col>
-                    <el-col :span="6" :offset="8">
-                        <el-radio label="01" :id="upDown == '02' ? domIdChoose : ''">下行全线</el-radio>
-                    </el-col>
-                </el-radio-group>
-            </el-row>
-        </div>
-
-        <div class="table">
-            <span>扣车站台列表（中心设置）</span>
-            <el-table ref="tempData" :data="tempData" border style="width: 100%" size="mini" empty-text="所有站台都无扣车状态！" height="160" highlight-current-row>
-                <el-table-column prop="stationName" label="车站名称">
-                </el-table-column>
-                <el-table-column prop="standName" :width="140" label="扣车站台">
-                </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" :disabled="disabled" @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>
-</template>
-
-<script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
-
-    export default {
-        name: 'StandDetainTrainAll',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                selected: null,
-                upDown: '01',
-                tempData: [],
-                disabled: true,
-                operation: '',
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList',
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdChoose() {
-                return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.choose.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.menu.domId : '';
-            },
-            title() {
-                // if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) {
-                if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
-                    return '全线取消扣车';
-                } else {
-                    return '全线取消跳停';
-                }
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadTableData() {
-                this.tempData = [];
-                this.stationStandList.forEach(elem => {
-                    /** status 01: 未扣车*/
-                    let stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {}).state;
-                    let station = (this.$store.getters['map/getDeviceByCode'](elem.stationCode) || {}).model;
-                    if (station && stand && stand.holdStatus != '01' && Number(elem.direction) === Number(this.upDown)) {
-                        this.tempData.push({ stationName: station.name, standName: elem.name });
-                    }
-                });
-
-                //如果存在未扣车的情况，才可以做此操作
-                if (this.tempData.length > 0) {
-                    this.disabled = false;
-                }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //不是断点激活的菜单应该将状态初始化
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.upDown = selected.direction;
-                    this.loadTableData();
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            choose(upDown) {
-                //重新设置扣车站台
-                this.loadTableData();
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.cancelDetainTrainAll.choose.operation,
-                    val: `${upDown}`,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            commit() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
-                    val: this.upDown,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            }
-        }
-    }
-</script>

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

@@ -1,7 +1,16 @@
 <template>
   <div>
-        <el-dialog class="beijing-01__systerm switch-cmd-control" :title="title" :visible.sync="show" width="800px"
+    <el-dialog
-            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+      v-dialogDrag
+      class="beijing-01__systerm switch-cmd-control"
+      :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">
@@ -9,41 +18,49 @@
             <el-col :span="8">
               <el-form-item label="类型" label-width="40px">
                 <el-select v-model="operation" size="small" disabled>
-                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
+                  <el-option
-                                        :value="option.code">
+                    v-for="option in typeList"
-                                    </el-option>
+                    :key="option.code"
+                    :label="option.name"
+                    :value="option.code"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="车站名称" label-width="80px">
-                                <el-input v-model="stationName" size="small" disabled></el-input>
+                <el-input v-model="stationName" size="small" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="道岔名称" label-width="80px">
-                                <el-input v-model="switchName" size="small" disabled></el-input>
+                <el-input v-model="switchName" size="small" disabled />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
-            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
+      <el-table
-                highlight-current-row height="200">
+        ref="tempData"
-                <el-table-column prop="order" :width="50" label="序号">
+        class="table"
-                </el-table-column>
+        :data="tempData"
-                <el-table-column prop="date" :width="160" label="时间">
+        border
-                </el-table-column>
+        style="width: 100%"
-                <el-table-column prop="context" :width="180" label="执行过程">
+        size="mini"
-                </el-table-column>
+        highlight-current-row
-                <el-table-column prop="result" label="执行结果">
+        height="200"
-                </el-table-column>
+      >
+        <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>
+      <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>
+            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
@@ -51,7 +68,8 @@
         </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>
+            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>
@@ -64,11 +82,11 @@
   </div>
 </template>
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
+import { mouseCancelState } from '../utils/menuItemStatus';
-    import { now } from '@/utils/date';
+import { now } from '@/utils/date';
 
-    export default {
+export default {
     name: 'SwitchCmdControl',
     data() {
         return {
@@ -87,16 +105,15 @@
             timeCountConfirm: -1,
             stationName: '',
             switchName: ''
-            }
+        };
     },
     computed: {
         typeList() {
             return [
                 { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔单解' },
-                    { code: OperationEvent.Switch.unblock.menu.operation, name: '道岔解封' },
                 { code: OperationEvent.Switch.fault.menu.operation, name: '道岔故障解锁' },
-                    { code: OperationEvent.Switch.axlePreReset.menu.operation, name: '道岔计轴预复位' },
+                { code: OperationEvent.Switch.axlePreReset.menu.operation, name: '道岔计轴预复位' }
-                ]
+            ];
         },
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -106,16 +123,17 @@
                 if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                     /** 道岔单解*/
                     return OperationEvent.Switch.unlock.order.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.order.domId;
                 } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                     /** 道岔故障解锁*/
                     return OperationEvent.Switch.fault.order.domId;
                 } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                     /** 道岔计轴复位*/
                     return OperationEvent.Switch.axlePreReset.order.domId;
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
             }
         },
         domIdConfirm1() {
@@ -123,16 +141,17 @@
                 if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                     /** 道岔单解*/
                     return OperationEvent.Switch.unlock.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.confirm1.domId;
                 } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                     /** 道岔故障解锁*/
                     return OperationEvent.Switch.fault.confirm1.domId;
                 } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                     /** 道岔计轴复位*/
                     return OperationEvent.Switch.axlePreReset.confirm1.domId;
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
             }
         },
         domIdConfirm2() {
@@ -140,16 +159,17 @@
                 if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                     /** 道岔单解*/
                     return OperationEvent.Switch.unlock.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.confirm2.domId;
                 } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                     /** 道岔故障解锁*/
                     return OperationEvent.Switch.fault.confirm2.domId;
                 } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                     /** 道岔计轴复位*/
                     return OperationEvent.Switch.axlePreReset.confirm2.domId;
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
             }
         },
         domIdStop() {
@@ -157,34 +177,39 @@
                 if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                     /** 道岔单解*/
                     return OperationEvent.Switch.unlock.stop.domId;
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        /** 道岔解封*/
-                        return OperationEvent.Switch.unblock.stop.domId;
                 } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                     /** 道岔故障解锁*/
                     return OperationEvent.Switch.fault.stop.domId;
                 } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                     /** 道岔计轴复位*/
                     return OperationEvent.Switch.axlePreReset.stop.domId;
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
             }
         },
         domIdClose() {
             if (this.dialogShow) {
                 return OperationEvent.Command.close.menu.domId;
+            } else {
+                return '';
             }
         },
         title() {
             if (this.dialogShow) {
                 if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                     return '道岔单解';
-                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                        return '道岔解封';
                 } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                     return '道岔故障解锁';
                 } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                     return '道岔计轴复位';
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
             }
         }
     },
@@ -194,7 +219,7 @@
                 this.stpDisabled = true;
                 val.forEach((elem, index) => {
                     // 在确定1之前的操作才可以终止
-                        if (elem == false && 1 <= index && index <= 2) {
+                    if (elem == false && index >= 1 && index <= 2) {
                         this.stpDisabled = false;
                     }
                 });
@@ -205,7 +230,7 @@
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-            })
+        });
         this.timer = setInterval(() => {
             if (!this.$store.state.menuOperation.break) {
                 if (this.timeCountCommand > 0) {
@@ -221,7 +246,7 @@
                     this.timeCountConfirm = -1;
                 }
             }
-            }, 1000)
+        }, 1000);
     },
     beforeDestroy() {
         clearInterval(this.timer);
@@ -234,8 +259,8 @@
                 this.switchName = '';
                 this.stationName = '';
                 if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                        this.switchName = selected.name
+                    this.switchName = 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;
                     }
@@ -278,19 +303,16 @@
 
         },
         commandNoPopUp() {
-                let operate = {
+            const operate = {
                 type: MapDeviceType.Switch.type
-                }
+            };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                 /** 道岔单解*/
-                    operate.operation = OperationEvent.Switch.unlock.order.operation
+                operate.operation = OperationEvent.Switch.unlock.order.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.order.operation
             } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                 /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.order.operation
+                operate.operation = OperationEvent.Switch.fault.order.operation;
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.order.operation;
@@ -308,22 +330,19 @@
                 }
             }).catch(() => {
                 this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
-                })
+            });
         },
         confirm1() {
-                let operate = {
+            const operate = {
-                    type: MapDeviceType.Switch.type,
+                type: MapDeviceType.Switch.type
-                }
+            };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                 /** 道岔单解*/
                 operate.operation = OperationEvent.Switch.unlock.confirm1.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.confirm1.operation;
             } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                 /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.confirm1.operation
+                operate.operation = OperationEvent.Switch.fault.confirm1.operation;
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm1.operation;
@@ -343,23 +362,20 @@
                 }
             }).catch(() => {
                 this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
-                })
+            });
         },
         confirm2() {
-                let operate = {
+            const operate = {
                 send: true,
-                    type: MapDeviceType.Switch.type,
+                type: MapDeviceType.Switch.type
-                }
+            };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                 /** 道岔单解*/
                 operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
             } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                 /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.confirm2.operation
+                operate.operation = OperationEvent.Switch.fault.confirm2.operation;
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
@@ -382,22 +398,19 @@
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
                 this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
-                })
+            });
         },
         stop() {
-                let operate = {
+            const operate = {
-                    type: MapDeviceType.Switch.type,
+                type: MapDeviceType.Switch.type
-                }
+            };
 
             if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
                 /** 道岔单解*/
                 operate.operation = OperationEvent.Switch.unlock.stop.operation;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    operate.operation = OperationEvent.Switch.unblock.stop.operation;
             } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
                 /** 道岔故障解锁*/
-                    operate.operation = OperationEvent.Switch.fault.stop.operation
+                operate.operation = OperationEvent.Switch.fault.stop.operation;
             } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
                 /** 道岔计轴复位*/
                 operate.operation = OperationEvent.Switch.axlePreReset.stop.operation;
@@ -413,20 +426,20 @@
                     this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
                 }
             }).catch(error => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
+                this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常,' + error.message });
-                })
+            });
         },
         close() {
-                let operate = {
+            const operate = {
                 type: MapDeviceType.Switch.type,
-                    operation: OperationEvent.Command.close.menu.operation,
+                operation: OperationEvent.Command.close.menu.operation
-                }
+            };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
-                }).catch(error => {
+            }).catch(() => {
                 this.doClose();
             });
         },
@@ -452,8 +465,8 @@
                         elem[prop] = param[prop];
                     }
                 }
-                })
+            });
-            }
         }
     }
+};
 </script>

src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue

@@ -66,11 +66,7 @@ export default {
             return this.dialogShow ? getDomIdByOperation(this.operation) : '';
         },
         title() {
-            if (this.operation == OperationEvent.Switch.block.menu.operation) {
+            if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                return '道岔封锁';
-            } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
-                return '道岔强扳';
-            } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
                 return '区段切除';
             } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
                 return '区段激活';
@@ -111,13 +107,7 @@ export default {
             mouseCancelState(this.selected);
         },
         commit() {
-            if (this.operation == OperationEvent.Switch.block.menu.operation) {
+            if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                /** 道岔封锁*/
-                this.block();
-            } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
-                /** 道岔强扳*/
-                this.turnoutForce();
-            } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
                 /** 区段激活*/
                 this.split();
             } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
@@ -125,25 +115,6 @@ export default {
                 this.active();
             }
         },
-        // 道岔封锁
-        block() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Switch.block.menu.operation,
-                cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-            };
-
-            this.sendCommand(operate);
-        },
-        // 道岔强扮
-        turnoutForce() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Switch.turnoutForce.menu.operation,
-                cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN
-            };
-            this.sendCommand(operate);
-        },
         // 区段切除
         split() {
             const operate = {
@@ -189,7 +160,7 @@ export default {
                 this.doClose();
                 this.$refs.noticeInfo.doShow(operate, error.message);
             });
-        },
+        }
     }
 };
 </script>

src/jmapNew/theme/beijing_01/menus/menuSignal.vue

@@ -143,6 +143,18 @@ export default {
             ]
         };
     },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        ...mapGetters('map', [
+            'routeList'
+        ])
+    },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
@@ -157,18 +169,7 @@ export default {
             }
         }
     },
-    computed: {
+
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ]),
-        ...mapGetters('map', [
-            'routeList'
-        ])
-    },
     methods: {
         clickEvent() {
             const self = this;

src/jmapNew/theme/beijing_01/menus/menuStationStand.vue

@@ -6,7 +6,6 @@
     <stand-detail ref="standDetail" />
     <stand-run-level ref="standRunLevel" />
     <stand-stop-time ref="standStopTime" />
-    <stand-detain-train-all ref="standDetainTrainAll" />
     <notice-info ref="noticeInfo" />
     <stand-back-strategy ref="standBackStrategy" />
   </div>
@@ -20,11 +19,10 @@ import StandBackStrategy from './dialog/standBackStrategy';
 import StandDetail from './dialog/standDetail';
 import StandRunLevel from './dialog/standRunLevel';
 import StandStopTime from './dialog/standStopTime';
-import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import {OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mouseCancelState } from './utils/menuItemStatus';
@@ -39,8 +37,7 @@ export default {
         StandRunLevel,
         NoticeInfo,
         StandBackStrategy,
-        StandStopTime,
+        StandStopTime
-        StandDetainTrainAll
     },
     props: {
         selected: {
@@ -55,78 +52,6 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
-                    // {
-                    //     label: '设置扣车',
-                    //     handler: this.setDetainTrain,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
-                    //     auth: { station: true, center: false }
-                    // },
-                    // {
-                    //     label: '取消扣车',
-                    //     handler: this.cancelDetainTrain,
-                    //     cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
-                    //     auth: { station: true, center: true }
-                    // },
-                    // {
-                    //     label: '设置跳停',
-                    //     handler: this.setJumpStop,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
-                    //     auth: { station: true, center: false }
-                    // },
-                    // {
-                    //     label: '取消跳停',
-                    //     handler: this.cancelJumpStop,
-                    //     cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
-                    //     auth: { station: true, center: true }
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '提前发车',
-                    //     handler: this.earlyDeparture,
-                    //     cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
-                    //     auth: { station: true, center: true }
-                    // },
-                    // {
-                    //     label: '设置停站时间',
-                    //     handler: this.setStopTime,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
-                    //     auth: { station: true, center: true }
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '站台详细信息',
-                    //     handler: this.detail,
-                    //     cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
-                    //     auth: { station: true, center: true }
-                    // },
-                    // {
-                    //     label: '运行时间控制',
-                    //     handler: this.setRunLevel,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
-                    //     auth: { station: false, center: false }
-                    // },
-                    // {
-                    //     label: '设置提前发车',
-                    //     handler: this.earlyDeparture,
-                    //     cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
-                    //     auth: { station: false, center: false }
-                    // },
-                    // {
-                    //     label: '人工折返策略设置',
-                    //     handler: this.setBackStrategy,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
-                    //     auth: { station: false, center: false }
-                    // }
-                    // {
-                    //     label: '查询站台状态',
-                    //     handler: this.detail,
-                    //     disabledCallback: MenuDisabledState.StationStand.detail,
-                    //     auth: { station: false, center: false }
-                    // }
                 ],
                 Center: [
                     {
@@ -351,22 +276,6 @@ export default {
         //         }
         //     });
         // },
-        // 全线取消扣车
-        // cancelDetainTrainAll() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         type: MapDeviceType.StationStand.type,
-        //         label: MapDeviceType.StationStand.label,
-        //         operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation
-        //     };
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.standDetainTrainAll.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
         // 设置跳停
         setJumpStop() {
             const operate = {
@@ -484,7 +393,7 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                operation: OperationEvent.StationStand.detail.menu.operation,
+                operation: OperationEvent.StationStand.detail.menu.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {

src/jmapNew/theme/beijing_01/menus/menuSwitch.vue

@@ -22,7 +22,7 @@ import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import {OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mouseCancelState } from './utils/menuItemStatus';
@@ -52,20 +52,6 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
-                    // {
-                    //     label: '轨道切除',
-                    //     handler: this.split,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
-                    // },
-                    // {
-                    //     label: '轨道激活',
-                    //     handler: this.active,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
-                    // }
-                    // {
-                    //     label: '查看站场设备状态',
-                    //     handler: this.undeveloped
-                    // }
                 ],
                 Center: [
                     {
@@ -266,7 +252,7 @@ export default {
                 }
             });
         },
-        // 道岔解封
+        // 道岔解锁
         unlock(selectType) {
             const operate = {
                 start: true,
@@ -285,57 +271,6 @@ export default {
                 }
             });
         },
-        // 道岔封锁
-        // block() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         operation: OperationEvent.Switch.block.menu.operation,
-        //         param: {
-        //             switchCode: `${this.selected.code}`
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.switchControl.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
-        // 道岔解封
-        // unblock() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         operation: OperationEvent.Switch.unblock.menu.operation,
-        //         param: {
-        //             switchCode: `${this.selected.code}`
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.switchCmdControl.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
-        // 道岔强扳
-        // switchTurnoutForce() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         operation: OperationEvent.Switch.turnoutForce.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);
-        //         }
-        //     });
-        // },
         // 单操到定位
         locate(selectType) {
             const operate = {