diff --git a/src/components/GMap.vue b/src/components/GMap.vue index 013720e..db81615 100644 --- a/src/components/GMap.vue +++ b/src/components/GMap.vue @@ -22,125 +22,127 @@
-
- {{ osdVisible.callsign }} - -
-
-
- -
- - {{ osdVisible.model }} -
-
+
+
+ {{ osdVisible.callsign }} +
-
- - {{ EModeCode[deviceInfo.device.mode_code] }} - - - - - HD - {{ deviceInfo.gateway?.transmission_signal_quality }} - - - - - - {{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ? deviceInfo.gateway.capacity_percent + ' %' : deviceInfo.gateway.capacity_percent }} - - +
+
+ +
+ + {{ osdVisible.model }} +
+
+
+
+ + {{ EModeCode[deviceInfo.device.mode_code] }} + + + + + HD + {{ deviceInfo.gateway?.transmission_signal_quality }} + + + + + + {{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ? deviceInfo.gateway.capacity_percent + ' %' : deviceInfo.gateway.capacity_percent }} + + - - - - {{ deviceInfo.device.battery.capacity_percent !== str ? deviceInfo.device.battery.capacity_percent + ' %' : deviceInfo.device.battery.capacity_percent }} - - - - - - - Fixed - + + + + {{ deviceInfo.device.battery.capacity_percent !== str ? deviceInfo.device.battery.capacity_percent + ' %' : deviceInfo.device.battery.capacity_percent }} + - - - - GPS - {{ deviceInfo.device.position_state.gps_number }} - - - - - - {{ deviceInfo.device.position_state.rtk_number }} - - - - - - - - {{ EGear[deviceInfo.device.gear] }} - - - - - ASL - {{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + ' m'}} - - - - - ALT - {{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) + ' m' }} - - - - - H - {{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m' }} - - - - - - - H.S - {{ deviceInfo.device.horizontal_speed === str ? str : deviceInfo.device.horizontal_speed.toFixed(2) + ' m/s'}} - - - - - V.S - {{ deviceInfo.device.vertical_speed === str ? str : deviceInfo.device.vertical_speed.toFixed(2) + ' m/s'}} - - - - - W.S - {{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed / 10).toFixed(2) + ' m/s'}} - - - + + + + + Fixed + + + + + + GPS + {{ deviceInfo.device.position_state.gps_number }} + + + + + + {{ deviceInfo.device.position_state.rtk_number }} + + + + + + + + {{ EGear[deviceInfo.device.gear] }} + + + + + ASL + {{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + ' m'}} + + + + + ALT + {{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) + ' m' }} + + + + + H + {{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m' }} + + + + + + + H.S + {{ deviceInfo.device.horizontal_speed === str ? str : deviceInfo.device.horizontal_speed.toFixed(2) + ' m/s'}} + + + + + V.S + {{ deviceInfo.device.vertical_speed === str ? str : deviceInfo.device.vertical_speed.toFixed(2) + ' m/s'}} + + + + + W.S + {{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed / 10).toFixed(2) + ' m/s'}} + + + +
-
-
-
-
-
-
-
-
- {{ Math.floor(deviceInfo.device.battery.remain_flight_time / 60) }}: - {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }} +
+
+
+
+
+
+
+ {{ Math.floor(deviceInfo.device.battery.remain_flight_time / 60) }}: + {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }} +
+
+
+
直播视频
-
-
-
直播视频
@@ -148,6 +150,9 @@
+
@@ -902,10 +907,13 @@ export default defineComponent({ left: 10px; top: 10px; width: 480px; - background: #000; + /* background: #000; */ color: #fff; border-radius: 2px; - opacity: 0.8; + /* opacity: 0.8; */ +} +.live{ + background: #000; } .osd > div:not(.dock-control-panel) { margin-top: 5px; diff --git a/src/hooks/use-g-map-cover.ts b/src/hooks/use-g-map-cover.ts index c288fe4..9631783 100644 --- a/src/hooks/use-g-map-cover.ts +++ b/src/hooks/use-g-map-cover.ts @@ -94,7 +94,7 @@ export function useGMapCover () { // console.log(dis) store.state.Layers.forEach(item => { item.elements.forEach(item2 => { - if (item2.id == data.id) { + if (item2.id === data.id) { item2.around = dis } }) @@ -158,7 +158,7 @@ export function useGMapCover () { // console.log(store.state.Layers) store.state.Layers.forEach(item => { item.elements.forEach(item2 => { - if (item2.id == data.id) { + if (item2.id === data.id) { item2.area = area item2.around = around }