From 4dde67b582e40de6d2574a72ea49cc6bef5dd05c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 8 Jan 2020 16:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog/childDialog/confirmControl.vue     | 663 +++++++++---------
 .../beijing_01/menus/dialog/routeControl.vue  | 415 ++++++-----
 .../beijing_01/menus/dialog/standStopTime.vue | 457 ++++++------
 .../theme/beijing_01/menus/menuSignal.vue     | 168 +++--
 4 files changed, 871 insertions(+), 832 deletions(-)

diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
index 25e224a51..d4d96094f 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
@@ -1,355 +1,370 @@
 <template>
-    <el-dialog class="beijing-01__systerm confirm-control" :title="title" :visible.sync="show" width="360px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div class="context">
-            <template v-for="message in messages">
-                <span>{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm confirm-control"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="message in messages">
+        <span>{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import NoticeInfo from './childDialog/noticeInfo'
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from './childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
-    export default {
-        name: 'ConfirmControl',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                operate: {},
-                messages: '',
-                operation: null
+export default {
+    name: 'ConfirmControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: {},
+            messages: '',
+            operation: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                return '进路设置';
+            } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                return '信号关灯';
+            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                return '信号重开';
+            } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                return '取消进路';
+            } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                return '进路交人工控';
+            } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                return '进路交ATS自动控';
+            } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                return '设置运行等级';
+            } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                return '停站时间';
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                return '设置折返策略';
+            } else {
+                return '';
             }
         },
-        components: {
-            NoticeInfo
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
-                    return '进路设置';
-                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                    return '信号关灯';
-                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                    return '信号重开';
-                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    return '取消进路';
-                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                    return '进路交人工控';
-                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                    return '进路交ATS自动控'
-                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                    return '设置运行等级';
-                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                    return '停站时间';
-                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                    return '设置折返策略';
-                }
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                if (this.dialogShow) {
-                    if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
-                        /** 进路设置*/
-                        return OperationEvent.Signal.arrangementRoute.confirm.domId
-                    } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                        /** 信号关灯*/
-                        return OperationEvent.Signal.signalClose.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                        /** 信号重开*/
-                        return OperationEvent.Signal.reopenSignal.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                        /** 取消进路*/
-                        return OperationEvent.Signal.cancelTrainRoute.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                        /** 进路交人工控*/
-                        return OperationEvent.Signal.humanControl.confirm.domId;
-                    } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                        /** 进路交ATS自动控*/
-                        return OperationEvent.Signal.atsAutoControl.confirm.domId;
-                    } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                        /** 设置运行等级*/
-                        return OperationEvent.StationStand.setRunLevel.confirm.domId;
-                    } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                        /** 设置停战时间*/
-                        return OperationEvent.StationStand.setStopTime.confirm.domId;
-                    } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                        /** 设置折返策略*/
-                        return OperationEvent.StationStand.setBackStrategy.confirm.domId;
-                    }
-                }
-            },
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.messages = operate.messages;
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
+        domIdConfirm() {
+            if (this.dialogShow) {
                 if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
                     /** 进路设置*/
-                    this.routeSetting();
+                    return OperationEvent.Signal.arrangementRoute.confirm.domId;
                 } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
                     /** 信号关灯*/
-                    this.signalClose();
+                    return OperationEvent.Signal.signalClose.confirm.domId;
                 } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
                     /** 信号重开*/
-                    this.reopenSignal();
+                    return OperationEvent.Signal.reopenSignal.confirm.domId;
                 } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
                     /** 取消进路*/
-                    this.cancelTrainRoute();
+                    return OperationEvent.Signal.cancelTrainRoute.confirm.domId;
                 } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
                     /** 进路交人工控*/
-                    this.humanControl();
+                    return OperationEvent.Signal.humanControl.confirm.domId;
                 } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
                     /** 进路交ATS自动控*/
-                    this.atsAutoControl();
+                    return OperationEvent.Signal.atsAutoControl.confirm.domId;
                 } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
                     /** 设置运行等级*/
-                    this.setRunLevel();
+                    return OperationEvent.StationStand.setRunLevel.confirm.domId;
                 } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                    /** 停站时间*/
-                    this.setStopTime();
+                    /** 设置停战时间*/
+                    return OperationEvent.StationStand.setStopTime.confirm.domId;
                 } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
                     /** 设置折返策略*/
-                    this.setBackStrategy();
+                    return OperationEvent.StationStand.setBackStrategy.confirm.domId;
+                } else {
+                    return '';
                 }
-            },
-            //进路设置
-            routeSetting() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.arrangementRoute.confirm.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //信号关灯
-            signalClose() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.signalClose.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //信号重开
-            reopenSignal() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.reopenSignal.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //取消进路
-            cancelTrainRoute() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //进路交人工控
-            humanControl() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.humanControl.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //进路交ATS自动控
-            atsAutoControl() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.atsAutoControl.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //设置运行等级
-            setRunLevel() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
-                    val: this.operate.val
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //停站时间
-            setStopTime() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.StationStand.setStopTime.confirm.operation,
-                    val: this.operate.val,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //设置折返策略
-            setBackStrategy() {
-                let operate = {
-                    send: true,
-                    type: this.operate.type,
-                    operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
-                    val: this.operate.val,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
             }
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.messages = operate.messages;
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                /** 进路设置*/
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                /** 信号重开*/
+                this.reopenSignal();
+            } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                /** 取消进路*/
+                this.cancelTrainRoute();
+            } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                /** 进路交人工控*/
+                this.humanControl();
+            } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                /** 进路交ATS自动控*/
+                this.atsAutoControl();
+            } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                /** 设置运行等级*/
+                this.setRunLevel();
+            } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                /** 停站时间*/
+                this.setStopTime();
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                /** 设置折返策略*/
+                this.setBackStrategy();
+            }
+        },
+        // 进路设置
+        routeSetting() {
+            const operate = {
+                send: true,
+                type: this.operate.type,
+                operation: OperationEvent.Signal.arrangementRoute.confirm.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.signalClose.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const operate = {
+                send: true,
+                type: this.operate.type,
+                operation: OperationEvent.Signal.reopenSignal.confirm.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消进路
+        cancelTrainRoute() {
+            const operate = {
+                send: true,
+                type: this.operate.type,
+                operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 进路交人工控
+        humanControl() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Signal.type,
+                operation: OperationEvent.Signal.humanControl.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 进路交ATS自动控
+        atsAutoControl() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Signal.type,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置运行等级
+        setRunLevel() {
+            const operate = {
+                send: true,
+                type: this.operate.type,
+                operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
+                val: this.operate.val
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 停站时间
+        setStopTime() {
+            const operate = {
+                send: true,
+                type: this.operate.type,
+                operation: OperationEvent.StationStand.setStopTime.confirm.operation,
+                val: this.operate.val
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置折返策略
+        setBackStrategy() {
+            const operate = {
+                send: true,
+                type: this.operate.type,
+                operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
+                val: this.operate.val
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => {
+                this.doClose();
+            });
+        }
     }
+};
 
 </script>
 <style>
@@ -357,4 +372,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
index 08b7b789a..5c4c5001a 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue
@@ -1,223 +1,214 @@
 <template>
-    <el-dialog class="beijing-01__systerm signal-control" :title="title" :visible.sync="show" width="300px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row class="header">
-            <el-col :span="11"><span>集中站</span></el-col>
-            <el-col :span="11" :offset="2"><span>信号机</span></el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="11">
-                <el-input v-model="stationName" size="small" disabled></el-input>
-            </el-col>
-            <el-col :span="11" :offset="2">
-                <el-input v-model="signalName" size="small" disabled></el-input>
-            </el-col>
-        </el-row>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm signal-control"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="11"><span>集中站</span></el-col>
+      <el-col :span="11" :offset="2"><span>信号机</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="signalName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
-    export default {
-        name: 'RouteControl',
-        components: {
-            ConfirmControl,
-            NoticeInfo
+export default {
+    name: 'RouteControl',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: null,
+            stationName: '',
+            signalName: ''
+
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                selected: null,
-                operation: null,
-                stationName: '',
-                signalName: ''
-
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-            },
-            title() {
-                if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    return '取消列车进路';
-                } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-                    return '信号关灯';
-                } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-                    return '重开信号';
-                }
-            }
+        domIdConfirm() {
+            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.signalName = '';
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                        this.signalName = selected.name
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.stationName = station.name;
-                        }
-                    }
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    /** 取消列车进路*/
-                    this.cancelTrainRoute();
-                } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-                    /** 信号关灯*/
-                    this.signalClose();
-                } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-                    /** 信号重开*/
-                    this.reopenSignal();
-                }
-            },
-            //取消列车进路
-            cancelTrainRoute() {
-                if (this.$store.state.training.prdType == '01') {
-                    /** 现地工作站*/
-                    this.cancelTrainRouteByLocal();
-                } else if (this.$store.state.training.prdType == '02') {
-                    /** 行调工作站*/
-                    this.cancelTrainRouteByCentral();
-                }
-            },
-            //现地工作站取消进路
-            cancelTrainRouteByLocal() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //行调工作站取消进路
-            cancelTrainRouteByCentral() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //信号关灯
-            signalClose() {
-                let operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.signalClose.menu.operation,
-                    messages: [`信号关灯: ${this.signalName}`],
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.confirmControl.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                });
-            },
-            //信号重开
-            reopenSignal() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.reopenSignal.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            //取消
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
+        title() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                return '取消列车进路';
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                return '信号关灯';
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                return '重开信号';
+            } else {
+                return '';
             }
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                /** 取消列车进路*/
+                this.cancelTrainRoute();
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                /** 信号重开*/
+                this.reopenSignal();
+            }
+        },
+        // 取消列车进路
+        cancelTrainRoute() {
+            this.cancelTrainRouteFunc();
+            // if (this.$store.state.training.prdType == '01') {
+            //     /** 现地工作站*/
+            //     this.cancelTrainRouteFunc();
+            // } else if (this.$store.state.training.prdType == '02') {
+            //     /** 行调工作站*/
+            //     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(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                messages: [`信号关灯: ${this.signalName}`]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 信号重开
+        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(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Signal.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
index df28e585e..3ee954e29 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
@@ -1,238 +1,253 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :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="11"><span>集中站</span></el-col>
-            <el-col :span="11" :offset="2"><span>站台名称</span></el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="11">
-                <el-input v-model="stationName" size="small" disabled></el-input>
-            </el-col>
-            <el-col :span="11" :offset="2">
-                <el-input v-model="standName" size="small" disabled></el-input>
-            </el-col>
-        </el-row>
-        <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 73px;">
-            <span class="base-label" style="left: -9px;">模式</span>
-            <div style=" position: relative; top:-10px;">
-                <el-radio-group v-model="control" @change='chooseControl' style="width: 40%;float: left;">
-                    <div style="margin-bottom: 10px;">
-                        <el-radio label="01" :id="control === '01'? '': domIdChoose1">自动</el-radio>
-                    </div>
-                    <el-radio label="02" :id="control === '02'? '': domIdChoose1">全人工</el-radio>
-                </el-radio-group>
-                <el-input-number v-model="time" @change="inputTime" :disabled="disabledInput" :id="domIdInput"
-                    controls-position="right" :min="0" size="mini"
-                    style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;">
-                </el-input-number>
-                <div style="float: left;margin-top: 22px; margin-left: 5px;">秒</div>
-            </div>
-        </div>
-        <div style="padding: 10px 15px; border: 1px double lightgray;  height: 60px;">
-            <span class="base-label" style="left: -9px;">有效次数</span>
-            <div style=" position: relative; top:-10px;">
-                <el-radio-group v-model="effective" @change="chooseEffective" :disabled="disabledTime">
-                    <el-radio :label="false" :id="effective === false? '': domIdChoose2">一次有效</el-radio>
-                    <el-radio :label="true" :id="effective === true? '': domIdChoose2">一直有效</el-radio>
-                </el-radio-group>
-            </div>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm stand-stop-time"
+    :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="11"><span>集中站</span></el-col>
+      <el-col :span="11" :offset="2"><span>站台名称</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="standName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 73px;">
+      <span class="base-label" style="left: -9px;">模式</span>
+      <div style=" position: relative; top:-10px;">
+        <el-radio-group v-model="control" style="width: 40%;float: left;" @change="chooseControl">
+          <div style="margin-bottom: 10px;">
+            <el-radio :id="control === '01'? '': domIdChoose1" label="01">自动</el-radio>
+          </div>
+          <el-radio :id="control === '02'? '': domIdChoose1" label="02">全人工</el-radio>
+        </el-radio-group>
+        <el-input-number
+          :id="domIdInput"
+          v-model="time"
+          :disabled="disabledInput"
+          controls-position="right"
+          :min="0"
+          size="mini"
+          style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;"
+          @change="inputTime"
+        />
+        <div style="float: left;margin-top: 22px; margin-left: 5px;">秒</div>
+      </div>
+    </div>
+    <div style="padding: 10px 15px; border: 1px double lightgray;  height: 60px;">
+      <span class="base-label" style="left: -9px;">有效次数</span>
+      <div style=" position: relative; top:-10px;">
+        <el-radio-group v-model="effective" :disabled="disabledTime" @change="chooseEffective">
+          <el-radio :id="effective === false? '': domIdChoose2" :label="false">一次有效</el-radio>
+          <el-radio :id="effective === true? '': domIdChoose2" :label="true">一直有效</el-radio>
+        </el-radio-group>
+      </div>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'StandStopTime',
-        components: {
-            ConfirmControl,
-            NoticeInfo
+export default {
+    name: 'StandStopTime',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            time: 0,
+            control: '01',
+            direction: '01',
+            effective: false,
+            selected: null,
+            standName: '',
+            stationName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                time: 0,
-                control: '01',
-                direction: '01',
-                effective: false,
-                selected: null,
-                standName: '',
-                stationName: '',
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.menu.domId : '';
+        },
+        domIdChoose1() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
+        },
+        domIdChoose2() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
+        },
+        disabledUp() {
+            if (this.selected) {
+                return this.selected.direction !== '02';
             }
+            return true;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.StationStand.setStopTime.menu.domId : '';
-            },
-            domIdChoose1() {
-                return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
-            },
-            domIdChoose2() {
-                return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
-            },
-            domIdInput() {
-                return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
-            },
-            disabledUp() {
-                if (this.selected) {
-                    return this.selected.direction !== '02'
-                }
-                return true;
-            },
-            disabledDown() {
-                if (this.selected) {
-                    return this.selected.direction !== '01'
-                }
-                return true;
-            },
-            disabledInput() {
-                return this.control === '01'; //如果是自动则不可以设置
-            },
-            disabledTime() {
-                return this.control === '01'; //如果是自动则不可以设置
-            },
-            title() {
-                return '停站时间';
+        disabledDown() {
+            if (this.selected) {
+                return this.selected.direction !== '01';
             }
+            return true;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        disabledInput() {
+            return this.control === '01'; // 如果是自动则不可以设置
         },
-        methods: {
-            doShow(operate, selected, tempDate) {
-                this.selected = selected || {};
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.standName = '';
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                        this.standName = selected.name;
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.stationName = station.name;
-                        }
+        disabledTime() {
+            return this.control === '01'; // 如果是自动则不可以设置
+        },
+        title() {
+            return '停站时间';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempDate) {
+            this.selected = selected || {};
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
                     }
-
-                    this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
-                    this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
-                    this.effective = tempDate.parkingValidStatus ? true : false;
-                    this.direction = selected.direction;
                 }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+
+                this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
+                this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
+                this.effective = !!tempDate.parkingValidStatus;
+                this.direction = selected.direction;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            chooseControl(control) {
-                /** 自动时的默认时间*/
-                if (control == '01') {
-                    this.inputTime = 15;
-                    this.effective = true;
-                }
-
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.setStopTime.choose1.operation,
-                    val: `${control}`
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            chooseEffective(effective) {
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.setStopTime.choose2.operation,
-                    val: `${effective}`
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            inputTime(time) {
-                let operate = {
-                    repeat: true,
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.setStopTime.input.operation,
-                    val: `${time}`
-                }
-
-                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.setStopTime.menu.operation,
-                    val: [`${this.control}`, this.time, this.effective].join('::'),
-                    // messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`]
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        // this.$refs.confirmControl.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        chooseControl(control) {
+            /** 自动时的默认时间*/
+            if (control == '01') {
+                this.inputTime = 15;
+                this.effective = true;
             }
+
+            const operate = {
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.setStopTime.choose1.operation,
+                val: `${control}`
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        chooseEffective(effective) {
+            const operate = {
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.setStopTime.choose2.operation,
+                val: `${effective}`
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        inputTime(time) {
+            const operate = {
+                repeat: true,
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.setStopTime.input.operation,
+                val: `${time}`
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                val: [`${this.control}`, this.time, this.effective].join('::')
+                // messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
index c06da16fb..e56aeeb73 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
@@ -207,15 +207,17 @@ export default {
         setStoppage() {
             const operate = {
                 start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.stoppage.menu.operation
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.stoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+
             };
 
             mouseCancelState(this.selected);
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -229,15 +231,16 @@ export default {
         cancelStoppage() {
             const operate = {
                 start: true,
-                send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelStoppage.menu.operation
+                cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT,
+                operation: OperationEvent.Signal.cancelStoppage.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
 
             mouseCancelState(this.selected);
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -251,14 +254,17 @@ export default {
         arrangementRoute() {
             const operate = {
                 start: true,
-                send: true,
+                // send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.arrangementRoute.menu.operation
+                // type: MapDeviceType.Signal.type,
+                // label: MapDeviceType.Signal.label,
+                operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     var tempData = null;
@@ -276,63 +282,65 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.$refs.routeControl.doShow(operate, this.selected);
                 }
             });
         },
-        // 信号封锁
-        lock() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.lock.menu.operation
-            };
+        // // 信号封锁
+        // lock() {
+        //     const operate = {
+        //         start: true,
+        //         send: true,
+        //         code: this.selected.code,
+        //         type: MapDeviceType.Signal.type,
+        //         label: MapDeviceType.Signal.label,
+        //         operation: OperationEvent.Signal.lock.menu.operation
+        //     };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeLock.doShow(operate.operation, this.selected);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 信号解封
-        unlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.unlock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
+        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             this.$refs.routeLock.doShow(operate.operation, this.selected);
+        //         }
+        //     }).catch(() => {
+        //         this.$refs.noticeInfo.doShow(operate);
+        //     });
+        // },
+        // // 信号解封
+        // unlock() {
+        //     const operate = {
+        //         start: true,
+        //         code: this.selected.code,
+        //         type: MapDeviceType.Signal.type,
+        //         label: MapDeviceType.Signal.label,
+        //         operation: OperationEvent.Signal.unlock.menu.operation
+        //     };
+        //     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             this.$refs.routeCmdControl.doShow(operate, this.selected);
+        //         }
+        //     });
+        // },
         // 信号重开
         reopenSignal() {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.reopenSignal.menu.operation
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.routeControl.doShow(operate, this.selected);
@@ -344,11 +352,12 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.signalClose.menu.operation
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.routeControl.doShow(operate, this.selected);
@@ -359,11 +368,14 @@ export default {
         humanControl() {
             const operate = {
                 start: true,
-                send: true,
+                // send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.humanControl.menu.operation
+                // type: MapDeviceType.Signal.type,
+                // label: MapDeviceType.Signal.label,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
             this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
                 if (valid) {
@@ -380,11 +392,14 @@ export default {
         atsAutoControl() {
             const operate = {
                 start: true,
-                send: true,
+                // send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
+                // type: MapDeviceType.Signal.type,
+                // label: MapDeviceType.Signal.label,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
             this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
                 if (valid) {
@@ -401,11 +416,14 @@ export default {
         detail() {
             const operate = {
                 start: true,
-                send: true,
+                // send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.detail.menu.operation
+                // type: MapDeviceType.Signal.type,
+                // label: MapDeviceType.Signal.label,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
             };
             this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
                 if (valid) {