From 5e2beb6d057590f54862de61a136b06d678b5726 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 19 Mar 2020 17:11:35 +0800
Subject: [PATCH] =?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

---
 .../chengdu_01/menus/menuStationPlatform.vue     | 16 ++++++++--------
 .../theme/chengdu_03/menus/menuButton.vue        |  9 +++------
 src/utils/baseUrl.js                             |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
index 3a24be1e8..10da19401 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
@@ -15,29 +15,29 @@
       <el-col :span="8" :offset="8"><div style="text-align: center">EUROPA - PLATFORM 2</div></el-col>
     </el-row>
     <el-row style="margin-top: 20px">
-      <el-col :span="8"><div style="text-align: center;">Field Devices</div></el-col>
-      <el-col :span="8"><div style="text-align: center;">Control Requests</div></el-col>
-      <el-col :span="8"><div style="text-align: center;">Field Indications</div></el-col>
+      <el-col :span="8"><div style="text-align: center;">现场设备</div></el-col>
+      <el-col :span="8"><div style="text-align: center;">控制请求</div></el-col>
+      <el-col :span="8"><div style="text-align: center;">现场指示</div></el-col>
     </el-row>
     <el-row style="margin-top: 20px">
       <el-col :span="8">
-        <div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('platform')">Platform</span></div>
+        <div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('platform')">站台</span></div>
       </el-col>
       <el-col :span="8">
         <div style="border-top: 1px solid #6F3700; border-bottom: 1px solid #6F3700; height: 50px; text-align: center">
-          <span @click="clickEvent('inService')">IN SERVICE</span><br><span @click="clickEvent('adjustDwell')">Adjust Dwell</span>
+          <span @click="clickEvent('inService')">在服</span><br><span @click="clickEvent('adjustDwell')">调整停留时间</span>
         </div>
       </el-col>
       <el-col :span="8">
-        <div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('notCommunicating')">Not Communicating</span></div>
+        <div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('notCommunicating')">无通信</span></div>
       </el-col>
     </el-row>
     <el-row>
       <el-col :span="8">
-        <div style="border: 1px solid #6F3700; border-top: 0; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('stoppingProfile')">Stopping Profile</span></div>
+        <div style="border: 1px solid #6F3700; border-top: 0; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('stoppingProfile')">停战配置文件</span></div>
       </el-col>
       <el-col :span="8">
-        <div style="border-bottom: 1px solid #6F3700; height: 50px; text-align: center;"><span @click="clickEvent('northbound')">Northbound</span><br><span @click="clickEvent('southbound')">Southbound</span></div>
+        <div style="border-bottom: 1px solid #6F3700; height: 50px; text-align: center;"><span @click="clickEvent('northbound')">向北</span><br><span @click="clickEvent('southbound')">向南</span></div>
       </el-col>
       <el-col :span="8">
         <div style="border: 1px solid #6F3700; border-top: 0; height: 50px; text-align: center;" />
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index aad987dfd..c1077c018 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -184,10 +184,6 @@ export default {
                 return CMD.Switch.CMD_SWITCH_NORMAL_POSITION;
             case this.Switch.reverse.button.operation: // 道岔反位
                 return CMD.Switch.CMD_SWITCH_REVERSE_POSITION;
-            case this.MixinCommand.block.button.operation: // 封锁
-                return {};
-            case this.MixinCommand.unblock.button.operation: // 解封
-                return {};
             case this.Signal.atsAutoControl.button.operation: // 自动控
                 return CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING;
             case this.Signal.humanControl.button.operation: // 人工控
@@ -198,7 +194,7 @@ export default {
                 return CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
             case this.Signal.arrangementRoute.button.operation: // 排列进路
                 return CMD.Signal.CMD_SIGNAL_SET_ROUTE;
-            case this.Signal.guide.button.operation: // 引导进路
+            case this.Signal.guide.button.operation: // 办理引导
                 return CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
             case this.Signal.reopenSignal.button.operation:
                 return CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
@@ -463,7 +459,8 @@ export default {
                 operation: this.$store.state.menuOperation.buttonOperation
             };
             if (this.routeData[route.code].settingGuide) {
-                operate.cmdType = CMD;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE;
+                operate.param = {signalCode: model.code};
                 this.deviceList = [];
                 this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {});
             } else {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index d8b10d887..ae880e5e3 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,10 +3,10 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
-        BASE_API = 'http://192.168.3.41:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康