From ff83fe24ca5e48c0c511b9b96967b1c2f9c2d47d Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Thu, 13 Jul 2023 17:16:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E6=8E=A5=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/useInitMap.js | 13 +++++++------
 src/http/api.js               |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/composables/useInitMap.js b/src/composables/useInitMap.js
index 8a19f14..3d6d308 100644
--- a/src/composables/useInitMap.js
+++ b/src/composables/useInitMap.js
@@ -1,17 +1,17 @@
 import { useRouter } from 'vue-router'
 import { useStore } from '@/store/root'
 import { uniqBy } from '@/utils/utils'
-import { getMap } from '@/http/api'
+import { getMap, getFacilityList } from '@/http/api'
 import Message from '@/base/Message/Message'
 
 export const useInitMap = function () {
   const store = useStore()
 
-  getMap()
-    .then(({ data }) => {
+  Promise.all([getMap(), getFacilityList()])
+    .then(([{ data }, { data: facs }]) => {
       store.SET_MAP_DATA(JSON.parse(data.mapData))
       //初始化地图
-      onReady(store.currentFloor, data, store.shopList, () => {
+      onReady(store.currentFloor, data, store.shopList, facs, () => {
         store.SET_MAP_STATUS(true)
         const facilityList = window.Map_QM.getAllIcon().flat(Infinity)
 
@@ -73,7 +73,7 @@ export const showFacility = fac => {
 }
 
 //地图初始化
-function onReady({ floorOrder, location, angle }, map, shop, callback) {
+function onReady({ floorOrder, location, angle }, map, shop, facs, callback) {
   //设备楼栋, 设备楼层, 点位(机器点位直连主干道而不在主干道上), 方向    84   85
   window.MainMap_QM.init(callback, {
     build: 0,
@@ -85,7 +85,8 @@ function onReady({ floorOrder, location, angle }, map, shop, callback) {
     containerId: 'mapContainer',
     mapData: map,
     shadow: false,
-    shopData: shop
+    shopData: shop,
+    iconUrl: facs
   })
 }
 
diff --git a/src/http/api.js b/src/http/api.js
index 26c0a12..48508f5 100644
--- a/src/http/api.js
+++ b/src/http/api.js
@@ -52,3 +52,5 @@ export const getAD = () => get(`./static/offline/JSON/ad.json`)
 export const getMenuList = () => get(`./static/offline/JSON/menuList.json`)
 
 export const getFoodIIndustryList = () => get(`./static/offline/JSON/foodIIndustryList.json`)
+
+export const getFacilityList = () => get(`./static/offline/JSON/getFacilityList.json`)