From 277252916c5c084b9984aee63d3d1efcc04cd073 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Fri, 22 Jan 2021 10:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E9=83=BD3=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=AE=9E?=
 =?UTF-8?q?=E8=AE=AD=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/chengdu_03/menus/menuButton.vue     | 11 +++---
 .../theme/chengdu_03/operationConfig.js       | 36 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index 42fe107e9..00d6ef30c 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -117,6 +117,7 @@ import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { OperateMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'MapButtonMenu',
@@ -143,13 +144,15 @@ export default {
         };
     },
     computed: {
+		...mapGetters('training', [
+            'operatemode'
+        ]),
         ...mapGetters('map', [
             'routeList',
             'routeData',
             'signalList',
             'autoReentryList',
             'autoReentryData',
-            ''
         ]),
         Switch() {
             return OperationEvent.Switch;
@@ -330,7 +333,7 @@ export default {
             const operate = {
                 operation: this.$store.state.menuOperation.buttonOperation
             };
-            let isArrangementRoute = false;
+			let isArrangementRoute = false;
             if (deviceList.length === 1) {
                 const signal = deviceList[0];
                 const sectionModel = this.$store.getters['map/getDeviceByCode'](signal.sectionCode);
@@ -694,8 +697,8 @@ export default {
                             this.clearOperate();
                         }
                     } else {
-                        this.clearOperate();
-                        // this.$messageBox('请先切换到站控或紧急站控');
+						this.clearOperate();
+						this.operatemode != OperateMode.FAULT && this.$message.info('请先切换到站控或紧急站控');
                     }
                 }
             }
diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js
index 005f2c587..92bbbc49d 100644
--- a/src/jmapNew/theme/chengdu_03/operationConfig.js
+++ b/src/jmapNew/theme/chengdu_03/operationConfig.js
@@ -8,6 +8,39 @@
 // STAND 站台
 // ROUTE 进路
 // CYCLE 自动折返
+
+// {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
+// {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
+// {id: "3", trainingType: "Signal", name: "进路名称"}
+// {id: "4", trainingType: "Signal", name: "进路编号"}
+// {id: "5", trainingType: "Signal", name: "信号机名称"}
+// {id: "6", trainingType: "Signal", name: "信号机编号"}
+
+// {id: "7", trainingType: "Switch", name: "道岔名称"}
+
+// {id: "8", trainingType: "Section", name: "物理区段名称"}
+// {id: "9", trainingType: "Section", name: "逻辑区段名称"}
+
+// {id: "10", trainingType: "Stand", name: "车站名称"}
+// {id: "11", trainingType: "Stand", name: "站台行驶方向编号"}
+// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
+// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
+// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
+
+// {id: "15", trainingType: "Switch", name: "道岔位置"}
+// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}
+// {id: "17", trainingType: "Switch", name: "道岔编码"}
+
+// {id: "18", trainingType: "Section", name: "逻辑区段编码"}
+// {id: "19", trainingType: "Section", name: "区段编号"}
+// {id: "20", trainingType: "Section", name: "车站名称"}
+
+// {id: "21", trainingType: "Switch", name: "车站名称"}
+// {id: "22", trainingType: "Section", name: "车站编号"}
+// {id: "23", trainingType: "Switch", name: "车站编号"}
+// {id: "24", trainingType: "Switch", name: "道岔计轴区段编号"}
+// {id: "25", trainingType: "Switch", name: "道岔计轴区段名称"}
+
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
@@ -85,7 +118,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
             ]
-        },
+		},
+
         {
             maxDuration: 15,
             minDuration: 8,