From 067a99282d9786519721a498ec118ae4614c6c8c Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Fri, 13 Sep 2024 16:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afactor=20=E4=B8=8A=E4=BC=A0=E8=88=AA=E7=82=B9=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E5=92=8C=20=E8=A7=A3=E9=94=81=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=20=20=E6=9C=AA=E5=AE=8C=E6=88=90=20=E3=80=90?=
 =?UTF-8?q?=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A=20=E3=80=90=E8=BF=87?=
 =?UTF-8?q?=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90=E5=BD=B1=20=20?=
 =?UTF-8?q?=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ControllerTabs.vue | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue
index d6c743e..415e3f4 100644
--- a/src/components/ControllerTabs.vue
+++ b/src/components/ControllerTabs.vue
@@ -134,25 +134,25 @@
             </template>
             <el-form-item label="飞机操作">
               <el-button-group>
-                <el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.questState) === 1" type="primary"
+                <!-- <el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.questState) === 1" type="primary"
                   icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
                   <font class="m-l-5">上传航点</font>
+                </el-button> -->
+                <el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.questState) === 1 || Number(plane.planeState.questState) === 4" type="warning"
+                  icon="f-s-14 iconfont icon-jiesuo" @click="prepareQuest">
+                  <font class="m-l-5">准备任务</font>
                 </el-button>
                 <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 2" key="wirteBut"
                   type="info" :loading="true" disabled>
                   <font class="m-l-5">航点写入中···</font>
                 </el-button>
-                <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 4" type="warning"
-                  icon="f-s-14 iconfont icon-jiesuo" @click="publishFun('{unlock:1}'); speakText('解锁飞机')">
-                  <font class="m-l-5">解锁飞机</font>
-                </el-button>
                 <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 12" type="info"
                   :loading="true" disabled>
                   <font class="m-l-5">解锁中...</font>
                 </el-button>
                 <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 20" type="success"
                   icon="f-s-14 iconfont icon-yangshi_icon_tongyong_departure"
-                  @click="publishFun('{setQuestState:{bit:5,state:1}}'); speakText('准备起飞，执行送餐任务')">
+                  @click="publishFun('{setQuestState:{bit:5,state:1}}'); speakText('执行送餐任务')">
                   <font class="m-l-5">执行任务</font>
                 </el-button>
                 <el-button size="mini" class="f-s-14" v-else-if="isShipped" type="info" :loading="true" disabled>
@@ -642,6 +642,17 @@ export default {
           console.log(error.message) // 处理检查失败的情况
         })
     },
+    /**
+     * @description: 准备任务 先检查合法性，再从飞机反馈中 看有无写入航点 ，最后解锁飞机
+     */
+    prepareQuest () {
+      if (Number(this.plane.planeState.questState) === 1) {
+        this.checkQuest()// 检查合法性
+      }
+      if (Number(this.plane.planeState.questState) === 4) {
+        this.publishFun('{unlock:1}')// 解锁飞机
+      }
+    },
     /**
      * @description: 正在执行的任务 重新上传航线
      */