From 94485ccf2c5fa7cc06ebd12ab5ecc9bdf936f438 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Thu, 18 Jul 2024 21:03:54 +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=9Afeat=20=E6=B7=BB=E5=8A=A0=E9=A3=9E=E6=9C=BA=E7=94=B5?=
 =?UTF-8?q?=E6=B1=A0=E5=AE=B9=E9=87=8F=E6=8E=A7=E4=BB=B6=20=E3=80=90?=
 =?UTF-8?q?=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A=E5=AE=9E=E7=8E=B0=20?=
 =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E7=94=B5=E6=B1=A0=E4=BD=BF=E7=94=A8=E7=8A=B6?=
 =?UTF-8?q?=E5=86=B5=20=E8=BF=94=E8=88=AA=E7=8A=B6=E5=86=B5=E7=AD=89=20?=
 =?UTF-8?q?=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=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

---
 package-lock.json              | 16 ++++++++++++++++
 package.json                   |  1 +
 src/components/PlaneStatus.vue | 16 ++++++++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d478e08..07c78d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,6 +28,7 @@
         "eslint-plugin-promise": "^4.2.1",
         "eslint-plugin-standard": "^4.0.0",
         "eslint-plugin-vue": "^6.2.2",
+        "geodist": "^0.2.1",
         "lodash": "^4.17.21",
         "mapbox-gl": "^2.15.0",
         "mqtt": "^2.18.9",
@@ -8135,6 +8136,15 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/geodist": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/geodist/-/geodist-0.2.1.tgz",
+      "integrity": "sha512-tZFJeHXyb203sDtn15gg2Smgfo9LZRjlbNn9F9HrJ3/W2+yqy7BzSyKuGzSxYFcofa2hsfrke5wgT/ws8jrjcw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/geojson-vt": {
       "version": "3.2.1",
       "resolved": "https://registry.npmmirror.com/geojson-vt/-/geojson-vt-3.2.1.tgz",
@@ -23580,6 +23590,12 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true
     },
+    "geodist": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/geodist/-/geodist-0.2.1.tgz",
+      "integrity": "sha512-tZFJeHXyb203sDtn15gg2Smgfo9LZRjlbNn9F9HrJ3/W2+yqy7BzSyKuGzSxYFcofa2hsfrke5wgT/ws8jrjcw==",
+      "dev": true
+    },
     "geojson-vt": {
       "version": "3.2.1",
       "resolved": "https://registry.npmmirror.com/geojson-vt/-/geojson-vt-3.2.1.tgz",
diff --git a/package.json b/package.json
index 7c90f1c..38c2757 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.2.2",
+    "geodist": "^0.2.1",
     "lodash": "^4.17.21",
     "mapbox-gl": "^2.15.0",
     "mqtt": "^2.18.9",
diff --git a/src/components/PlaneStatus.vue b/src/components/PlaneStatus.vue
index 3be393f..c8a761e 100644
--- a/src/components/PlaneStatus.vue
+++ b/src/components/PlaneStatus.vue
@@ -23,10 +23,10 @@
       <PublicTag icon="icon-gaodu" :val="plane.planeState.positionAlt" unit="米" state="normal" />
     </el-col>
     <el-col :span="2">
-      <PublicTag icon="icon-gaodu" :val="plane.planeState.fixType" unit="" state="danger" />
+      <PublicTag icon="icon-gaodu" :val="plane.planeState.currentBattery" unit="安" state="danger" />
     </el-col>
     <el-col :span="2">
-      <PublicTag icon="icon-gaodu" :val="plane.planeState.batteryRemaining" unit="米" state="danger" />
+      <PublicTag icon="icon-gaodu" :val="plane.planeState.batteryRemaining" unit="%" state="danger" />
     </el-col>
   </el-row>
 </template>
@@ -34,11 +34,13 @@
 <script>
 import HeartTag from '@/components/Tag/HeartTag'
 import PublicTag from '@/components/Tag/PublicTag'
+import geodist from 'geodist'
 
 export default {
   name: 'PlaneStatus',
   data () {
     return {
+      distance: 0
     }
   },
   props: {
@@ -54,9 +56,19 @@ export default {
   computed: {
   },
   watch: {
+    distance (val) {
+      console.log(val + '米')
+    }
   },
   methods: {},
   created () {
+    try {
+      const point1 = { lat: 52.518611, lon: 13.408056 }
+      const point2 = { lat: 51.507222, lon: -0.1275 }
+      this.distance = geodist(point1, point2, { unit: 'meters' })
+    } catch (error) {
+      console.error('Error calculating distance:', error)
+    }
   }
 }
 </script>