From 5de70d6b3e6faa7cd2bf6c3b30d99c58207947c6 Mon Sep 17 00:00:00 2001 From: liqi <1174845810@qq.com> Date: Thu, 24 Apr 2025 20:55:18 +0800 Subject: [PATCH] 1 --- src/assets/img/menu/zhibeizhen.png | Bin 0 -> 6967 bytes src/views/contentData/LeftSidebar/index.vue | 4 ---- src/views/contentData/index.js | 24 ++++++++++++-------- src/views/mapControl/index.vue | 10 +++++--- 4 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 src/assets/img/menu/zhibeizhen.png diff --git a/src/assets/img/menu/zhibeizhen.png b/src/assets/img/menu/zhibeizhen.png new file mode 100644 index 0000000000000000000000000000000000000000..aef177029785fe21d103cd0994e351cfb9d0a1f0 GIT binary patch literal 6967 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 literal 0 HcmV?d00001 diff --git a/src/views/contentData/LeftSidebar/index.vue b/src/views/contentData/LeftSidebar/index.vue index 6cc4a08..224112a 100644 --- a/src/views/contentData/LeftSidebar/index.vue +++ b/src/views/contentData/LeftSidebar/index.vue @@ -173,7 +173,6 @@ export default { } }); } else { - console.log("无告警"); this.iswarning = false; if (media) { media.pause(); // 无告警时停止播放 @@ -270,9 +269,7 @@ export default { this.isContracted = !this.isContracted; // 切换状态 }, handleDroneClick(value) { - console.log(value, "value"); if (value.drone_lon == 0 || value.drone_lat == 0) { - console.log("经纬度为0"); } else { window.marsMap.setCameraView({ lat: value.drone_lat, @@ -287,7 +284,6 @@ export default { // 取出对应无人机的轨迹列表 if (value.BatchId === car.id) { // car.openPopup(); - console.log(car, "car.polyline"); car.polyline.show = !car.polyline.show; // 轨迹线 } }); diff --git a/src/views/contentData/index.js b/src/views/contentData/index.js index ae075eb..5c4e7f8 100644 --- a/src/views/contentData/index.js +++ b/src/views/contentData/index.js @@ -161,13 +161,15 @@ export function allDevices(options, type, show) { graphicLayer.addGraphic(graphic); } else { graphic.show = show; - graphic.setOptions({ - position: new mars3d.LngLatPoint( - deviceItem.lon, - deviceItem.lat, - 0 - ) - }); + if (deviceItem.icon === "9") { + graphic.setOptions({ + position: new mars3d.LngLatPoint( + deviceItem.lon, + deviceItem.lat, + 0 + ) + }); + } } }); } @@ -201,9 +203,11 @@ export function allDevices(options, type, show) { graphicLayer.addGraphic(graphic); } else { graphic.show = show; - graphic.setOptions({ - position: new mars3d.LngLatPoint(deviceItem.lon, deviceItem.lat, 0) - }); + if (deviceItem.icon === "9") { + graphic.setOptions({ + position: new mars3d.LngLatPoint(deviceItem.lon, deviceItem.lat, 0) + }); + } } }); } diff --git a/src/views/mapControl/index.vue b/src/views/mapControl/index.vue index 56a9373..8bf7576 100644 --- a/src/views/mapControl/index.vue +++ b/src/views/mapControl/index.vue @@ -3,7 +3,7 @@
当前缩放等级: {{ zoomLevel }}
- +
@@ -108,9 +108,9 @@ export default { window.marsMap.setCameraView({ lat: currentView.lat, lng: currentView.lng, - alt: currentView.alt, + alt: currentView.alt <= 100 ? 8000 : currentView.alt, heading: 0, // 指北 - pitch: currentView.pitch, + pitch: -90, roll: currentView.roll }); } @@ -138,6 +138,10 @@ export default { bottom: 5%; right: 25%; cursor: pointer; + img { + width: 35px; + height: 35px; + } } }