From 0d5d99fe39572ed5713e3b180cebbd61f9555441 Mon Sep 17 00:00:00 2001
From: oldHome <szdot@qq.com>
Date: Sat, 28 Jun 2025 07:50:52 +0800
Subject: [PATCH] test

---
 src/components/ControllerTabs.vue                   | 11 +++++++----
 src/components/PlaneStatus.vue                      |  4 ++--
 src/components/SwarmControllerTabs.vue              |  4 ++--
 src/views/layout/components/main/register/index.vue |  2 +-
 src/views/login.vue                                 |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue
index 82f10d5..17f07bb 100644
--- a/src/components/ControllerTabs.vue
+++ b/src/components/ControllerTabs.vue
@@ -149,18 +149,21 @@
               <i class="iconfont icon-fengzheng1 f-s-24"></i>
               <div class="m-t-5">悬停</div>
             </el-button>
+
             <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{autoMode:1}'); speakText('继续执行航线')">
+              @click="confirmation('确认执行自动航线？请确保飞行区域安全且航线已设置。', '自动航线', '{autoMode:1}'); speakText('执行自动航线')">
               <i class="iconfont icon-duandianxufei f-s-24"></i>
-              <div class="m-t-5">复航</div>
+              <div class="m-t-5">自动</div>
             </el-button>
+
             <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{rtlMode:1}'); speakText('返航')">
+              @click="confirmation('确认返航？请确保返航路径无障碍。', '返航操作', '{rtlMode:1}'); speakText('返航')">
               <i class="iconfont icon-yijianfanhang f-s-24"></i>
               <div class="m-t-5">返航</div>
             </el-button>
+
             <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{landMode:1}'); speakText('降落')">
+              @click="confirmation('确认降落？请注意着陆区域安全。', '降落操作', '{landMode:1}'); speakText('降落')">
               <i class="iconfont icon-yangshi_icon_tongyong_arriving f-s-24"></i>
               <div class="m-t-5">降落</div>
             </el-button>
diff --git a/src/components/PlaneStatus.vue b/src/components/PlaneStatus.vue
index 7392a2f..a2df383 100644
--- a/src/components/PlaneStatus.vue
+++ b/src/components/PlaneStatus.vue
@@ -57,7 +57,7 @@
       </div>
     </div>
     <!-- 飞机载重 钩子状态 -->
-    <div class="flex">
+    <!-- <div class="flex">
       <div v-if="loadweight" class="plane-mode p-l-5 p-r-5 mc mac">
         <font class="plane-mode-text" v-if="hookstatus || loadweight">
           {{ hookstatus || '' }} {{ loadweight ? loadweight + '克' : '' }}
@@ -65,7 +65,7 @@
       </div>
       <div class="tag flex mac mc iconfont icon-mianxingdiaogou">
       </div>
-    </div>
+    </div> -->
   </div>
 
 </template>
diff --git a/src/components/SwarmControllerTabs.vue b/src/components/SwarmControllerTabs.vue
index 332a798..41c4314 100644
--- a/src/components/SwarmControllerTabs.vue
+++ b/src/components/SwarmControllerTabs.vue
@@ -50,12 +50,12 @@
               <div class="m-t-5">悬停</div>
             </el-button>
             <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{rtlMode:1}'); speakText('返航')">
+              @click="confirmation('确认返航全部飞机？请确保返航路径无障碍。', '返航操作', '{rtlMode:1}'); speakText('返航')">
               <i class="iconfont icon-yijianfanhang f-s-24"></i>
               <div class="m-t-5">返航</div>
             </el-button>
             <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{landMode:1}'); speakText('降落')">
+              @click="confirmation('确认降落全部飞机？请确保降落区域安全。', '降落操作', '{landMode:1}'); speakText('降落')">
               <i class="iconfont icon-yangshi_icon_tongyong_arriving f-s-24"></i>
               <div class="m-t-5">降落</div>
             </el-button>
diff --git a/src/views/layout/components/main/register/index.vue b/src/views/layout/components/main/register/index.vue
index 6e0d374..fef8545 100644
--- a/src/views/layout/components/main/register/index.vue
+++ b/src/views/layout/components/main/register/index.vue
@@ -48,7 +48,7 @@
             <el-button type="warning" icon="el-icon-edit"
               @click="$router.replace(`/register/edit/${scope.row.id}`)">编辑</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="deleteAir([scope.row.id])">删除</el-button>
-            <el-button type="success" icon="el-icon-link" @click="crosFrequencyToPage(form.shop_id,scope.row.id)">对频</el-button>
+            <!-- <el-button type="success" icon="el-icon-link" @click="crosFrequencyToPage(form.shop_id,scope.row.id)">对频</el-button> -->
           </el-button-group>
         </template>
       </el-table-column>
diff --git a/src/views/login.vue b/src/views/login.vue
index 0b76086..bbfbee1 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,7 +5,7 @@
       <font class="f2 f-s-10 m-l-5" style="vertical-align :top">v.1.0.1</font>
     </div>
     <el-form ref="loginForm" :model="loginForm" class="login-form" auto-complete="on" label-position="left">
-      <h3 class="f-s-30 m-b-15 fc">运载无机监管平台</h3>
+      <h3 class="f-s-30 m-b-15 fc">运载无人机监管平台</h3>
       <el-form-item prop="username">
         <span class="svg-container"><i class="iconfont icon-yonghuziliao f-s-24"></i></span>
         <el-input ref="username" class="usernameBox" v-model="loginForm.username" placeholder="用户" name="username"