From 27beb42eb0b11e599a7d105cb007d1f3fd1358f3 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 16 Oct 2024 17:38:15 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E6=AC=A1=E5=88=B7=E6=96=B0=E5=90=8E=E9=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E9=87=8D=E6=96=B0=E8=B0=83=E7=94=A8=E5=BA=94=E6=80=A5?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/centralScreen/centralScreen.vue     | 24 +++++++------------
 .../centralScreen/components/centerMap.vue    | 16 ++++++++++---
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/views/centralScreen/centralScreen.vue b/src/views/centralScreen/centralScreen.vue
index 8eb6ec7..ef0dcd5 100644
--- a/src/views/centralScreen/centralScreen.vue
+++ b/src/views/centralScreen/centralScreen.vue
@@ -115,24 +115,18 @@
 
     const setting = getSettings(DataType.yinChuan);
     onMounted(async () => {
-        screenPath.value = getCenterInfo?.screenPath;
-        options.value = {
-            center: [getCenterInfo?.longitude || 106.32, getCenterInfo?.latitude || 38.45], //地图中心点
-            zoom: 6, //地图显示的缩放级别
-            mapStyle: 'darkblue', //地图样式
-        };
         try {
             const { result } = await getEmergencyCenterApi();
-            if (result?.screenPath !== getCenterInfo?.screenPath) {
-                screenPath.value = result?.screenPath;
-                options.value = {
-                    center: [result?.longitude || 106.32, result?.latitude || 38.45], //地图中心点
-                    zoom: 6, //地图显示的缩放级别
-                    mapStyle: 'darkblue', //地图样式
-                };
-                userStore.setCenterInfo(result);
-            }
+            screenPath.value = result?.screenPath;
+            options.value = {
+                center: [result?.longitude || 106.32, result?.latitude || 38.45], //地图中心点
+                zoom: 8, //地图显示的缩放级别
+                mapStyle: 'darkblue', //地图样式
+            };
+            userStore.setCenterInfo(result);
         } catch (e) {}
+
+        console.log([getCenterInfo?.longitude || 106.32, getCenterInfo?.latitude || 38.45]);
         init();
         document.title = title.value;
         document.addEventListener('visibilitychange', checkTabState);
diff --git a/src/views/centralScreen/components/centerMap.vue b/src/views/centralScreen/components/centerMap.vue
index dfe9605..d664a21 100644
--- a/src/views/centralScreen/components/centerMap.vue
+++ b/src/views/centralScreen/components/centerMap.vue
@@ -79,7 +79,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-    import { nextTick, onMounted, ref } from 'vue';
+    import { nextTick, onMounted, ref, watch } from 'vue';
     import { message } from 'ant-design-vue';
     import { RedoOutlined } from '@ant-design/icons-vue';
     import { Map } from '/@/assets/mapUtils/map';
@@ -198,13 +198,23 @@
         }
     }
 
-    onMounted(() => {
+    function initMap() {
         Map.initMap({ el: 'centerMap', option: props.mapOptions }).then(() => {
             getMapData(tabList[0].type, { centerId: userStore.getCenterInfo?.id });
             Map.map && Map.map.on('zoomend', setLevel);
             Map.map && Map.map.on('zoomend', setLevel);
         });
-    });
+    }
+
+    watch(
+        () => props.mapOptions,
+        () => {
+            initMap();
+        }
+    );
+
+    // onMounted(() => {
+    // });
     const routeList = ref([]);
     const showRoutePanel = ref(false);
     const panelTitle = ref();