From df9379ecf4dba43b6155bb6d9e179e23ed323bf5 Mon Sep 17 00:00:00 2001
From: szdot <szdot@qq.com>
Date: Fri, 20 Jun 2025 09:06:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=E7=A6=81=E9=A3=9E?=
 =?UTF-8?q?=E5=8C=BA=E6=95=B0=E6=8D=AE=20=E5=90=8E=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=20=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=9A=82=E6=97=B6=E5=8F=96=E6=B6=88=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=8E=A9=E7=A6=81=E9=A3=9E=E5=8C=BA=20=E5=88=B7=E6=96=B0=20?=
 =?UTF-8?q?=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
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/assets/svg/civil.svg                      | 16 +++++
 src/components/ControllerTabs.vue             |  2 -
 src/views/layout/components/main/home/set.vue | 59 +------------------
 .../layout/components/main/planes/index.vue   | 25 +++-----
 src/views/layout/index.vue                    |  4 +-
 5 files changed, 27 insertions(+), 79 deletions(-)
 create mode 100644 src/assets/svg/civil.svg

diff --git a/src/assets/svg/civil.svg b/src/assets/svg/civil.svg
new file mode 100644
index 0000000..d6ff4f7
--- /dev/null
+++ b/src/assets/svg/civil.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F15A29;}
+</style>
+<path class="st0" d="M124.5,80.4l-1.9-4.7c-0.5-1.2-1.4-2.2-2.6-2.9L87.5,55.8L86,55c0.2-2.1,0.3-4.9,0.3-7l0-1.6
+	c0-0.9-1.7-1.6-3.9-1.6c-2.1,0-3.9,0.7-3.9,1.6l0,1.5c0,1,0,2.1,0.1,3.2l-7.2-3.8l0-19.2c0-3.8-0.8-7.6-2.3-11.1L66.1,10
+	c-0.8-1.9-3.4-1.9-4.2,0l-3.1,7.2c-1.5,3.5-2.3,7.3-2.3,11.1l0,19.2l-7.2,3.8c0-1.1,0.1-2.3,0.1-3.2l0-1.5c0-0.9-1.7-1.6-3.9-1.6
+	c-2.1,0-3.9,0.7-3.9,1.6l0,1.6c0,2.1,0.1,4.9,0.3,7l-1.5,0.8L8,72.9c-1.2,0.6-2.1,1.6-2.6,2.9l-1.9,4.7c-0.2,0.4,0.2,0.8,0.6,0.7
+	l35.1-10.9c2-0.6,4-0.9,6-1l11.2-0.3l0,18.2c0,2.5,0.3,5,0.9,7.5l1.4,6.8l-15.3,9.9c-1.1,0.7-1.8,1.9-1.8,3.2l0,2c0,0,0.1,0,0.1,0.1
+	l18.6-5.2c0.3-0.1,0.5,0.1,0.6,0.3l2.1,7c0.3,0.9,1.5,0.9,1.8,0l2.1-7c0.1-0.3,0.4-0.4,0.6-0.3l18.6,5.2c0,0,0.1,0,0.1-0.1l0-2
+	c0-1.3-0.7-2.5-1.7-3.2l-15.3-9.9l1.4-6.8c0.6-2.4,0.9-5,0.9-7.5l0-18.2l11.2,0.3c2.1,0.1,4.1,0.4,6,1l35.1,10.9
+	C124.3,81.2,124.7,80.8,124.5,80.4z"/>
+</svg>
diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue
index 320ef09..bc14c75 100644
--- a/src/components/ControllerTabs.vue
+++ b/src/components/ControllerTabs.vue
@@ -976,8 +976,6 @@ export default {
      * @param {*} item 对应下拉框的任务
      */
     isWaring (item) {
-      console.error('当前飞机ID：', item.total_weight)
-
       const isOverWaight = Number(item.total_weight) >= Number(this.plane.weight_max)// 是否超重
       const isQuestIng = (item.runing ?? '').split(',').some(i => i !== '') // 是否有飞机正在执行
       return isOverWaight || isQuestIng
diff --git a/src/views/layout/components/main/home/set.vue b/src/views/layout/components/main/home/set.vue
index 4edb614..bca859a 100644
--- a/src/views/layout/components/main/home/set.vue
+++ b/src/views/layout/components/main/home/set.vue
@@ -1,74 +1,17 @@
 <template>
   <div class="h-100">
-    <map-box ref="mapbox"/>
   </div>
 </template>
 
 <script>
-import MapBox from '@/components/MapBox'
 
 export default {
-  name: 'Home',
+  name: 'Set',
   data () {
     return {
     }
   },
   components: {
-    MapBox
-  },
-  computed: {
-    airList () {
-      return this.$store.state.airList
-    },
-    /**
-     * @description: 侧边栏显隐
-     */
-    isCollapse () {
-      return this.$store.state.app.isCollapse
-    }
-  },
-  methods: {
-    /**
-     * @description: 创建飞机图标
-     */
-    makePlanes (planes) {
-      this.$refs.mapbox.removePlanes()// 先清除画布上现有的飞机
-      planes.forEach((plane, index) => { // 创建所有飞机
-        let planeDefaultLonLat
-        if (localStorage.getItem(plane.name) !== null) { // 从本地缓存 拿飞机得初始位置
-          planeDefaultLonLat = JSON.parse(localStorage.getItem(plane.name))
-          plane.lon = planeDefaultLonLat.lon
-          plane.lat = planeDefaultLonLat.lat
-        } else {
-          plane.lon = 0
-          plane.lat = 0
-        }
-        this.$refs.mapbox.makePlane(plane, index)
-      })
-    }
-  },
-  mounted () {
-    if (this.airList.length > 0) {
-      this.makePlanes(this.airList)// 创建飞机图标
-    }
-  },
-  watch: {
-    /**
-     * @description: 飞机列表更新时候 更新地图
-     */
-    airList: {
-      handler (val) {
-        this.makePlanes(val)
-      }
-    },
-    /**
-     * @description: 侧边栏显隐
-     */
-    isCollapse () {
-      return this.$store.state.app.isCollapse
-    }
-  },
-  destroyed () {
   }
 }
 </script>
diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue
index c3ce0d7..55109f2 100644
--- a/src/views/layout/components/main/planes/index.vue
+++ b/src/views/layout/components/main/planes/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="h-100">
     <!-- 地图组件 -->
-    <map-box ref="mapbox" v-if="showMapbox" :enableShowNofly="true" :enableGuided="true" :enableFollow="true" :enblueScale="!$store.state.app.isWideScreen"
-      @longPress="handleLongPress" :key="mapboxKey">
+    <map-box ref="mapbox" :enableShowNofly="true" :enableGuided="true" :enableFollow="true" :enblueScale="!$store.state.app.isWideScreen"
+      @longPress="handleLongPress">
       <template #content>
         <BatteryStatus :plane="plane" />
         <PlaneStatus :plane="plane" />
@@ -119,8 +119,8 @@ export default {
         plane.lon = planeDefaultLonLat.lon
         plane.lat = planeDefaultLonLat.lat
       } else {
-        plane.lon = 0
-        plane.lat = 0
+        plane.lon = 100
+        plane.lat = 40
       }
       this.$refs.mapbox.removePlanes()// 先清除画布上现有的飞机
       this.$refs.mapbox.makePlane(plane)// 创建飞机
@@ -165,7 +165,7 @@ export default {
   },
   watch: {
     plane (val) {
-      this.makePlane(val)// 有飞机数据之后 在地图上创建飞机
+      if (val) this.makePlane(val)// 有飞机数据之后 在地图上创建飞机
     },
     /**
      * @description: 更新飞机位置 并画出轨迹 跟随飞机
@@ -185,24 +185,15 @@ export default {
       },
       deep: true
     },
-    noflyData: {
-      deep: true,
-      immediate: true,
-      handler () {
-        this.showMapbox = false
-        this.$nextTick(() => {
-          this.mapboxKey++
-          this.showMapbox = true
-        })
-      }
-    },
     /**
      * @description: 侧边栏缩进有变化时 地图重新自适应
      */
     isCollapse: {
       handler (val) {
         if (val) {
-          this.$refs.mapbox.handleResize()
+          this.$nextTick(() => {
+            this.$refs.mapbox.handleResize()
+          })
         }
       }
     }
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 2edbd37..82edc52 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -101,8 +101,6 @@ export default {
     }
   },
   mounted () {
-    /* mqtt */
-    mqtt.mqttConf()// 连接mqtt
   },
   created () {
     /* init */
@@ -126,6 +124,8 @@ export default {
      * @param {*} res 飞机列表
      */
     airList (res) {
+      /* mqtt */
+      mqtt.mqttConf()// 连接mqtt
       // 订阅飞机信息
       mqtt.doSubscribe('planeState/+', (mqttRes) => {
         res.forEach(plane => {

From 24843b32643c7bc85972a8b53af0e55961e99f6c Mon Sep 17 00:00:00 2001
From: szdot <szdot@qq.com>
Date: Fri, 20 Jun 2025 09:40:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
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/views/layout/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 82edc52..3f81549 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -208,6 +208,12 @@ export default {
           }
         })
       })
+      // 订阅ADSB信息
+      mqtt.doSubscribe('ADSB/+', (res) => {
+        if (res.topic.indexOf('ADSB') > -1) {
+
+        }
+      })
       // 订阅对频
       mqtt.doSubscribe('crosFrequency/+', (res) => {
         if (res.topic.indexOf('crosFrequency') > -1) {