From 51823e0a21f696eabb0fce87afa822cb8de773b2 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 08 Feb 2025 16:22:09 +0800
Subject: [PATCH] 更换缩放图标和去除consol
---
src/assets/images/satellite.png | 0
src/views/components/ptzControl.vue | 24 ++++++++++++++++++++++--
src/assets/images/fangda.png | 0
src/views/DronePilotDetails.vue | 5 +++--
src/assets/images/stand.png | 0
src/assets/images/suoxiao.png | 0
src/views/DronePilotList.vue | 12 +++++++++++-
src/views/Login.vue | 2 +-
8 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/assets/images/fangda.png b/src/assets/images/fangda.png
new file mode 100644
index 0000000..dc82fc8
--- /dev/null
+++ b/src/assets/images/fangda.png
Binary files differ
diff --git a/src/assets/images/satellite.png b/src/assets/images/satellite.png
new file mode 100644
index 0000000..8808789
--- /dev/null
+++ b/src/assets/images/satellite.png
Binary files differ
diff --git a/src/assets/images/stand.png b/src/assets/images/stand.png
new file mode 100644
index 0000000..bb86b66
--- /dev/null
+++ b/src/assets/images/stand.png
Binary files differ
diff --git a/src/assets/images/suoxiao.png b/src/assets/images/suoxiao.png
new file mode 100644
index 0000000..0fa68ee
--- /dev/null
+++ b/src/assets/images/suoxiao.png
Binary files differ
diff --git a/src/views/DronePilotDetails.vue b/src/views/DronePilotDetails.vue
index 2fad43b..17d0c63 100644
--- a/src/views/DronePilotDetails.vue
+++ b/src/views/DronePilotDetails.vue
@@ -22,7 +22,7 @@
</div>
<div class="right-box">
<ptzControl :sn="sn" :osdVisible="sbInfo" />
- <controlConsole :sn="sn" :osdVisible="sbInfo" />
+ <controlConsole :sn="sn" :osdVisible="sbInfo" :cesiumViewe="globalViewer" />
</div>
</div>
<!-- 竖屏 -->
@@ -87,9 +87,10 @@
globalCesium,
getEntityById,
removeById,
+ loadLAYER,
} = cesiumOperation()
-const vConsole = new VConsole();
+// const vConsole = new VConsole();
let globalViewer = null
diff --git a/src/views/DronePilotList.vue b/src/views/DronePilotList.vue
index b1f0a92..001025d 100644
--- a/src/views/DronePilotList.vue
+++ b/src/views/DronePilotList.vue
@@ -57,7 +57,7 @@
// 存储设备值
let osdVisible = reactive<any>({})
-const vConsole = new VConsole();
+// const vConsole = new VConsole();
// 点击信息详情
const infoClick = (data:any) => {
@@ -101,6 +101,16 @@
}
onMounted(() => {
+
+ navigator.geolocation.getCurrentPosition(
+ (success) => {
+ console.log(success.coords.longitude, '经纬度')
+ // position.value = {
+ // latitude: success.coords.latitude,
+ // longitude: success.coords.longitude,
+ // };
+ })
+
init()
// 设置定时器，每隔 3 秒刷新一次数据
intervalId = setInterval(init, 3000);
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 406666e..fd125f1 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,7 +1,7 @@
<template>
<div class="login-warp">
<div class="top-img-bg">
- <p class="title">低空无人机监测网平台</p>
+ <p class="title">低空无人机监测网移动应用</p>
</div>
<div class="user-password-box">
<div class="username">
diff --git a/src/views/components/ptzControl.vue b/src/views/components/ptzControl.vue
index 916bab6..460f3f8 100644
--- a/src/views/components/ptzControl.vue
+++ b/src/views/components/ptzControl.vue
@@ -14,10 +14,14 @@
<img src="@/assets/images/sx-close.png"/>
</div>
<div class="btn-item" @touchstart="onZoom(true)">
- <img src="@/assets/images/fang.png" />
+ <img src="@/assets/images/fangda.png" />
</div>
<div class="btn-item" @touchstart="onZoom(false)">
- <img src="@/assets/images/suo.png" />
+ <img src="@/assets/images/suoxiao.png" />
+ </div>
+ <div class="btn-item" @touchstart="onChangeD">
+ <img v-if="is2d" src="@/assets/images/stand.png" />
+ <img v-else src="@/assets/images/satellite.png" />
</div>
</div>
<div class="circle-box" v-show="isPtz">
@@ -47,7 +51,10 @@
import { switchLivestream } from '@/api/drone'
import { usePayloadControl } from './use-payload-control'
import { useDroneControlWsEvent } from '@/utils/websocket/drone-ws-control'
+import cesiumOperation from '@/utils/cesium-tsa.js';
import { useMyStore } from '@/store'
+
+const { loadLAYER } = cesiumOperation()
const {
checkPayloadAuth,
@@ -66,6 +73,10 @@
required: true,
},
osdVisible: {
+ type: Object,
+ required: true,
+ },
+ cesiumViewe: {
type: Object,
required: true,
}
@@ -89,6 +100,9 @@
// 是否显示云台图标
let isPtz = ref(false)
+
+// 显示高德地图矢量还是影像(2D/3D)
+let is2d = ref(true)
let yaw_speed = ref((payloadCameraMode.value == 'wide'? 1 : Math.ceil(zoom_factor.value))*10) // 云台横向角度
let pitch_speed = ref((payloadCameraMode.value == 'wide'? 1 : Math.ceil(zoom_factor.value))*10) // 云台纵向角度
@@ -332,6 +346,12 @@
})
}
+const onChangeD = () => {
+ is2d.value = !is2d.value
+ store.commit('SET_MAP_SETTING_MODE', is2d.value?2:3);
+ loadLAYER();
+}
+
// 重置云台角度
const onResetGimbal = async (resetMode:any) => {
try {
--
Gitblit v1.9.3