From 9653852c544c0d3329146fb5b9b3ab4d6a332b00 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 3 Jan 2023 15:58:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=81=93=E5=B2=94=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=86=85=E7=9A=84=E5=8D=95=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0domId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/menuDialog/switchCommand.vue        | 56 +++++++++++++++----
 src/scripts/cmdPlugin/OperationHandler.js     | 12 ++++
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
index f3efe6991..b87a5bbcd 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
@@ -31,20 +31,20 @@
       </el-col>
       <el-col :span="6">
         <div class="radio-box-title">设置模式</div>
-        <div class="radio-box">
-          <el-radio v-model="mode" label="auto" :disabled="!!selectedSwitch.auto" style="display: block;margin-bottom: 10px;">自动</el-radio>
-          <el-radio v-model="mode" label="artificial" :disabled="!selectedSwitch.auto" style="display: block;">人工</el-radio>
+        <div :id="domIdSetMode" class="radio-box">
+          <el-radio v-model="mode" label="auto" :disabled="!!selectedSwitch.auto" style="display: block;margin-bottom: 10px;" @input="changeMode">自动</el-radio>
+          <el-radio v-model="mode" label="artificial" :disabled="!selectedSwitch.auto" style="display: block;" @input="changeMode">人工</el-radio>
         </div>
         <div class="radio-box-title">设置位置</div>
-        <div class="radio-box">
-          <el-radio v-model="position" label="normal" :disabled="!!(selectedSwitch.pos=='N' || selectedSwitch.auto)" style="display: block;margin-bottom: 10px;">定位</el-radio>
-          <el-radio v-model="position" label="reserve" :disabled="!!(selectedSwitch.pos=='R' || selectedSwitch.auto)" style="display: block;">反位</el-radio>
+        <div :id="domIdSetPosition" class="radio-box">
+          <el-radio v-model="position" label="normal" :disabled="!!(selectedSwitch.pos=='N' || selectedSwitch.auto)" style="display: block;margin-bottom: 10px;" @input="changePosition">定位</el-radio>
+          <el-radio v-model="position" label="reserve" :disabled="!!(selectedSwitch.pos=='R' || selectedSwitch.auto)" style="display: block;" @input="changePosition">反位</el-radio>
         </div>
         <div class="radio-box-title">设置预留</div>
-        <div class="radio-box">
-          <el-radio v-model="reserved" label="auto" :disabled="true" style="display: block;margin-bottom: 10px;">自动与预留</el-radio>
-          <el-radio v-model="reserved" label="reversed" :disabled="true" style="display: block;margin-bottom: 10px;">预留</el-radio>
-          <el-radio v-model="reserved" label="release" :disabled="true" style="display: block;">释放</el-radio>
+        <div :id="domIdSetReserved" class="radio-box">
+          <el-radio v-model="reserved" label="auto" :disabled="true" style="display: block;margin-bottom: 10px;" @input="changeReserved">自动与预留</el-radio>
+          <el-radio v-model="reserved" label="reversed" :disabled="true" style="display: block;margin-bottom: 10px;" @input="changeReserved">预留</el-radio>
+          <el-radio v-model="reserved" label="release" :disabled="true" style="display: block;" @input="changeReserved">释放</el-radio>
         </div>
       </el-col>
     </el-row>
@@ -112,6 +112,15 @@ export default {
         domIdApply() {
             return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
         },
+        domIdSetMode() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Switch_command_setMode.domId : '';
+        },
+        domIdSetPosition() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Switch_command_setPosition.domId : '';
+        },
+        domIdSetReserved() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Switch_command_setReserved.domId : '';
+        },
         title() {
             return '道岔命令';
         }
@@ -124,6 +133,33 @@ export default {
         }
     },
     methods: {
+        changeMode() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Switch_command_setMode.operation,
+                param: {
+                    val: this.mode
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
+        changePosition() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Switch_command_setPosition.operation,
+                param: {
+                    val: this.position
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
+        changeReserved() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Switch_command_setReserved.operation,
+                param: {
+                    val: this.reserved
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
         doShow(operate) {
             // 如果不是断点激活，而是第一次显示，则需要设置初始值
             this.dialogShow = true;
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index b6852ab49..3c1f87e34 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -675,6 +675,18 @@ export const OperationEvent = {
             line_sectionLock_remoteResetFunc_sure: {
                 operation: '00c03s',
                 domId: '_Tips-ningBo-line_remoteResetFunc-sure{TOP}'
+            },
+            Switch_command_setMode: {
+                operation: '00c04',
+                domId: '_Tips-ningBo-Switch_command_setMode{BOTTOM}'
+            },
+            Switch_command_setPosition: {
+                operation: '00c05',
+                domId: '_Tips-ningBo-Switch_command_setPosition{BOTTOM}'
+            },
+            Switch_command_setReserved: {
+                operation: '00c06',
+                domId: '_Tips-ningBo-Switch_command_setReserved{BOTTOM}'
             }
         },
         commandRight: {

From 897c44a6a875e60cd8a8f99673a02e2f6c13a7b0 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 3 Jan 2023 17:24:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=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/views/newMap/display/terminals/terminalMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue
index bd8fe2890..667b18f0d 100644
--- a/src/views/newMap/display/terminals/terminalMenu.vue
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@@ -237,7 +237,7 @@ export default {
             }
         },
         '$store.state.training.memberList': function (val) {
-            if (!this.$store.state.training.roles) {
+            if (!this.$store.state.training.roles && !this.$route.query.singleClient) {
                 this.changePictureShow('dispatchWork');
             }
         },