From 00e99028a381a8d15e0b24e6a778fd16a74ce4aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 16:16:05 +0800
Subject: [PATCH] 地图

---
 src/views/screen/components/map3.vue |   50 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/screen/components/map3.vue b/src/views/screen/components/map3.vue
index 980033a..5bbb92d 100644
--- a/src/views/screen/components/map3.vue
+++ b/src/views/screen/components/map3.vue
@@ -41,7 +41,7 @@
         },
         {
           name: '娌挎哗鍖�',
-          value: [104.80804, 29.100594, 300],
+          value: [104.80504, 29.050594, 300],
           platformOnline: true
         },
         {
@@ -63,37 +63,51 @@
       markData: [
         {
           name: '鑷祦浜曞尯',
-          number: '0',
-          value: [104.821471408, 29.950000, 300]
+          video: '0',
+          car: '0',
+          face: '0',
+          value: [104.911471408, 30.100000, 300]
         },
         {
           name: '楂樻柊鍖�',
-          number: '0',
+          video: '0',
+          car: '0',
+          face: '0',
           value: [104.867237686031, 29.39548885792289, 300]
         },
         {
           name: '澶у畨鍖�',
-          number: '0',
-          value: [105.25337686031, 29.57948885792289, 300]
+          video: '0',
+          car: '0',
+          face: '0',
+          value: [105.12337686031, 29.38948885792289, 300]
         },
         {
           name: '娌挎哗鍖�',
-          number: '0',
-          value: [105.30237686031, 30.20048885792289, 300]
+          video: '0',
+          car: '0',
+          face: '0',
+          value: [105.40537686031, 30.20048885792289, 300]
         },
         {
           name: '璐′簳鍖�',
-          number: '0',
+          video: '0',
+          car: '0',
+          face: '0',
           value: [104.51037686031, 29.42048885792289, 300]
         },
         {
           name: '鑽e幙',
-          number: '0',
+          video: '0',
+          car: '0',
+          face: '0',
           value: [104.25437686031, 29.64048885792289, 300]
         },
         {
           name: '瀵岄『鍘�',
-          number: '0',
+          video: '0',
+          car: '0',
+          face: '0',
           value: [105.208, 29.185, 300]
         }
       ],
@@ -116,7 +130,9 @@
       if (this.geoCoordinates) {
         this.markData.forEach(item => {
           if (this.geoCoordinates[item.name]) {
-            item.number = this.geoCoordinates[item.name].score || '0'
+            item.video = this.geoCoordinates[item.name].video || '0.0'
+            item.car = this.geoCoordinates[item.name].car || '0.0'
+            item.face = this.geoCoordinates[item.name].face || '0.0'
           }
         })
       }
@@ -337,7 +353,7 @@
               {
                 coords: [
                   [104.621171408, 29.150000, 300],
-                  [104.891471408, 30.050000, 335]
+                  [104.941471408, 30.190000, 335]
                 ]
               },
               // 楂樻柊鍖虹嚎
@@ -351,14 +367,14 @@
               {
                 coords: [
                   [104.95805, 29.155946, 300],
-                  [105.24337686031, 29.61948885792289, 335]
+                  [105.12137686031, 29.41948885792289, 335]
                 ]
               },
               // 娌挎哗鍖虹嚎
               {
                 coords: [
-                  [104.80804, 29.100594, 300],
-                  [105.41237686031, 30.30048885792289, 335]
+                  [104.80504, 29.050594, 300],
+                  [105.47237686031, 30.30048885792289, 335]
                 ]
               },
               // 璐′簳鍖虹嚎
@@ -422,7 +438,7 @@
 
           formatter: function (params) {
             // return `{style|${params.data.name} 锛�${params.data.number}}`
-            return `{style|${params.data.name} \n 瑙嗛锛�${params.data.number} \n 杞﹁締锛�${params.data.number} \n 浜鸿劯锛�${params.data.number}}`
+            return `{style|${params.data.name} \n 瑙嗛锛�${params.data.video} \n 杞﹁締锛�${params.data.car} \n 浜鸿劯锛�${params.data.face}}`
           },
           rich: {
             style: {

--
Gitblit v1.8.0