From 3b146936304b80a58f4bd3fc5d310544f537efbd Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 23 Dec 2021 10:50:51 +0800
Subject: [PATCH] +

---
 src/components/mobileWindow/index.vue |    1 +
 src/components/mobilemap/index.vue    |   15 ++++++++++++---
 src/styles/mobile/popup.scss          |    4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index fba1497..e7ae014 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -73,6 +73,7 @@
   },
   watch: {
     MobileWindowChangeData() {
+      //数据更改
       //   this.fullscreenLoading = true;
       if (!this.MobileWindowsHide) {
         // console.log("地图点击弹窗数据请求参数", this.query);
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 2aaeefd..66d2a9f 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -225,7 +225,7 @@
         }
       );
       tilesetLayer.addOverlay(tileset);
-      // viewer.flyTo(tileset);
+      viewer.flyTo(tileset);
       //精细模型↑
 
       //瀑布流↓
@@ -274,9 +274,18 @@
 
       tileset.on(DC.MouseEventType.CLICK, (e) => {
         viewer.scene.globe.depthTestAgainstTerrain = false;
+        // console.log(e);
 
         // 定制化窗体
-        that.openPopupS(e.position, [e.wgs84Position.lng, e.wgs84Position.lat]);
+        that.openPopupS(
+          e.position,
+          [e.wgs84Position.lng, e.wgs84Position.lat],
+          {
+            name: e.layer._bid,
+            address: e.layer.type,
+            introduce: e.layer._id,
+          }
+        );
       });
 
       viewer.compass.enable = false;
@@ -294,7 +303,7 @@
       let d = {
         position,
         lntLat,
-        query: { ...(query || {}), introduce: position, address: lntLat },
+        query: { introduce: position, address: lntLat, ...(query || {}) },
         useJWD: true, //仅使用经纬度
       };
       that.$store.dispatch("setMobileWindows", d);
diff --git a/src/styles/mobile/popup.scss b/src/styles/mobile/popup.scss
index 29950b9..eece555 100644
--- a/src/styles/mobile/popup.scss
+++ b/src/styles/mobile/popup.scss
@@ -54,6 +54,10 @@
             font-size: 16px;
             border-radius: 10px 10px 0 0;
             padding: 8px 14px;
+            padding-right: 27px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
             line-height: 20px;
             box-sizing: border-box;
         }

--
Gitblit v1.9.3