From 384c4d38835d16be784497fa1b9c702eb1852294 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 26 Aug 2024 10:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A2=9E=E5=8A=A0=E5=BC=80?=
 =?UTF-8?q?=E5=B0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppMap.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/AppMap.vue b/src/views/AppMap.vue
index 735a4e2..2cfc8ce 100644
--- a/src/views/AppMap.vue
+++ b/src/views/AppMap.vue
@@ -28,6 +28,7 @@ export default {
     getData() {
       const {$http, $waitFor} = window
       const {groupCodeList, currentDate, hourNum} = this.search
+      const maps = []
       return $waitFor($http).then(() => Promise.all([
         $http.post("/data-boot/la/screen/marketBoard/storeReport", {
           groupCodeList, currentDate, hourNum
@@ -38,10 +39,17 @@ export default {
         }),
         axios.get('http://10.0.97.209/blade-visual/map/data?id=1456').then(res => {
           if (res?.data) {
-            return this.geoJson = res.data
+            return maps.push(res.data.features)
+          }
+        }),
+        axios.get('http://10.0.97.209/blade-visual/map/data?id=1469').then(res => {
+          if (res?.data) {
+            return maps.push(res.data.features)
           }
         })
-      ]))
+      ])).then(() => {
+        return this.geoJson = {type: 'FeatureCollection', features: maps.flat(1)}
+      })
     },
     initMap() {
       const {echarts, turf} = window