From 2d445a7f255343099b4647ea5ce51d2980768003 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 28 Sep 2023 16:45:41 +0800
Subject: [PATCH] fix:立行立改
---
src/components/Wind/Map.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index 1f6858f..a479499 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -479,7 +479,13 @@
},
mounted() {
this.currentHour()
- this.$Bus.$on('alarmTableVisible', (res) => (this.alarmTableVisible = res))
+ this.$Bus.$on(
+ 'alarmTableVisible',
+ (res) => (
+ (this.alarmTableVisible = res),
+ this.alertData(this.PageSize, this.currentPage)
+ )
+ )
// ���������������������
this.initMap()
@@ -496,7 +502,7 @@
this.getParamsData()
this.windDir()
this.newDate()
- this.alertData(this.PageSize, this.currentPage)
+ // this.alertData(this.PageSize, this.currentPage)
},
beforeDestroy() {
if (this.timer) {
@@ -1013,7 +1019,7 @@
},
}).then((data) => {
// console.log('���������������������')
- console.log(data,'tata')
+ console.log(data, 'tata')
that.loading = false
this.markDeviceSite(data)
})
@@ -1334,7 +1340,7 @@
iconUrl: require('@/assets/icon/ico' + colorNum + '.png'),
// iconUrl: require('@/assets/icon/ico2.png'),
iconSize: [60, 60],
- iconAnchor: [13, 21],
+ iconAnchor: [30, 48],
className: 'my-device',
})
// ���������������������
@@ -1345,7 +1351,8 @@
var myIcon = L.divIcon({
html: this.keys[i],
className: 'my-div-icon',
- iconSize: 30,
+ iconSize: [60, 60],
+ iconAnchor: [40, 40],
})
var marker = L.marker([lat, lng], { icon: myIcon }).addTo(group)
// ������������������������������������mouseover���������������
@@ -1368,6 +1375,11 @@
},
})
.then((res) => {
+ if (res.message == '���������������������') {
+ var datafalse = '���������������������'
+ this.bindPopup(datafalse).openPopup()
+ return
+ }
for (const key in res.data) {
var tempDecimal = res.data[key]
.replace(/[^\d.]/g, '')
@@ -2112,4 +2124,9 @@
background-color: #ff0000 !important;
color: #790000 !important;
}
+.leaflet-marker-icon.leaflet-interactive {
+ pointer-events: auto;
+ margin-left: -45px;
+ margin-top: -40px;
+}
</style>
--
Gitblit v1.8.0