From 6f8343496507686ad635252f3d81c69c5d4d0de3 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 10 Jul 2024 19:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A3=9E=E6=9C=BA=E6=93=8D=E4=BD=9C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=B6=20=E5=8F=96=E4=B8=80=E6=AC=A1=E9=A3=9E?=
 =?UTF-8?q?=E6=9C=BA=E7=9A=84=E7=8A=B6=E6=80=81=E7=A0=81=20=E9=A3=9E?=
 =?UTF-8?q?=E6=9C=BA=E6=9C=89=E6=9B=B4=E6=96=B0=E6=97=B6=E5=8E=BB=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E7=8A=B6=E6=80=81=E7=A0=81=20=E3=80=90=E6=8F=8F=09?=
 =?UTF-8?q?=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E4=B9=8B=E5=90=8E=20?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0=E9=A3=9E=E6=9C=BA=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 src/components/ControllerTabs.vue              | 12 +++++++++++-
 src/utils/index.js                             |  1 +
 src/views/layout/components/main/route/add.vue |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue
index 78063ea..536d182 100644
--- a/src/components/ControllerTabs.vue
+++ b/src/components/ControllerTabs.vue
@@ -70,7 +70,7 @@
               <el-button-group>
                 <el-button size="mini" class="f-s-14" v-if="planeState & 1 && airLock" key="pubBut" type="info"
                   icon="iconfont el-icon-loading" disabled>
-                  <font class="m-l-5">航线锁定</font>
+                  <font class="m-l-5">注册航线</font>
                 </el-button>
                 <el-button size="mini" class="f-s-14" v-if="planeState & 1 && !airLock" type="primary"
                   icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
@@ -639,6 +639,8 @@ export default {
     }
   },
   created () {
+    // 初始化
+    // 当站点列表 航线列表都载入之后 判断飞机的锁定状态airLock
     if (this.siteList && this.routeList) {
       this.airLock = this.siteList.some(item => {
         if (item.runing) {
@@ -648,6 +650,8 @@ export default {
         return false
       })
     }
+    // 主动获取飞机状态
+    this.publishFun('{getPlaneState:1}')
   },
   watch: {
     airLock (val) {
@@ -674,6 +678,12 @@ export default {
       if (!found) {
         this.questForm.id = ''
       }
+    },
+    plane (val) {
+      this.publishFun('{getPlaneState:1}')
+    },
+    planeState (val) {
+      console.log(val)
     }
   }
 
diff --git a/src/utils/index.js b/src/utils/index.js
index 663e637..28addc1 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,3 +1,4 @@
+
 /**
  * Parse the time to string
  * @param {(Object|string|number)} time
diff --git a/src/views/layout/components/main/route/add.vue b/src/views/layout/components/main/route/add.vue
index 5c0401d..6469604 100644
--- a/src/views/layout/components/main/route/add.vue
+++ b/src/views/layout/components/main/route/add.vue
@@ -91,7 +91,7 @@ export default {
       this.form.upFile = ''
     },
     handleUpSuccess (res) {
-      this.$refs.mapbox.makeRoute(res.content)// 绘出航线
+      this.$refs.mapbox.makeRoute(res.content.questAss)// 绘出航线
       if (res.status === 0) {
         this.fileList = []
         this.$message.error(res.msg)