From dafe484a0a155e97a1f45e56ab727e18d80e48c9 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Mon, 22 Feb 2021 18:56:39 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=BA=BA?=
 =?UTF-8?q?=E8=A7=A3=E5=88=97=E8=BD=A6=E8=BF=9B=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_01/operationConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js
index 90bc44960..794aecce1 100644
--- a/src/jmapNew/theme/ningbo_01/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_01/operationConfig.js
@@ -706,7 +706,7 @@ export default {
             trainingType: 'Signal',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人工解锁进路】' },
+                { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人解列车进路】' },
                 { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' }
             ]
         },

From 0f492cfbe2e04460d3cf4fd6c916ca98856fd69e Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Tue, 23 Feb 2021 08:59:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ningbo_01/operationConfig.js        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js
index 38a55e74b..43215c347 100644
--- a/src/jmapNew/theme/ningbo_01/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_01/operationConfig.js
@@ -331,7 +331,7 @@ export default {
             operateType: 'Section_Block',
             skinCode: '06',
             trainingName: '封锁({8}{9})',
-            trainingRemark: '封锁功能',
+            trainingRemark: '区段封锁功能',
             trainingType: 'Section',
             productTypes: ['01'],
             stepVOList: [
@@ -345,7 +345,7 @@ export default {
             operateType: 'Section_Unblock',
             skinCode: '06',
             trainingName: '解封({8}{9})',
-            trainingRemark: '解封功能',
+            trainingRemark: '区段解封功能',
             trainingType: 'Section',
             productTypes: ['01'],
             stepVOList: [
@@ -380,7 +380,7 @@ export default {
             operateType: 'Switch_Normal_Position',
             skinCode: '06',
             trainingName: '定操({7})',
-            trainingRemark: '定操({7})',
+            trainingRemark: '道岔定操功能({7})',
             trainingType: 'Switch',
             productTypes: ['01', '02'],
             stepVOList: [
@@ -395,7 +395,7 @@ export default {
             operateType: 'Switch_Reverse_Position', // 0313 新增定位字典
             skinCode: '06',
             trainingName: '反操({7})',
-            trainingRemark: '反操({7})',
+            trainingRemark: '道岔反操功能({7})',
             trainingType: 'Switch',
             productTypes: ['01', '02'],
             stepVOList: [
@@ -410,7 +410,7 @@ export default {
             operateType: 'Switch_Cut_Off',
             skinCode: '06',
             trainingName: '区段切除({7})',
-            trainingRemark: '区段切除',
+            trainingRemark: '区段切除功能',
             trainingType: 'Switch',
             productTypes: ['02'],
             stepVOList: [
@@ -715,12 +715,12 @@ export default {
             minDuration: 8,
             operateType: 'Signal_Set_Guide',
             skinCode: '06',
-            trainingName: '信号机引导办理({5})',
-            trainingRemark: '信号机引导办理',
+            trainingName: '引导({5})',
+            trainingRemark: '引导办理',
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' },
+                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导】' },
                 { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
@@ -730,7 +730,7 @@ export default {
             operateType: 'Signal_Block',
             skinCode: '06',
             trainingName: '封锁({5})',
-            trainingRemark: '封锁',
+            trainingRemark: '信号机封锁功能',
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
@@ -745,7 +745,7 @@ export default {
             operateType: 'Signal_Unblock',
             skinCode: '06',
             trainingName: '解封({5})',
-            trainingRemark: '解封功能',
+            trainingRemark: '信号机解封功能',
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [

From b1353c6d69b88a35a672c5df5fd0746e24f1a7ae Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 23 Feb 2021 09:17:44 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=20=E6=8E=A7=E5=88=B6=E6=9D=83=E8=BD=AC=E7=A7=BB=20?=
 =?UTF-8?q?=E4=B8=8B=E6=94=BE=E6=8E=A7=E5=88=B6=20=E6=94=B6=E5=9B=9E?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_03/menus/menuBar.vue |  20 +-
 .../menus/menuDialog/stationDevolution.vue    |   8 +-
 .../menus/menuDialog/stationReclaim.vue       | 306 +++++++++---------
 .../menus/menuDialog/stationRequest.vue       |  34 +-
 4 files changed, 201 insertions(+), 167 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index 3722ff914..535b58138 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -744,17 +744,17 @@ export default {
                                         title: '授权转移',
                                         click: this.authorizeTransfer,
                                         operate: OperationEvent.Command.commandNingBo3.line_user_transfer
-                                    },
-                                    {
-                                        title: '下放站控',
-                                        click: this.authorizeDevolution,
-                                        operate: OperationEvent.Command.commandNingBo3.line_user_devolution
-                                    },
-                                    {
-                                        title: '收回站控',
-                                        click: this.authorizeReclaim,
-                                        operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
                                     }
+                                    // {
+                                    //     title: '下放站控',
+                                    //     click: this.authorizeDevolution,
+                                    //     operate: OperationEvent.Command.commandNingBo3.line_user_devolution
+                                    // },
+                                    // {
+                                    //     title: '收回站控',
+                                    //     click: this.authorizeReclaim,
+                                    //     operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
+                                    // }
                                 ]
                             }
                         ]
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue
index 819f5fcc3..5bd2ad11b 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue
@@ -105,7 +105,7 @@ export default {
         'selected': function(val) {
             if (val) {
                 const stationEle = this.$store.getters['map/getDeviceByCode'](val.code);
-                if (stationEle) {
+                if (stationEle && this.$store.state.training.prdType == '02') {
                     if (stationEle.controller) {
                         const memberData = this.$store.state.training.memberData;
                         if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
@@ -116,6 +116,8 @@ export default {
                     } else {
                         this.status = true;
                     }
+                } else {
+                    this.status = true;
                 }
             }
         }
@@ -171,7 +173,7 @@ export default {
             const steps = {
                 operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                 over: true,
-                param: {stationCode:val.code}
+                param: {stationCodes:[val.code]}
             };
 
             // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
@@ -182,7 +184,7 @@ export default {
                     isClose && this.doClose();
                     this.$emit('commandSuccess', val.code);
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 isClose && this.doClose();
                 this.$refs.noticeInfo.doShow();
             });
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue
index b30909379..f8dfa5a7c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue
@@ -35,14 +35,14 @@
       <el-col :span="4" :offset="1">
         <el-button
           :id="domIdConfirm"
+          :disabled="status"
           type="primary"
           :loading="loading"
           @click="commit(true)"
-          >确定(O)</el-button
-        >
+        >确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdApply" @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdApply" :disabled="status" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -56,157 +56,169 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import { OperationEvent } from "@/scripts/cmdPlugin/OperationHandler";
-import NoticeInfo from "@/jmapNew/theme/components/menus/childDialog/noticeInfo";
-import CMD from "@/scripts/cmdPlugin/CommandEnum";
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-  name: "StationControl",
-  components: {
-    NoticeInfo,
-  },
-  data() {
-    return {
-      status: true,
-      operate: null,
-      loading: false,
-      dialogShow: false,
-      allChecked: false,
-      station: {},
-      message: "",
-    };
-  },
-  computed: {
-    ...mapGetters("map", ["stationList"]),
-    ...mapGetters("training", ["mode", "started"]),
-    centralizedStaionList() {
-      const list = [];
-      this.stationList.forEach((item) => {
-        if (item.centralized) {
-          list.push(this.$store.getters["map/getDeviceByCode"](item.code));
-        }
-      });
-      return list;
+    name: 'StationControl',
+    components: {
+        NoticeInfo
     },
-    show() {
-      return this.dialogShow && !this.$store.state.menuOperation.break;
+    data() {
+        return {
+            status: true,
+            operate: null,
+            loading: false,
+            dialogShow: false,
+            allChecked: false,
+            station: {},
+            message: ''
+        };
     },
-    selected() {
-      return this.$store.state.menuOperation.selected;
-    },
-    domIdChoose() {
-      return this.dialogShow ? OperationEvent.Command.common.choose.domId : "";
-    },
-    domIdConfirm() {
-      return this.dialogShow ? OperationEvent.Command.common.confirm.domId : "";
-    },
-    domIdClose() {
-      return this.dialogShow ? OperationEvent.Command.common.close.domId : "";
-    },
-    domIdApply() {
-      return this.dialogShow ? OperationEvent.Command.common.apply.domId : "";
-    },
-    prdType() {
-      return this.$store.state.training.prdType;
-    },
-    concertrateStationList() {
-      return this.stationList.filter((station) => {
-        return station.centralized;
-      });
-    },
-  },
-  watch: {
-    selected: function (val) {
-      if (val) {
-        const sationEle = this.$store.getters["map/getDeviceByCode"](val.code);
-        if (this.prdType == "02") {
-          this.status = sationEle && sationEle.controlMode != "Center";
-        } else {
-          this.status = sationEle && sationEle.controlMode == "Center";
-        }
-      }
-    },
-  },
-  methods: {
-    doShow() {
-      this.message = "";
-      this.dialogShow = true;
-      this.$nextTick((e) => {
-        this.$refs.table.setCurrentRow();
-        this.$store.dispatch("training/emitTipFresh");
-      });
-    },
-    doClose() {
-      this.dialogShow = false;
-      this.$refs.table.setCurrentRow();
-      this.$store.dispatch("training/emitTipFresh");
-      this.$store.dispatch("socket/shiftMsgQueue");
-    },
-    cancel() {
-      const operate = {
-        type: "bar",
-        operation: OperationEvent.Command.common.close.operation,
-      };
-
-      this.$store.dispatch("training/nextNew", operate).then(({ valid }) => {
-        if (valid) {
-          this.doClose();
-        }
-      });
-    },
-    handleCurrentChange(val) {
-      if (!val) {
-        return;
-      }
-      const step = {
-        code: val.code,
-        operation: OperationEvent.Command.common.choose.operation,
-        val: val.code,
-      };
-
-      this.$store
-        .dispatch("training/nextNew", step)
-        .then(({ valid }) => {
-          if (valid) {
-            this.$store.dispatch("menuOperation/handleBreakFlag", {
-              break: true,
+    computed: {
+        ...mapGetters('map', ['stationList']),
+        ...mapGetters('training', ['mode', 'started']),
+        centralizedStaionList() {
+            const list = [];
+            this.stationList.forEach((item) => {
+                if (item.centralized) {
+                    list.push(this.$store.getters['map/getDeviceByCode'](item.code));
+                }
             });
-            this.$store.dispatch("menuOperation/setSelected", { device: val });
-          }
-        })
-        .catch(() => {
-          this.$refs.noticeInfo.doShow();
-        });
+            return list;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        selected() {
+            return this.$store.state.menuOperation.selected;
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
+        },
+        domIdClose() {
+            return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
+        },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
+        },
+        prdType() {
+            return this.$store.state.training.prdType;
+        },
+        concertrateStationList() {
+            return this.stationList.filter((station) => {
+                return station.centralized;
+            });
+        }
     },
-    commit(isClose = true) {
-      const val = this.selected || {};
-      const steps = {
-        operation: isClose
-          ? OperationEvent.Command.common.confirm.operation
-          : OperationEvent.Command.common.apply.operation,
-        over: true,
-        param: { stationCode: val.code },
-      };
-
-      steps.cmdType = this.status
-        ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL
-        : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
-
-      this.$store
-        .dispatch("training/nextNew", steps)
-        .then(({ valid }) => {
-          if (valid) {
-            isClose && this.doClose();
-            this.$emit("commandSuccess", val.code);
-          }
-        })
-        .catch((error) => {
-          isClose && this.doClose();
-          this.$refs.noticeInfo.doShow();
-        });
+    watch: {
+        'selected': function(val) {
+            if (val) {
+                const stationEle = this.$store.getters['map/getDeviceByCode'](val.code);
+                if (stationEle && this.$store.state.training.prdType == '02') {
+                    if (stationEle.controller) {
+                        const memberData = this.$store.state.training.memberData;
+                        if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
+                            this.status = true;
+                        } else {
+                            this.status = false;
+                        }
+                    } else {
+                        this.status = true;
+                    }
+                } else {
+                    this.status = true;
+                }
+            }
+        }
     },
-  },
+    methods: {
+        doShow() {
+            this.message = '';
+            this.dialogShow = true;
+            this.$nextTick((e) => {
+                this.$refs.table.setCurrentRow();
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.status = true;
+            this.$store.dispatch('menuOperation/setSelected', {device: {}});
+            this.$refs.table.setCurrentRow();
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('socket/shiftMsgQueue');
+        },
+        cancel() {
+            const operate = {
+                type: 'bar',
+                operation: OperationEvent.Command.common.close.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        handleCurrentChange(val) {
+            if (!val) {
+                return;
+            }
+            const step = {
+                code: val.code,
+                operation: OperationEvent.Command.common.choose.operation,
+                val: val.code
+            };
+
+            this.$store
+                .dispatch('training/nextNew', step)
+                .then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', {
+                            break: true
+                        });
+                        this.$store.dispatch('menuOperation/setSelected', { device: val });
+                    }
+                })
+                .catch(() => {
+                    this.$refs.noticeInfo.doShow();
+                });
+        },
+        commit(isClose = true) {
+            const val = this.selected || {};
+            const steps = {
+                operation: isClose
+                    ? OperationEvent.Command.common.confirm.operation
+                    : OperationEvent.Command.common.apply.operation,
+                over: true,
+                param: {stationCodes:[val.code]}
+            };
+
+            // steps.cmdType = this.status
+            //     ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL
+            //     : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
+            steps.cmdType = CMD.Station.CMD_STATION_CONTROL_REVOKE;
+
+            this.$store
+                .dispatch('training/nextNew', steps)
+                .then(({ valid }) => {
+                    if (valid) {
+                        isClose && this.doClose();
+                        this.$emit('commandSuccess', val.code);
+                    }
+                })
+                .catch(() => {
+                    isClose && this.doClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+        }
+    }
 };
 </script>
 <style scoped rel="stylesheet/scss" lang="scss">
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
index ec898fa3e..e8502c734 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
@@ -108,16 +108,30 @@ export default {
             if (val) {
                 const stationEle = this.$store.getters['map/getDeviceByCode'](val.code);
                 if (stationEle) {
-                    if (stationEle.controller) {
-                        const memberData = this.$store.state.training.memberData;
-                        if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
-                            this.status = true;
+                    if (this.$store.state.training.prdType == '02') {
+                        if (stationEle.controller) {
+                            const memberData = this.$store.state.training.memberData;
+                            if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
+                                this.status = true;
+                            } else {
+                                this.status = false;
+                            }
                         } else {
                             this.status = false;
                         }
-                    } else {
-                        this.status = false;
+                    } else if (this.$store.state.training.prdType == '01') {
+                        if (stationEle.controller) {
+                            const memberData = this.$store.state.training.memberData;
+                            if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
+                                this.status = true;
+                            } else {
+                                this.isCurrentStation(stationEle);
+                            }
+                        } else {
+                            this.isCurrentStation(stationEle);
+                        }
                     }
+
                 }
             }
         }
@@ -131,6 +145,13 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        isCurrentStation(stationEle) {
+            if (this.$store.state.map.showCentralizedStationCode == stationEle.code) {
+                this.status = false;
+            } else {
+                this.status = true;
+            }
+        },
         doClose() {
             this.dialogShow = false;
             this.status = true;
@@ -176,7 +197,6 @@ export default {
                 param: {stationCodes:[val.code]}
             };
             // CMD_STATION_CONTROL_TRANSFER
-            // CMD_STATION_CONTROL_REVOKE
             // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
             steps.cmdType = CMD.Station.CMD_STATION_CONTROL_APPLY;
 

From f0a3e0005d10ef323757ea311ac32ac85aeb3da6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 23 Feb 2021 09:27:50 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E5=AE=81=E6=B3=A2?=
 =?UTF-8?q?=E4=B8=89=E5=8F=B7=E7=BA=BF=20=E6=9A=82=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/dialog/sectionAlxeReset.vue         | 159 ---------
 .../menus/dialog/stationBackStrategy.vue      | 181 ----------
 .../ningbo_03/menus/dialog/stationControl.vue | 308 ------------------
 .../menus/dialog/turnBackControl.vue          | 176 ----------
 src/jmapNew/theme/ningbo_03/menus/index.vue   |  12 -
 .../ningbo_03/menus/menuAutoTrunRoute.vue     | 125 -------
 .../theme/ningbo_03/menus/menuAxleReset.vue   | 103 ------
 .../ningbo_03/menus/menuStationControl.vue    | 131 --------
 .../ningbo_03/menus/menuStationTurnBack.vue   | 111 -------
 9 files changed, 1306 deletions(-)
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/dialog/sectionAlxeReset.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/dialog/stationBackStrategy.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/dialog/stationControl.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/dialog/turnBackControl.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/menuAutoTrunRoute.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/menuAxleReset.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue
 delete mode 100644 src/jmapNew/theme/ningbo_03/menus/menuStationTurnBack.vue

diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/sectionAlxeReset.vue
deleted file mode 100644
index ce5666925..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/sectionAlxeReset.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm section-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="24">
-        <span style="margin-right: 10px;">区段:</span>
-        <el-select
-          :id="domIdChoose"
-          v-model="sectionCode"
-          filterable
-          size="mini"
-          @change="sectionSelectChange"
-        >
-          <el-option v-for="(option,index) in switchAndPhySicalSectionList" :key="index" :label="option.name" :value="option.name" />
-        </el-select>
-      </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>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'SectionControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: '',
-            sectionCode: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList'
-        ]),
-        switchAndPhySicalSectionList() {
-            let list = [];
-            if (this.sectionList && this.sectionList.length) {
-                list = this.sectionList.filter(elem => { return elem.type === '01' || elem.type === '03'; });
-            }
-            return list;
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.AxleReset.SetAxleReset.choose.domId : '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            return '计轴复位';
-        }
-    },
-    watch: {
-        '$store.state.map.keyboardEnterCount': function (val) {
-            if (this.show && !this.loading) {
-                this.commit();
-            }
-        }
-    },
-    methods: {
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.sectionCode = '';
-                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');
-        },
-        sectionSelectChange() {
-            const operate = {
-                operation: OperationEvent.AxleReset.SetAxleReset.choose.operation,
-                val: this.sectionCode
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                operation: this.operation,
-                cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET,
-                param: {
-                    sectionCode: this.sectionCode
-                }
-            };
-
-            this.sendCommand(operate);
-        },
-        sendCommand(operate) {
-            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();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/stationBackStrategy.vue
deleted file mode 100644
index f1af95fa6..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/stationBackStrategy.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm stand-run-level"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="font-size: 16px; margin-bottom: 5px;">变通节点</div>
-    <div style="margin-bottom: 5px;">
-      <el-input v-model="stationName" size="mini" disabled />
-    </div>
-    <div style="font-size: 16px; margin-bottom: 5px;">当前变通策略</div>
-    <div style="margin-bottom: 5px;">
-      <el-input v-model="stationStrategy" size="mini" disabled />
-    </div>
-    <div style="font-size: 16px; margin-bottom: 5px;">变通策略选项</div>
-    <el-table
-      ref="table"
-      :data="strategyList"
-      border
-      :cell-style="tableStyle"
-      style="width: 100%; margin-top:10px"
-      size="mini"
-      height="180"
-      highlight-current-row
-      :show-header="false"
-      @row-click="clickEvent"
-    >
-      <el-table-column :id="domIdChoose" prop="label" style="margin-left:30px" />
-    </el-table>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
-          确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import { mapGetters } from 'vuex';
-
-export default {
-    name: 'StandBackStrategy',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            strategyList: [],
-            stationName: '',
-            stationStrategy: '',
-            selection: [],
-            isConfirm: false,
-            strategyId: '',
-            tableStyle: {
-                'border-bottom': 'none'
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.setBackStrategy.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.Station.setBackStrategy.choose.domId : '';
-        },
-        title() {
-            return '策略选择';
-        }
-    },
-    watch: {
-        '$store.state.map.keyboardEnterCount': function (val) {
-            if (this.show && !this.loading && this.isConfirm) {
-                this.commit();
-            }
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                const name = selected.optionList.find(ele => ele.id == selected.tbStrategyId).label;
-                this.stationName = selected.name || '';
-                this.stationStrategy = selected.tbStrategyId ? name : '无策略折返'; // 当前默认折返策略
-                this.strategyList = selected.optionList; // 策略列表
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        clickEvent(row, column, event) {
-            const operate = {
-                operation: OperationEvent.Station.setBackStrategy.choose.operation
-            };
-            this.strategyId = row.id;
-            this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        checkTableDataSelction(data) {
-            const selection = [];
-            if (data && data.length > 0) {
-                data.forEach(row => {
-                    if (row.check && !row.disabled) {
-                        selection.push(row);
-                    }
-                });
-            }
-
-            this.disabledSend = !selection.length;
-            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
-                this.selection = selection;
-            }
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            if (this.isConfirm) {
-                this.loading = true;
-                commitOperate(menuOperate.StationControl.setBackStrategy, {id: this.strategyId}, 2).then(({valid})=>{
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow();
-                });
-            } else {
-                this.doClose();
-            }
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/stationControl.vue
deleted file mode 100644
index 623908ed2..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/stationControl.vue
+++ /dev/null
@@ -1,308 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="540px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <el-row style="margin-bottom: 10px;">
-      <el-col :span="17">
-        <el-table ref="table" :data="stationLists" border style="width: 100%;" size="mini" height="260" highlight-current-row @row-click="clickEvent">
-          <el-table-column label="选择" width="50">
-            <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.checked" :disabled="scope.row.disable" />
-            </template>
-          </el-table-column>
-          <el-table-column label="车站名">
-            <template slot-scope="scope">{{ scope.row.name }}</template>
-          </el-table-column>
-          <el-table-column label="当前状态">
-            <template slot-scope="scope">
-              <span v-if="scope.row.controlMode == 'Center'">遥控</span>
-              <span v-else-if="scope.row.controlMode == 'Local'">站控</span>
-              <!-- <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span>
-              <span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span> -->
-              <span v-else>获取状态中...</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-      <el-col :span="6" :offset="1">
-        <el-radio v-model="controlMode" label="center" :disabled="disabledAll" style="margin-bottom: 8px;">请求站控</el-radio>
-        <el-radio v-model="controlMode" label="local" :disabled="disabledAll">请求遥控</el-radio>
-      </el-col>
-    </el-row>
-    <el-row style="margin-bottom: 15px;">
-      <el-col :span="17">
-        <el-col :span="11" style="text-align: center;"><el-checkbox v-model="checkedAll" size="medium" :disabled="disabledAll" @change="selectAll">全部选择</el-checkbox></el-col>
-        <el-col :span="11" :offset="2"><el-checkbox v-model="checked2" :disabled="disabledAll" size="medium">全部确认</el-checkbox></el-col>
-      </el-col>
-      <el-col :span="5" :offset="1" style="margin-top: -56px;">
-        <el-button :id="domIdConfirm" type="primary" :disabled="commitDisabled" :loading="loading" style="margin-left: 0; margin-bottom: 10px; width: 100%;" @click="commit">应 用</el-button>
-        <el-button :id="domIdCancel" style="margin-left: 0; width: 100%;" @click="cancel">关 闭</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-import { mapGetters } from 'vuex';
-
-export default {
-    name: 'StationControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            controlMode: 'center',
-            beforeSectionList: [],
-            checkedAll: false,
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            row: null,
-            operation: '',
-            stationLists: [],
-            disabledAll: false,
-            checked2: false,
-            commitDisabled:false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
-                return OperationEvent.StationControl.requestCentralControl.choose.domId;
-            } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
-                return OperationEvent.StationControl.requestStationControl.choose.domId;
-            }
-            return '';
-        },
-        domIdConfirm() {
-            if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
-                return OperationEvent.StationControl.requestCentralControl.confirm.domId;
-            } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
-                return OperationEvent.StationControl.requestStationControl.confirm.domId;
-            }
-            return '';
-        },
-        title() {
-            return '站遥控转换';
-        }
-    },
-    watch: {
-        '$store.state.map.controlTransfer':function (controlTransferList) {
-            controlTransferList.forEach(controlTransfer=>{
-                this.updateTableValue(controlTransfer);
-            });
-        },
-        '$store.state.map.keyboardEnterCount': function (val) {
-            if (this.show && !this.loading) {
-                this.commit();
-            }
-        }
-    },
-    methods: {
-        getStationList(disable) {
-            this.stationLists = [];
-            if (this.stationList && this.stationList.length) {
-                this.stationList.forEach(item => {
-                    if (item.centralized) {
-                        const station = this.$store.getters['map/getDeviceByCode'](item.code);
-                        let checked = false;
-                        if (station.code == this.selected.code) {
-                            checked = true;
-                        }
-                        const param = {
-                            checked: checked,
-                            disable: disable,
-                            code: item.code,
-                            name: item.name,
-                            controlMode: station.controlMode
-                        };
-                        this.stationLists.push(param);
-                    }
-                });
-            }
-        },
-        updateTableValue(controlTransfer) {
-            this.stationLists.forEach((row, index) => {
-                if (row.code == controlTransfer.code) {
-                    if (controlTransfer.applicantId) {
-                        this.commitDisabled = true;
-                    } else {
-                        this.commitDisabled = false;
-                    }
-                }
-            });
-            // this.tableData.forEach((row, index) => {
-            //     if (row.code == controlTransfer.code) {
-            //         if (controlTransfer.applicantId) {
-            //             row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
-            //             row.disabled = true;
-            //             row.check = false;
-            //         } else {
-            //             if (row.control != this.controlProps[controlTransfer.controlMode]) {
-            //                 row.result = this.$t('menu.menuDialog.controlModeTransfersuccees');
-            //                 row.control = this.controlProps[controlTransfer.controlMode];
-            //                 this.removeSelection(controlTransfer.code);
-            //                 row.disabled = true;
-            //                 row.check = false;
-            //             } else {
-            //                 row.result = this.$t('menu.menuDialog.controlModeTransferFailed');
-            //                 this.removeSelection(controlTransfer.code);
-            //                 row.disabled = false;
-            //                 row.check = false;
-            //             }
-            //             this.disabledClose = false;
-            //             this.disabledSure = false;
-            //         }
-            //     }
-            // });
-        },
-        getProtectedSectionName(row) {
-            let name = '';
-            if (row &&
-                    row.overlapSectionList &&
-                    row.overlapSectionList &&
-                    row.overlapSectionList.length > 0) {
-
-                const protect = row.overlapSectionList[0];
-                name = `${protect.name}`;
-                const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
-                if (station) {
-                    name = `${name}(${station.name})`;
-                }
-            }
-            return name;
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，而是第一次显示，则需要设置初始值
-            if (!this.dialogShow) {
-                this.operation = operate.operation;
-                if (selected) {
-                    this.getStationList(true);
-                    this.disabledAll = true;
-                } else {
-                    this.getStationList(false);
-                    this.disabledAll = false;
-                }
-
-                if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
-                    this.controlMode = 'local';
-                } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
-                    this.controlMode = 'center';
-                }
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.restoreBeforeDevices();
-            this.$refs.table.setCurrentRow();
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('socket/shiftMsgQueue');
-            mouseCancelState(this.selected);
-        },
-        restoreBeforeDevices() {
-            // 恢复之前选中设备
-            if (this.beforeSectionList && this.beforeSectionList.length) {
-                this.beforeSectionList.forEach(elem => {
-                    elem.cutOff = false;
-                });
-            }
-
-            this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
-            this.beforeSectionList = [];
-        },
-        selectAll() {
-            this.stationLists.forEach(row => {
-                if (this.checkedAll) {
-                    row.checked = true;
-                } else {
-                    row.checked = false;
-                }
-            });
-        },
-        clickEvent(row, event, column) {
-            this.row = row;
-            if (row) {
-                // 设置选中指令
-                const operate = {
-                    operation: OperationEvent.Signal.arrangementRoute.choose.operation
-                };
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            }
-        },
-        commit() {
-            const list = [];
-            this.stationLists.forEach(row => {
-                if (row.checked) {
-                    list.push(row.code);
-                }
-            });
-            if (list && list.length) {
-                const operate = {
-                    over: true,
-                    operation: '',
-                    cmdType: '',
-                    param: {
-                        stationCodes: list
-                    }
-                };
-                if (this.controlMode == 'center') {
-                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
-                    operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
-                } else if (this.controlMode == 'local') {
-                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
-                    operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow();
-                });
-            }
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/turnBackControl.vue
deleted file mode 100644
index 65a964f23..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/turnBackControl.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm signal-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="11"><span>集中站</span></el-col>
-      <el-col :span="11" :offset="2"><span>折返</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="11">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-input v-model="signalName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row style="margin: 12px 0;">
-      <el-col :span="11">
-        <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
-      </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" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'RouteControl',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            operation: null,
-            stationName: '',
-            signalName: '',
-            passRadio: '1'
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) {
-                    return OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.domId;
-                } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) {
-                    return OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.domId;
-                } else {
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        },
-        title() {
-            return '自动折返';
-        }
-    },
-    watch: {
-        '$store.state.map.keyboardEnterCount': function (val) {
-            if (this.show && !this.loading) {
-                this.commit();
-            }
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.signalName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'AutoTurnBack'.toUpperCase()) {
-                    const autoReentryData = this.$store.getters['map/autoReentryData'];
-                    this.signalName = autoReentryData[selected.cycleCode].name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.operation = operate.operation;
-                if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) {
-                    this.passRadio = '1';
-                } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) {
-                    this.passRadio = '2';
-                }
-            }
-            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.AutoTurnBack.SetAutoTurnBackButton.menu.operation) {
-                this.singalPassModel(); // 设置自动折返
-            } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) {
-                this.singalCancelPassModel(); // 取消自动折返
-            }
-        },
-        // 设置自动折返
-        singalPassModel() {
-            this.sendCommand(menuOperate.Signal.setAutoTurnBack);
-        },
-        // 取消自动折返
-        singalCancelPassModel() {
-            this.sendCommand(menuOperate.Signal.cancelAutoTurnBack);
-        },
-        sendCommand(operate) {
-            this.loading = true;
-            commitOperate(operate, {}, 2).then((data)=>{
-                this.loading = false;
-                this.doClose();
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        // 取消
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-                this.$refs.noticeInfo.doShow();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/index.vue b/src/jmapNew/theme/ningbo_03/menus/index.vue
index c2646200a..4e1c93020 100644
--- a/src/jmapNew/theme/ningbo_03/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/index.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-    <menu-axle-reset ref="menuAxleReset" :selected="selected" />
-    <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-station-control ref="menuStationControl" />
-    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" />
     <menu-signal ref="menuSignal" :selected="selected" />
     <menu-section ref="menuSection" :selected="selected" />
@@ -21,17 +17,13 @@
 <script>
 import { mapGetters } from 'vuex';
 import MenuSignal from './menuSignal';
-import MenuAxleReset from './menuAxleReset';
-import MenuAutoTrunRoute from './menuAutoTrunRoute';
 import MenuStationStand from './menuStationStand';
-import MenuStationControl from './menuStationControl';
 import MenuSwitch from './menuSwitch';
 import MenuSection from './menuSection';
 import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
 import MenuBar from './menuBar';
 import MenuLimit from './menuLimit';
-import MenuStationTurnBack from './menuStationTurnBack';
 // import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 // import PassiveTimeout from './passiveDialog/timeout';
@@ -40,16 +32,12 @@ export default {
     name: 'Menus',
     components: {
         MenuBar,
-        MenuAxleReset,
-        MenuAutoTrunRoute,
         MenuSignal,
         MenuSwitch,
         MenuSection,
         MenuStationStand,
-        MenuStationControl,
         MenuStation,
         MenuTrain,
-        MenuStationTurnBack,
         MenuLimit,
         // PassiveAlarm,
         PassiveContorl
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/ningbo_03/menus/menuAutoTrunRoute.vue
deleted file mode 100644
index ed34443f4..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuAutoTrunRoute.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <turn-back-control ref="turnBackControl" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import TurnBackControl from './dialog/turnBackControl';
-import { mapGetters } from 'vuex';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuLimit',
-    components: {
-        PopMenu,
-        TurnBackControl
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.AutoTurnBack) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        // 设置自动折返
-        handlerTurnBack() {
-            commitOperate(menuOperate.Signal.setAutoTurnBack, {cycleCode:this.selected.cycleCode}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.turnBackControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消自动折返
-        cancelTurnBack() {
-            commitOperate(menuOperate.Signal.cancelAutoTurnBack, {cycleCode:this.selected.cycleCode, cancelRoute:false}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.turnBackControl.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuAxleReset.vue b/src/jmapNew/theme/ningbo_03/menus/menuAxleReset.vue
deleted file mode 100644
index acc598954..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuAxleReset.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <section-alxe-reset ref="sectionAlxeReset" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import SectionAlxeReset from './dialog/sectionAlxeReset';
-import { mapGetters } from 'vuex';
-
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuLimit',
-    components: {
-        PopMenu,
-        SectionAlxeReset
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '计轴复位',
-                        handler: this.handleAxleReset,
-                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-                    }
-                ],
-                Center: [
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.AxleReset) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        // 设置计轴复位
-        handleAxleReset() {
-            commitOperate(menuOperate.AxleReset.SetAxleReset, {}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.sectionAlxeReset.doShow(operate);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue
deleted file mode 100644
index 51c66c414..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuStationControl.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <station-control ref="stationControl" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import StationControl from './dialog/stationControl';
-import { mapGetters } from 'vuex';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'StationControlMenu',
-    components: {
-        PopMenu,
-        StationControl
-    },
-    // props: {
-    //     selected: {
-    //         type: Object,
-    //         default() {
-    //             return null;
-    //         }
-    //     }
-    // },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '请求站控',
-                    //     handler: this.setStationControl,
-                    //     cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    // },
-                    // {
-                    //     label: '请求遥控',
-                    //     handler: this.setCenterControl,
-                    //     cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                    // }
-                ],
-                Center: [
-                    // {
-                    //     label: '请求站控',
-                    //     handler: this.setStationControl,
-                    //     cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    // },
-                    // {
-                    //     label: '请求遥控',
-                    //     handler: this.setCenterControl,
-                    //     cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                    // }
-                ]
-            },
-            menuForce: [
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-            this.getCurrentStateObject();
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        getCurrentStateObject() {
-            this.selected = this.$store.getters['menuOperation/selected'];
-        },
-        setCenterControl() {
-            // 请求中控（遥控）
-            commitOperate(menuOperate.StationControl.requestCentralControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.stationControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        setStationControl() {
-            // 请求站控
-            commitOperate(menuOperate.StationControl.requestStationControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.stationControl.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationTurnBack.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationTurnBack.vue
deleted file mode 100644
index 57fd3c2e5..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuStationTurnBack.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <station-back-strategy ref="stationBackStrategy" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import StationBackStrategy from './dialog/stationBackStrategy';
-import { mapGetters } from 'vuex';
-
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'MenuStationTurnBack',
-    components: {
-        PopMenu,
-        StationBackStrategy
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ]
-            },
-            menuForce: [
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationTurnBack) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        // 设置折返策略
-        setBackStrategy() {
-            commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.stationCode}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.stationBackStrategy.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>

From cf912b7834e41267a827b15a75a4ff067a3d0e30 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Tue, 23 Feb 2021 12:16:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A23=20=E9=97=AE=E9=A2=98=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=B7=B3=E5=81=9C=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/operationConfig.js       |   8 +-
 src/jmapNew/theme/ningbo_03/menus/menuBar.vue |   5 +-
 .../menus/menuDialog/trainJumpStop.vue        | 156 +++++++++++++++---
 .../theme/ningbo_03/operationConfig.js        |  56 ++++++-
 src/scripts/cmdPlugin/CommandEnum.js          |   4 +
 src/scripts/cmdPlugin/OperationHandler.js     |  17 +-
 6 files changed, 205 insertions(+), 41 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/operationConfig.js b/src/jmapNew/theme/haerbin_01/operationConfig.js
index 74fc7ad6b..53d5b7082 100644
--- a/src/jmapNew/theme/haerbin_01/operationConfig.js
+++ b/src/jmapNew/theme/haerbin_01/operationConfig.js
@@ -783,7 +783,9 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
                 { deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【引导进路】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+				{ deviceType: '04', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+                { deviceType: '04', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
             ]
         },
         {
@@ -815,7 +817,9 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
                 { deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【引导进路】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+				{ deviceType: '04', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+                { deviceType: '04', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
             ]
         },
         {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index 3722ff914..b429633e7 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -291,7 +291,7 @@ export default {
                     // },
                     {
                         title: '列车(T)',
-                        operate: OperationEvent.Command.mBar.check,
+                        operate: OperationEvent.Command.mBar.train,
                         children: [
                             {
                                 title: '排列进路',
@@ -327,7 +327,7 @@ export default {
                             },
                             {
                                 title: '操作',
-                                operate: '',
+                                operate: OperationEvent.Command.commandNingBo3.train_operate,
                                 children: [
                                     {
                                         title: '发车',
@@ -343,6 +343,7 @@ export default {
                                     },
                                     {
                                         title: '跳停',
+										operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
                                         click: this.setJumpStop
                                     },
                                     {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
index 1553b68cc..217aef93a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
@@ -2,26 +2,30 @@
   <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row>
       <el-col :span="20">
-        <el-tabs type="border-card">
-          <el-tab-pane label="运行线">
-            <el-table :data="trainList" height="300px">
+        <el-tabs type="border-card" v-model="activeName" :id="domIdChoose" @change="handleChangeTab">
+          <el-tab-pane label="运行线" name="first">
+            <el-table ref="table0" :data="trainList" height="300px" highlight-current-row :id="domIdChoose1" @current-change="handleRunLineChange">
               <el-table-column prop="interval" label="运行线" />
             </el-table>
           </el-tab-pane>
-          <el-tab-pane label="列车">
+          <el-tab-pane label="列车" name="second">
             <el-row>
-              <el-col :span="14">
-                <el-table :data="trainList" height="300px">
+              <el-col :span="12">
+                <el-table ref="table1" :data="trainList" height="300px" highlight-current-row :id="domIdSelect1" @current-change="handleTrainChange">
                   <el-table-column prop="code" label="列车" />
                   <el-table-column prop="interval" label="运行线" />
                 </el-table>
               </el-col>
-              <el-col :span="10" style="padding-left: 5px;">
-                <el-table :data="stationStandList" height="260px">
+              <el-col :span="12" style="padding-left: 5px;">
+                <el-table ref="table2" :data="stationStandList" height="260px" highlight-current-row :id="domIdSelect2" @current-change="handleStandChange">
                   <el-table-column prop="name" label="站台" />
-                  <el-table-column prop="jump" label="跳停" />
+                  <el-table-column prop="jump" :width="60" label="跳停" >
+					<template slot-scope="scope">
+						<span>{{ getStandStatus(scope.row.code) }}</span>
+					</template>
+				  </el-table-column>
                 </el-table>
-                <el-checkbox v-model="allCheck" style="margin-top: 10px;">所有站台</el-checkbox>
+                <el-checkbox v-model="allCheck" :id="domIdSelect" style="margin-top: 10px;" @change="handleAllStandChange">所有站台</el-checkbox>
               </el-col>
             </el-row>
           </el-tab-pane>
@@ -30,18 +34,18 @@
       <el-col :span="4" style="padding-left: 5px;">
         <div class="set-status-title">跳停</div>
         <div class="set-status-box">
-          <el-radio v-model="command" :disabled="true" :label="true">设置(S)</el-radio>
+          <el-radio v-model="status" :disabled="!allCheck &&!status" :label="true">设置(S)</el-radio>
           <br>
-          <el-radio v-model="command" :label="false">清除(R)</el-radio>
+          <el-radio v-model="status" :disabled="!allCheck && status" :label="false">清除(R)</el-radio>
         </div>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button>应用(A)</el-button>
+        <el-button :id="domIdApply" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -57,7 +61,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -68,11 +72,9 @@ export default {
     data() {
         return {
             status: false,
-            command: true,
-            allChecked: false,
             dialogShow: false,
             loading: false,
-            activeName: 'first',
+            activeName: 'second',
             operate: {},
             allCheck: false
         };
@@ -88,15 +90,33 @@ export default {
         selected() {
             return this.$store.state.menuOperation.selected;
         },
-        domIdClose() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
         domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+			return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
         },
+		domIdChoose1() {
+			return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
+        },
+		// domIdChoose2() {
+		// 	return this.dialogShow ? OperationEvent.Command.common.choose2.domId : ''
+		// },
+		domIdSelect() {
+			return this.dialogShow ? OperationEvent.Command.common.select.domId : ''
+        },
+		domIdSelect1() {
+			return this.dialogShow ? OperationEvent.Command.common.select1.domId : ''
+        },
+		domIdSelect2() {
+			return this.dialogShow ? OperationEvent.Command.common.select2.domId : ''
+		},
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
+		},
+		domIdClose() {
+            return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
         },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
+		},
         title() {
             return '设置/清除站台跳停';
         }
@@ -106,30 +126,112 @@ export default {
             if (this.show) {
                 this.commit();
             }
-        }
+        },
+		'selected': function(val) {
+            if (val) {
+				const stand = this.$store.getters['map/getDeviceByCode'](val.code);
+				this.status = stand && stand.assignSkip? false: true;
+			}
+		}
     },
     methods: {
+		getStandStatus(code) {
+            const standEle = this.$store.getters['map/getDeviceByCode'](code);
+            if (standEle.assignSkip) {
+                return '是';
+            } else {
+                return '否';
+            }
+        },
         doShow(operate) {
             this.operate = operate;
             // 如果不是断点激活，而是第一次显示，则需要设置初始值
             this.dialogShow = true;
             this.$nextTick(function () {
+				this.$refs.table0 && this.$refs.table0.setCurrentRow();
+				this.$refs.table1 && this.$refs.table1.setCurrentRow();
+				this.$refs.table2 && this.$refs.table2.setCurrentRow();
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$refs.table0 && this.$refs.table0.setCurrentRow();
+			this.$refs.table1 && this.$refs.table1.setCurrentRow();
+			this.$refs.table2 && this.$refs.table2.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
-        commit() {
+		handleChangeTab(val) {
+		},
+		handleRunLineChange(val) {
+		},
+		handleTrainChange(val) {
+			if (!val) { return; }
+            const step = {
+                operation: OperationEvent.Command.common.select.operation,
+                val: val.code,
+				param: {
+					trainGroupNumber: val.code
+				}
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
+		},
+		handleStandChange(val) {
+            if (!val) { return; }
+            const step = {
+				code: val.code,
+                operation: OperationEvent.Command.common.select1.operation,
+                val: val.code,
+				param: {
+					standCode: val.code
+				}
+            };
+			this.allCheck = false;
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/setSelected', {device: val});
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
         },
-        handleClick() {
+		handleAllStandChange(val) {
+			this.$refs.table2 && this.$refs.table2.setCurrentRow();
+		},
+        commit(isClose=false) {
+			const step = {
+                over: true,
+                cmdType:this.status
+					? this.allCheck? CMD.Stand.CMD_STAND_ALL_SET_JUMP_STOP: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+					: this.allCheck? CMD.Stand.CMD_STAND_ALL_CANCEL_JUMP_STOP: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                operation: isClose? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
+                param: this.allCheck
+					? { standCodes: this.stationStandList.map(el => el.code ) }
+					: { standCode: this.selected.code }
+            };
 
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    isClose && this.doClose();
+                }
+            }).catch((error) => {
+            	console.log(error);
+                isClose && this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
         },
         cancel() {
             const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
+                 operation: OperationEvent.Command.common.close.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_03/operationConfig.js b/src/jmapNew/theme/ningbo_03/operationConfig.js
index 8dd03b5b1..6afb2a82d 100644
--- a/src/jmapNew/theme/ningbo_03/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_03/operationConfig.js
@@ -38,7 +38,43 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     list: [
-	    {
+	    // {
+        //     maxDuration: 8,
+        //     minDuration: 5,
+        //     operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
+        //     skinCode: '12',
+        //     trainingName: '跳停({10}-{12} 站台)',
+        //     trainingRemark: '设置跳停功能',
+        //     trainingType: 'Stand',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+		// 		{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
+		// 		{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
+		// 		{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
+		// 		{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+		// 		{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
+		// 		{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
+        //     ]
+		// },
+		// {
+        //     maxDuration: 8,
+        //     minDuration: 5,
+        //     operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
+        //     skinCode: '12',
+        //     trainingName: '取消跳停({10}-{12} 站台)',
+        //     trainingRemark: '设置取消跳停功能',
+        //     trainingType: 'Stand',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+		// 		{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
+		// 		{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
+		// 		{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
+		// 		{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+		// 		{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
+		// 		{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
+		// 	]
+		// },
+		{
             maxDuration: 8,
             minDuration: 5,
             operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
@@ -48,10 +84,11 @@ export default {
             trainingType: 'Stand',
             productTypes: ['01', '02'],
             stepVOList: [
-				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
-				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
-				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
-				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.train.operation, tip: '鼠标左键选择【列车】' },
+				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.train_operate.operation, tip: '鼠标左键选择【操作】' },
+				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.train_operate_jump.operation, tip: '鼠标左键选择【跳停】' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select1.operation, tip: '请选择列车【{29}】', val: '{30}' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select2.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
 				{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
 				{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
             ]
@@ -66,10 +103,11 @@ export default {
             trainingType: 'Stand',
             productTypes: ['01', '02'],
             stepVOList: [
-				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
-				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
-				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
-				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.train.operation, tip: '鼠标左键选择【列车】' },
+				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.train_operate.operation, tip: '鼠标左键选择【操作】' },
+				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.train_operate_jump.operation, tip: '鼠标左键选择【跳停】' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select1.operation, tip: '请选择列车【{29}】', val: '{30}' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select2.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
 				{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
 				{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
 			]
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index a92d96ada..a168b8e49 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -157,6 +157,10 @@ export default {
         CMD_STAND_SET_JUMP_STOP: {value:'Stand_Set_Jump_Stop', label: '设置跳停'},
         /** 取消跳停 */
         CMD_STAND_CANCEL_JUMP_STOP: {value:'Stand_Cancel_Jump_Stop', label: '取消跳停'},
+		/** 全站台设置跳停 */
+		CMD_STAND_ALL_SET_JUMP_STOP: {value:'Stand_All_Set_Jump_Stop', label: '全站台设置跳停'},
+		/** 全站台取消跳停 */
+		CMD_STAND_ALL_CANCEL_JUMP_STOP: {value:'Stand_All_Cancel_Jump_Stop', label: '全站台取消跳停'},
         /** 设置扣车 */
         CMD_STAND_SET_HOLD_TRAIN: {value:'Stand_Set_Hold_Train', label: '设置扣车'},
         /** 取消扣车 */
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 5a8fc69ae..c2f7d2649 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -481,7 +481,22 @@ export const OperationEvent = {
             line_user_reclaim: {
                 operation: '00a44',
                 domId: '_Tips-ningBo-line-user-reclaim{TOP}'
-            }
+            },
+			// 列车
+			train: {
+				operation: '00b',
+                domId: '_Tips-ningBo-train{TOP}'
+			},
+			// 列车-操作
+			train_operate: {
+				operation: '00b0',
+                domId: '_Tips-ningBo-train-operate{TOP}'
+			},
+			// 列车-操作-跳停
+			train_operate_jump: {
+				operation: '00b01',
+				domId: '_Tips-ningBo-train-operate-jump{TOP}'
+			},
         }
     },
     // 站台概要表