diff --git a/src/assets/img/menu/zhibeizhen.png b/src/assets/img/menu/zhibeizhen.png new file mode 100644 index 0000000..aef1770 Binary files /dev/null and b/src/assets/img/menu/zhibeizhen.png differ 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 @@
+