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