From 53bcb7e5dffa071d2c6593f5db7f0b6e4e2f8dfe Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 18 Oct 2023 16:17:02 +0800
Subject: [PATCH] 隐藏重复定时和连续执行

---
 src/components/GMap.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 09bc5f8..813c026 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -443,7 +443,7 @@
         <div class="osd flex-1">
           <a-row class="mr-20" align="middle">
             <a-col span="9"
-              :style="deviceInfo.device || deviceInfo.device?.mode_code !== EModeCode.Disconnected && deviceInfo.dock.basic_osd?.drone_in_dock === 1 ? 'color: rgb(25,190,107)' : 'color: red; font-weight: 700;' ">
+              :style="deviceInfo.device && deviceInfo.device?.mode_code !== EModeCode.Disconnected ? 'color: rgb(25,190,107)' : deviceInfo.dock.basic_osd?.drone_in_dock === 1? 'color: rgb(25,190,107)' : 'color: red; font-weight: 700;' ">
               <!-- DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] -->
               {{ deviceInfo.device ? EModeText[deviceInfo.device?.mode_code] : (deviceInfo.dock.basic_osd?.drone_in_dock === 1) ? '舱内关机' : EModeText[EModeCode.Disconnected]
               }}</a-col>
@@ -473,16 +473,17 @@
           </a-row>
           <a-row class="p5" align="middle" justify="space-between">
             <a-col span="24">
-              <a-button v-if="controlStatus != ''" :class="[openDroneControl ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+              <!-- <a-button v-if="controlStatus != ''" :class="[openDroneControl ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
                 size="small" @click="openDeviceSetting">
-                飞行控制(<DesktopOutlined v-if="controlStatus === 'A'" /> <RobotFilled v-else />{{  controlStatus === 'A' ? 'A控' : 'B控'}}
-                <!-- <template #icon> -->
-                  )
-                <!-- </template> -->
+                飞行控制(<DesktopOutlined v-if="controlStatus === 'A'" /> <RobotFilled v-else />{{  controlStatus === 'A' ? 'A控' : 'B控'}})
               </a-button>
               <a-button v-else :class="[openDroneControl ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
                 size="small" @click="openDeviceSetting">
                 飞行控制
+              </a-button> -->
+              <a-button :class="[openDroneControl ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+                size="small" @click="openDeviceSetting">
+                飞行控制
               </a-button>
             </a-col>
           </a-row>

--
Gitblit v1.9.3