From 074996f51f9a550013e06a929813e79162661927 Mon Sep 17 00:00:00 2001 From: tk Date: Tue, 23 Jul 2024 18:49:49 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afactor=20=E5=B9=B3=E7=A7=BB=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=B8=8B=E6=BC=82=E7=A7=BB=20?= =?UTF-8?q?=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A=E9=A3=9E?= =?UTF-8?q?=E6=9C=BA=E6=8E=A7=E5=88=B6=E6=A0=8F=E6=94=BE=E5=88=B0=E5=BA=95?= =?UTF-8?q?=E9=83=A8=20=E7=82=B9=E5=87=BB=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=85=8D=E5=90=88=E5=9C=B0=E5=9B=BE=E4=B8=8A=E7=A7=BB=20?= =?UTF-8?q?=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0=20x=20=E6=A8=AA=E7=A7=BB?= =?UTF-8?q?=20=20y=E7=BA=B5=E7=A7=BB=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?= =?UTF-8?q?=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/components/MapBox.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/MapBox.vue b/src/components/MapBox.vue index fdbd0cf..fa51d9c 100644 --- a/src/components/MapBox.vue +++ b/src/components/MapBox.vue @@ -154,8 +154,8 @@ export default { projection: 'globe' }) // 地图控件 + this.map.addControl(new mapboxgl.NavigationControl(), 'top-right') this.map.addControl(new mapboxgl.ScaleControl(), 'top-right') - this.map.addControl(new mapboxgl.NavigationControl(), 'bottom-left') }, /** * @description: 清除地图上的航线 @@ -486,11 +486,12 @@ export default { }) }, /** - * @description: 屏幕横移 - * @param {*} val 正数向左移动 负数向右移动 + * @description: 屏幕横移 纵移 + * @param {*} x 正数向左移动 负数向右移动 + * @param {*} y 正数向上移动 负数向下移动 */ - mapXOffset (val) { - this.map.panBy([val, 0], { + mapXOffset (x, y) { + this.map.panBy([x, y], { duration: 333 // 过渡持续时间，以毫秒为单位 }) } From c23aa3543c9313dc039f1f39c86f6cf54074341a Mon Sep 17 00:00:00 2001 From: tk Date: Tue, 23 Jul 2024 20:40:42 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afactor=20=E9=A3=9E=E6=9C=BA=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=20=E8=B0=83=E6=95=B4=20=E3=80=90=E5=8E=9F=20?= =?UTF-8?q?=20=E5=9B=A0=E3=80=91=EF=BC=9A=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E5=A4=A7=E5=B0=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E5=B0=B1=20=E6=A8=AA=E7=AB=96=E5=B1=8F=20=E3=80=90?= =?UTF-8?q?=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=E8=B0=83=E5=88=B0?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=20=E8=87=AA=E9=80=82=E5=BA=94=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 --- src/components/ControllerTabs copy.vue | 897 ++++++++++++++++++ src/components/ControllerTabs.vue | 249 +++-- .../layout/components/main/planes/index.vue | 14 +- 3 files changed, 1017 insertions(+), 143 deletions(-) create mode 100644 src/components/ControllerTabs copy.vue diff --git a/src/components/ControllerTabs copy.vue b/src/components/ControllerTabs copy.vue new file mode 100644 index 0000000..0b36aa8 --- /dev/null +++ b/src/components/ControllerTabs copy.vue @@ -0,0 +1,897 @@ + + + + + diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue index ad1a4e9..353918b 100644 --- a/src/components/ControllerTabs.vue +++ b/src/components/ControllerTabs.vue @@ -1,5 +1,5 @@ - -
- - -
{{ item.title }}
- - -
+ +
+ +
-
+
-
+
送餐任务
@@ -117,140 +111,148 @@
- +
- +
- +
+
+ +
+
+ +
{{ item.title }}
+
@@ -393,13 +395,13 @@ export default { if (this.tabIsOpen) { if (index !== this.activeIndex) { this.tabIsOpen = false - this.$emit('mapXOffset', -200) + this.$emit('mapXOffset', 0, -200) } else { this.speakText(voice) } } else { this.tabIsOpen = true - this.$emit('mapXOffset', 200) + this.$emit('mapXOffset', 0, 200) this.speakText(voice) } }, @@ -782,114 +784,91 @@ export default { font-weight: bold; } -.tab-container { - height: 365px; - width: 80px; - display: flex; - flex-direction: column; - align-items: flex-end; - position: fixed; - right: 15px; - top: 50%; - transform: translateY(-50%); - z-index: 1000; +.mainBox { + position: absolute; } -.butIconGroup { - color: $maintext-color; - background-color: rgba(255, 255, 255, 0.5); - border-radius: 15px; - padding: 5px; - width: 80px; - height: 80px; - text-align: center; - margin-bottom: 20px; - border: none; - box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); -} - -.butIconGroupBG { - color: $graylight-color; - background-color: $brand-color; -} - -.butIconGroup:last-of-type { - margin-bottom: 0px; -} - -.slider-container { - display: flex; - align-items: center; - /* 水平垂直居中 */ -} - -.content { - color: $maintext-color; - border-radius: 15px; +.tabContainer { + width: 100%; height: 100%; - position: fixed; - right: -400px; - top: 50%; - transform: translateY(-50%); - width: 350px; - background-color: rgba(255, 255, 255, 0.8); - padding: 20px; - box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); - transition: right 0.3s ease; } -.content.active { - right: 95px; +.tabContent { + z-index: 90; + position: relative; + width: 100%; + border-radius: 10px; + max-width: 470px; + background-color: rgba(255, 255, 255, 0.8); + box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); + top: -50px; + opacity: 0; + transition: top 0.5s ease, opacity 1s ease; +} + +.tabContent.active { + top: -10px; + opacity: 1; +} + +.tabContentBox { + padding: 20px; } .contentTit i { vertical-align: middle; } +.butIconBox { + flex-wrap: wrap; + /* 允许换行 */ + justify-content: flex-start; + /* 主轴对齐方式 */ + align-content: space-around; + /* 多行在侧轴上的对齐方式 */ +} + .butIcon { border-radius: 10px; - padding: 5px; - width: 66px; - height: 66px; text-align: center; border: none; - float: left; - margin: 0px !important; - margin-bottom: 15px !important; - margin-right: 15px !important; + margin-left: 0px !important; } -.butIconBox .butIcon:nth-child(4n) { - margin-right: 0 !important; +.taButGroup { + position: relative; + width: 100%; + max-width: 470px; + height: 105px; + cursor: pointer; + z-index: 90; } -/* 手机端样式 */ -@media screen and (max-height: 500px) { +@media (max-width: 480px) { + .taButGroup { + height: calc((100vw - 50px)/4); + } + .tab-container { - height: 300px; - width: 50px; + width: 100vw; } +} - .butIconGroup { - margin-bottom: 12px; - } +.taBut { + color: $maintext-color; + background-color: rgba(255, 255, 255, 0.5); + border-radius: 10px; + padding: 5px; + text-align: center; + box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); +} - .el-button { - font-size: 14px !important; - } +.taButBG { + color: $graylight-color; + background-color: $brand-color; +} - .contentTit { - font-size: 14px !important; - margin-bottom: 5px !important; - } - - .contentTit i { - font-size: 18px !important; - } - - .butIcon { - height: 56px; - margin-bottom: 10px !important; - } +.gap10 { + gap: 10px; } diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue index bee277a..9779d57 100644 --- a/src/views/layout/components/main/planes/index.vue +++ b/src/views/layout/components/main/planes/index.vue @@ -3,8 +3,7 @@ @@ -13,8 +12,7 @@ - - diff --git a/src/components/ControllerTabs copy.vue b/src/components/ControllerTabs copy.vue deleted file mode 100644 index 0b36aa8..0000000 --- a/src/components/ControllerTabs copy.vue +++ /dev/null @@ -1,897 +0,0 @@ - - - - - From 747a2cf34e8b7f5ac5b45bff67e0cb3beb12bf9c Mon Sep 17 00:00:00 2001 From: tk Date: Tue, 23 Jul 2024 21:11:36 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afeat=20=E7=94=B5=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?= =?UTF-8?q?=EF=BC=9A=E6=98=BE=E7=A4=BA=E7=94=B5=E9=87=8F=E6=80=BB=E9=87=8F?= =?UTF-8?q?=20=E5=89=A9=E4=BD=99=E9=87=8F=20=20=E8=BF=94=E8=88=AA=E7=82=B9?= =?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 --- src/components/BatteryStatus.vue | 43 +++++++++++++++++++ .../layout/components/main/planes/index.vue | 5 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 src/components/BatteryStatus.vue diff --git a/src/components/BatteryStatus.vue b/src/components/BatteryStatus.vue new file mode 100644 index 0000000..2a84ed3 --- /dev/null +++ b/src/components/BatteryStatus.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue index 9779d57..bf36d88 100644 --- a/src/views/layout/components/main/planes/index.vue +++ b/src/views/layout/components/main/planes/index.vue @@ -2,6 +2,7 @@
@@ -13,6 +14,7 @@ import mqtt from '@/utils/mqtt' import MapBox from '@/components/MapBox' import ControllerTabs from '@/components/ControllerTabs' +import BatteryStatus from '@/components/BatteryStatus' // import PlaneStatus from '@/components/PlaneStatus' export default { @@ -26,7 +28,8 @@ export default { }, components: { MapBox, - ControllerTabs + ControllerTabs, + BatteryStatus // PlaneStatus }, computed: { From 8cd9c2ba162bf0fcef84308088f354c9f7c8552a Mon Sep 17 00:00:00 2001 From: tk Date: Wed, 24 Jul 2024 16:42:52 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afeat=20=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=20=E8=B7=9F=E9=9A=8F=20=E6=8E=A7=E4=BB=B6=20=E3=80=90=E5=8E=9F?= =?UTF-8?q?=20=20=E5=9B=A0=E3=80=91=EF=BC=9A=20=E3=80=90=E8=BF=87=20=20?= =?UTF-8?q?=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?= =?UTF-8?q?=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/components/MapBox.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/MapBox.vue b/src/components/MapBox.vue index fa51d9c..3c447d2 100644 --- a/src/components/MapBox.vue +++ b/src/components/MapBox.vue @@ -154,8 +154,21 @@ export default { projection: 'globe' }) // 地图控件 - this.map.addControl(new mapboxgl.NavigationControl(), 'top-right') - this.map.addControl(new mapboxgl.ScaleControl(), 'top-right') + this.map.addControl(new mapboxgl.NavigationControl(), 'top-right')// 移动旋转指南针 + // this.map.addControl(new mapboxgl.ScaleControl(), 'top-right')// 地图比例 + this.map.addControl(new mapboxgl.FullscreenControl(), 'top-right')// 全屏 + // Add geolocate control to the map. + this.map.addControl( + new mapboxgl.GeolocateControl({ + positionOptions: { + enableHighAccuracy: true + }, + // When active the map will receive updates to the device's location as it changes. + trackUserLocation: true, + // Draw an arrow next to the location dot to indicate which direction the device is heading. + showUserHeading: true + }) + ) }, /** * @description: 清除地图上的航线 From 032e5530c4a75631c9af52db1ed48823435ca98c Mon Sep 17 00:00:00 2001 From: tk Date: Wed, 24 Jul 2024 16:43:52 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afeat=20=E5=A2=9E=E5=8A=A0=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E6=B7=B1=E5=BA=A6=20=E6=A0=B7=E5=BC=8F=20=E3=80=90=E5=8E=9F=20?= =?UTF-8?q?=20=E5=9B=A0=E3=80=91=EF=BC=9A=E8=A7=86=E5=9B=BE=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=20=E7=94=A8=E7=9A=84=E5=A4=AA=E5=A4=9A=20=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F?= =?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/styles/index.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/index.scss b/src/styles/index.scss index ac0eaf8..9ccbb21 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -65,6 +65,9 @@ label { .disno{ display: none; } +.z90{ + z-index: 90; +} .animation { -webkit-transition: all 0.2s ease; From 0d2c74bfed954af8d274904d50e354de09fe2c11 Mon Sep 17 00:00:00 2001 From: tk Date: Wed, 24 Jul 2024 16:45:05 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afix=20=E7=94=B5=E9=87=8F=E7=BB=84=E4=BB=B6=20?= =?UTF-8?q?=E6=9C=AA=E6=8B=BF=E5=88=B0=E9=A3=9E=E6=9C=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=20=20=E6=B8=B2=E6=9F=93=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?= =?UTF-8?q?=EF=BC=9A=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E8=A7=86=E5=9B=BE=20=E3=80=90=E8=BF=87=20=20?= =?UTF-8?q?=E7=A8=8B=E3=80=91=EF=BC=9A=E7=BB=99=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=20=20=E6=8B=BF=E5=88=B0=E6=95=B0=E6=8D=AE=E5=9C=A8=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E8=A7=86=E5=9B=BE=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?= =?UTF-8?q?=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/components/BatteryStatus.vue | 53 +++++++++++++++---- .../layout/components/main/planes/index.vue | 6 +-- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/components/BatteryStatus.vue b/src/components/BatteryStatus.vue index 2a84ed3..a4336ae 100644 --- a/src/components/BatteryStatus.vue +++ b/src/components/BatteryStatus.vue @@ -1,10 +1,12 @@ @@ -18,6 +20,37 @@ export default { return { } }, + computed: { + // 电池剩余电量值 mah + batteryRemainingPower () { + // 检查 this.plane 是否存在，以及 this.plane.planeState 是否存在 + if (this.plane && this.plane.planeState) { + const battCapacity = this.plane.planeState.battCapacity + const batteryRemaining = this.plane.planeState.batteryRemaining + // 检查 battCapacity 和 batteryRemaining 是否有效 + if (battCapacity !== undefined && batteryRemaining !== undefined) { + return (battCapacity / 100) * batteryRemaining + } + } + // 如果上述检查未通过，返回 null + return null + }, + // 剩余电量 百分比 + batteryRemaining () { + if (this.plane && this.plane.planeState && this.plane.planeState.batteryRemaining !== undefined) { + const remaining = this.plane.planeState.batteryRemaining + if (remaining < 0) { + return 0 + } else if (remaining > 100) { + return 100 + } else { + return Number(remaining) + } + } + return 0 + } + + }, props: { plane: { typeof: 'Object', @@ -26,6 +59,8 @@ export default { }, components: { Tooltip + }, + created () { } } @@ -34,10 +69,6 @@ export default { @import "@/styles/theme.scss"; .batteryBar { - z-index: 90; -} - -.rtlMark { - z-index: 90; + position: absolute; } diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue index bf36d88..c109036 100644 --- a/src/views/layout/components/main/planes/index.vue +++ b/src/views/layout/components/main/planes/index.vue @@ -3,7 +3,6 @@ @@ -15,7 +14,6 @@ import mqtt from '@/utils/mqtt' import MapBox from '@/components/MapBox' import ControllerTabs from '@/components/ControllerTabs' import BatteryStatus from '@/components/BatteryStatus' -// import PlaneStatus from '@/components/PlaneStatus' export default { name: 'Planes', @@ -30,7 +28,6 @@ export default { MapBox, ControllerTabs, BatteryStatus - // PlaneStatus }, computed: { plane () { @@ -105,8 +102,7 @@ export default { plane: { handler (val) { this.makePlane(val)// 有飞机数据之后 在地图上创建飞机 - if (val.planeState.battCapacity === null) { - console.log(val.planeState.battCapacity) + if (!val.planeState.battCapacity) { mqtt.publishFun(`cmd/${this.plane.macadd}`, '{"getBattCapacity":1}')// 发送设置飞机状态主题 请求飞控返回 电池总容量 } }, From 7490cff74de77c33641254fdcf7d44ff1a688e63 Mon Sep 17 00:00:00 2001 From: tk Date: Wed, 24 Jul 2024 18:16:03 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9Afeat=20=E7=94=B5=E9=87=8F=E6=9D=A1=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=20=E5=8F=98=E8=89=B2=E5=8A=9F=E8=83=BD=20=E3=80=90?= =?UTF-8?q?=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A=E8=B5=B7=E8=AD=A6?= =?UTF-8?q?=E7=A4=BA=E4=BD=9C=E7=94=A8=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B?= =?UTF-8?q?=E3=80=91=EF=BC=9A=E5=BD=93=E5=89=8D=E7=94=B5=E9=87=8F=E8=B6=8A?= =?UTF-8?q?=E6=8E=A5=E8=BF=91=E8=BF=94=E8=88=AA=E6=89=80=E9=9C=80=E7=94=B5?= =?UTF-8?q?=E9=87=8F=20=E9=A2=9C=E8=89=B2=E8=B6=8A=E7=BA=A2=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 --- src/components/BatteryStatus.vue | 48 +++++++++++++++++++++++++++----- src/components/MapBox.vue | 26 +++++++++++++++-- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/src/components/BatteryStatus.vue b/src/components/BatteryStatus.vue index a4336ae..3a33557 100644 --- a/src/components/BatteryStatus.vue +++ b/src/components/BatteryStatus.vue @@ -1,11 +1,12 @@