diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue index 9d87245..df22619 100644 --- a/ruoyi-ui/src/views/board/GPS/index.vue +++ b/ruoyi-ui/src/views/board/GPS/index.vue @@ -413,7 +413,7 @@ export default { offset: new AMap.Pixel(-15, -30), content: `
- + diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue index 389ef5f..d9be6af 100644 --- a/ruoyi-ui/src/views/board/index/index.vue +++ b/ruoyi-ui/src/views/board/index/index.vue @@ -781,7 +781,7 @@ export default { title: `信息\n经度:${e.longitude}\n纬度:${e.latitude}\n名称:${e.deviceName}\n`, offset: new AMap.Pixel(-15, -30), content: `
- +
` }); marker.on('click', async () => { @@ -852,8 +852,11 @@ export default { map.remove(circles) console.log(data) data.forEach(e=>{ - this.setMarker(e) + if(e.latitude && e.longitude){ + this.setMarker(e) + } }) + map.setFitView(markers) }, exTable(){ exTableData({}, '告警信息') diff --git a/ruoyi-ui/src/views/board/senso/index.vue b/ruoyi-ui/src/views/board/senso/index.vue index fd1603f..a2f4c3e 100644 --- a/ruoyi-ui/src/views/board/senso/index.vue +++ b/ruoyi-ui/src/views/board/senso/index.vue @@ -423,7 +423,7 @@ export default {