From 67071c88306747aa907dfcb1bc486279f4512948 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 26 Jul 2022 16:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=8102=20=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=93=8D=E4=BD=9C=E9=A9=BE=E9=A9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/simulation.js                         |  7 ++++
 .../theme/beijing_01/menus/menuTrain.vue      |  8 ++---
 .../theme/chengdu_01/menus/menuTrain.vue      |  8 ++---
 .../theme/chengdu_03/menus/menuTrain.vue      |  8 ++---
 .../components/menus/dialog/setFault.vue      | 35 ++++++++++---------
 .../theme/datie_02/menus/menuTrain.vue        |  8 ++---
 .../theme/foshan_01/menus/menuTrain.vue       |  8 ++---
 .../theme/fuzhou_01/menus/menuTrain.vue       |  8 ++---
 .../theme/haerbin_01/menus/menuTrain.vue      |  8 ++---
 .../theme/nanjing_02/menus/menuTrain.vue      |  8 ++---
 .../theme/ningbo_01/menus/menuTrain.vue       |  8 ++---
 .../theme/ningbo_03/menus/menuTrain.vue       |  8 ++---
 src/jmapNew/theme/race_01/menus/menuTrain.vue |  8 ++---
 src/jmapNew/theme/xian_01/menus/menuTrain.vue |  8 ++---
 src/jmapNew/theme/xian_02/menus/menuTrain.vue |  8 ++---
 15 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/src/api/simulation.js b/src/api/simulation.js
index 920e00e7e..199ce9b19 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -513,3 +513,10 @@ export function queryIscsResourcesByGroup(group, params) {
         params
     });
 }
+/** 获取机器人驾驶参数 */
+export function getRobotDrivingParam(simulationId, groupNumber) {
+    return request({
+        url: `/simulation/${simulationId}/driveParam/${groupNumber}`,
+        method: 'get'
+    });
+}
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index 7827f19bd..61852ce0b 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -246,10 +246,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 8a6b4e4a9..c4c77eec2 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -159,10 +159,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index c08ee9daf..13e535c27 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -142,10 +142,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 6f6ba5ebd..ce093d2d8 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -19,15 +19,19 @@
                 <el-form-item prop="speedLimit" label="限速：">
                   <el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
                   <span>km/h</span>
-                  <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start">
+                  <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，不填为取消限速" placement="top-start">
                     <i class="el-icon-warning" />
                   </el-tooltip>
                 </el-form-item>
-                <el-form-item prop="driveForward" label="向前行驶：">
-                  <el-switch v-model="formModel.driveForward" active-text="是" inactive-text="否" @change="driveForwardChange" />
+                <el-form-item prop="through" label="">
+                  <el-radio-group v-model="formModel.through">
+                    <el-radio :label="1">越红灯行驶</el-radio>
+                    <el-radio :label="2">越引导行驶</el-radio>
+                    <el-radio :label="0">无</el-radio>
+                  </el-radio-group>
                 </el-form-item>
                 <el-form-item prop="targetDeviceCode" label="目的地:">
-                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" :disabled="formModel.driveForward" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
+                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
                     <el-option
                       v-for="item in selectedList"
                       :key="item.code"
@@ -95,6 +99,7 @@ import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
 import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import { mapGetters } from 'vuex';
+import { getRobotDrivingParam } from '@/api/simulation';
 
 export default {
     name: 'SwitchControl',
@@ -120,7 +125,7 @@ export default {
             form: { faultType: ''},
             formModel: {
                 speedLimit: '',
-                driveForward: false,
+                through: 0,
                 targetDeviceCode: ''
             },
             groupNumber: '',
@@ -290,6 +295,11 @@ export default {
                 if (judge) {
                     this.judge = judge;
                     this.groupNumber = selected.groupNumber;
+                    getRobotDrivingParam(this.$route.query.group, this.groupNumber).then(resp => {
+                        this.formModel.speedLimit = resp.data.speedLimit ? resp.data.speedLimit : '';
+                        this.formModel.through = resp.data.through;
+                        this.formModel.targetDeviceCode = resp.data.targetDeviceCode ? resp.data.targetDeviceCode : '';
+                    });
                 }
             }
             if (selected._type) {
@@ -351,10 +361,6 @@ export default {
             this.sendCommand(setp);
         },
         handleCollocation() { // 设置托管
-            if (!this.formModel.driveForward && !this.formModel.targetDeviceCode) {
-                this.$message.error('请选择向前行驶或目的地');
-                return;
-            }
             const setp = {
                 over: true,
                 operation: menuOperate.Common.collocation.operation,
@@ -363,7 +369,7 @@ export default {
                     groupNumber: this.groupNumber,
                     param: {
                         speedLimit: this.formModel.speedLimit,
-                        driveForward: this.formModel.driveForward,
+                        through: this.formModel.through,
                         targetDeviceCode: this.formModel.targetDeviceCode
                     }
                 }
@@ -402,18 +408,13 @@ export default {
             });
         },
         deviceSelect(em) {
-            if (this.field == 'selectedCode' && em._type == 'Section' && !this.formModel.driveForward) {
+            if (this.field == 'selectedCode' && em._type == 'Section') {
                 this.formModel.targetDeviceCode = em.code;
                 // this.field = '';
-            } else if (this.field == 'selectedCode' && em._type == 'Train' && !this.formModel.driveForward) {
+            } else if (this.field == 'selectedCode' && em._type == 'Train') {
                 this.formModel.targetDeviceCode = em.code;
                 // this.field = '';
             }
-        },
-        driveForwardChange(val) {
-            if (val) {
-                this.formModel.targetDeviceCode = '';
-            }
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index f3d9d519e..29f692fd3 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -193,10 +193,10 @@ export default {
                     label: '越红灯行驶',
                     handler: this.handleOverEedLight
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '驾驶',
                     handler: this.handleDriveTo
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
index fa3ce3e46..fc232cea6 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
@@ -150,10 +150,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index 8822f8371..ef46aeb00 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -124,10 +124,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index 17fda2138..c09e266bc 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -91,10 +91,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
index 09c4226d9..79b9e8e0b 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
@@ -91,10 +91,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 4c7737123..237f4f6de 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -230,10 +230,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
index d7f5b1db1..32f5cc2a6 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
@@ -231,10 +231,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue
index c7cb4a6e5..bdd0956ac 100644
--- a/src/jmapNew/theme/race_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue
@@ -233,10 +233,10 @@ export default {
                     label: '确认运行至前方站',
                     handler: this.nextStation
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '越引导信号行驶',
                     handler: this.handleOverFuideSignal
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index 3da87a5ad..71a6e33ef 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -175,10 +175,10 @@ export default {
                             label: '开关门',
                             handler: this.handleOpenOrCloseDoor
                         },
-                        {
-                            label: '限速指令',
-                            handler: this.handleSpeedLimit
-                        },
+                        // {
+                        //     label: '限速指令',
+                        //     handler: this.handleSpeedLimit
+                        // },
                         {
                             label: '换端',
                             handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index a3d956b58..c83de0af9 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -253,10 +253,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection