From 75ca0722b86e7751202e7aec2e8d8ef96d68ce98 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 22 Dec 2021 16:22:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/mobilemap/index.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index d289e6d..0b9f4df 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -184,7 +184,7 @@
           that.$store.commit("MSET_ICONHIDE", true);
         }
         if (!that.MobileWindowsHide) {
-          that.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
+          // that.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
         }
         // if (!that.MobileWindowsHideFixed) {
         //   that.$store.dispatch("CLOSE_WIDOWFIXED"); //关闭固定弹窗
@@ -221,6 +221,15 @@
       tileset.setStyle(style);
       // layer.addOverlay(tileset);
       // viewer.flyTo(tileset);
+      that.$store.dispatch("mapFlyTo", {
+        lntLat: [115.87186406, 28.74449337, 1200],
+        heading: 0,
+        pitch: -45,
+        roll: 0,
+        noOpen: true,
+      });
+      //地图渲染完成执行srore中MSET_CREADE
+      that.$store.dispatch("MSET_CREADE");
 
       tileset.on(DC.MouseEventType.CLICK, (e) => {
         // that.popupFlag = true
@@ -229,7 +238,7 @@
         viewer.scene.globe.depthTestAgainstTerrain = false;
 
         // console.log(document.getElementById("mobile-map_content_content"));
-        console.log(e);
+        // console.log(e);
 
         // 定制化窗体
         that.openPopupS(e.position, [e.wgs84Position.lng, e.wgs84Position.lat]);
@@ -258,7 +267,7 @@
       let d = {
         position,
         lntLat,
-        query: { ...(query || {}), position, lntLat },
+        query: { ...(query || {}), introduce: position, address: lntLat },
         useJWD: true, //仅使用经纬度
       };
       that.$store.dispatch("setMobileWindows", d);

--
Gitblit v1.9.3