From 78122f6e7a9c07022d74f8991546834219181539 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 10 Jul 2023 10:48:00 +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

---
 .../theme/components/menus/passiveDialog/control.vue      | 1 -
 src/jmapNew/theme/datie_02/menus/menuButton.vue           | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
index 93f3e8252..9e780d566 100644
--- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
@@ -204,7 +204,6 @@ export default {
                 if (!this.dialogShow) {
 
                     let info = SimulationType[member.type];
-                    console.log(member.deviceCode, this.$store.getters['map/getDeviceByCode'](member.deviceCode), '********');
                     if (member.deviceCode) {
                         const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
                         if (device) {
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 5bcbd2bb7..cc3641479 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -2,7 +2,7 @@
   <div id="menuButtons_box" class="menu menuButton" style="height:40px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button :id="Station.stationMasterLock.rightButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockRightButtonDown()">
       <span style="color: #800000">
-        <center><b>X Guided Lock</b></center>
+        <center><b>X Guide Lock</b></center>
       </span>
     </button>
     <!--<button :id="Station.guideLock.button.domId" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Station.guideLock.button.operation, ['GuideLock'])">-->
@@ -63,12 +63,12 @@
     </button>
     <button :id="Switch.block.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.block.button.operation, ['Switch'])">
       <span style="color: black">
-        <center><b>Turnout Lock</b></center>
+        <center><b>Turnout Block</b></center>
       </span>
     </button>
     <button :id="Switch.unblock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.unblock.button.operation, ['Switch'])">
       <span style="color: black">
-        <center><b>Turnout Unlock</b></center>
+        <center><b>Turnout Unblock</b></center>
       </span>
     </button>
     <!--    <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['SignalButton'])">-->
@@ -83,7 +83,7 @@
     <!--    </button>-->
     <button :id="Station.stationMasterLock.leftButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
       <span style="color: #800000">
-        <center><b>S Guided Lock</b></center>
+        <center><b>S Guide Lock</b></center>
       </span>
     </button>
     <!-- powerOnUnlock -->