修改地图标点

ruoyi-ui/.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+hwsaas/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

ruoyi-ui/src/views/board/index/index.vue

@@ -358,6 +358,8 @@
 </template>
 
 <script>
+// import gif from '@/assets/board/index/gif.gif'
+import gif from '@/assets/board/index/dot.png'
 import containerPic from "@/assets/board/index/container.png";
 import Chart from "@/components/Charts/Chart";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -548,7 +550,7 @@ export default {
     }
   },
   async mounted() {
-    getTenantData(this.$store.getters.tenantId).then(e => {
+    await getTenantData(this.$store.getters.tenantId).then(e => {
       this.isMap = e.data.tenantField === '2';
       this.picUrl = e.data.tenantBoardPic
       this.code = parseFloat(e.data.tenantMapCode) || 620000
@@ -931,7 +933,7 @@ export default {
           let data = await axios.get(`https://geo.datav.aliyun.com/areas_v3/bound/${this.code}_full.json`)
           mapData = this.cityJson[params.dataIndex].properties.adcode === 100000 ? ChinaMapData : data.data
         }
-        this.getMap(mapData)
+        await this.getMap(mapData)
       })
       this.$refs.mapChart.$el.addEventListener('dblclick', () => {
         this.chartDblClick(this.code)
@@ -1023,10 +1025,10 @@ export default {
       let marker = new AMap.Marker({
         position: [e.longitude, e.latitude],
         title: `信息\n经度：${e.longitude}\n纬度：${e.latitude}\n名称：${e.deviceName}\n`,
-        offset: new AMap.Pixel(-15, -30),
+        offset: new AMap.Pixel(-20, -40),
-        content: `<div> <svg t="1718261114618" class="icon" viewBox="0 0 1024 1024"  xmlns="http://www.w3.org/2000/svg" p-id="4305" style="width: 30px;height: 30px;">
+        content: `<div>
- <path fill="${(e.ifAlarm === '1') ? '#3D93FD' : '#ff0000'}" style="animation:an1 2s ease-in-out infinite;" d="M512 64.5c-180.5 0-326.9 146.4-326.9 326.9 0 63.3 18 122.3 49.2 172.4 1.1 2 2.1 4 3.2 5.9 34.9 58.2 113.9 128.8 165.5 194.5 66.3 84.4 93.2 158 93.2 158 1.6 1.4 13.1 35.6 15.1 35.8 2.5 0.2 12.6-34 14.5-35.8 0 0 22-69.2 83.7-146.6 56-70.1 142.8-145.7 177-206 0.9-1.6 1.8-3.3 2.6-5 31.5-50.2 49.7-109.6 49.7-173.3 0.1-180.5-146.3-326.8-326.8-326.8z" p-id="4306">
+<img src="${gif}" alt="" width=" 40px" style="animation:an1 2s ease-in-out infinite;"  >
-</path></svg></div>`
+</div>`
       });
       marker.on('click', async () => {
         if (markerIds.includes(e.deviceId)) {