From 48492adaed18daf3ca3d229e8372c6f2a205d7f2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 04 Jan 2022 16:38:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/mobilemap/index.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 1f4245d..2a8ce6c 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -322,12 +322,9 @@
       //精细模型↓
       const tilesetLayer = new that.DC.TilesetLayer("tilesetLayer");
       viewer.addLayer(tilesetLayer);
-      const tileset = new that.DC.Tileset(
-        "http://data.mars3d.cn/3dtiles/max-shihua/tileset.json",
-        {
-          luminanceAtZenith: 0.5,
-        }
-      );
+      const tileset = new that.DC.Tileset("/mx/tileset.json", {
+        luminanceAtZenith: 0.5,
+      });
       tilesetLayer.addOverlay(tileset);
       // tilesetLayer.show = false;
 
@@ -373,6 +370,7 @@
             name: e.layer._bid,
             address: e.layer.type,
             introduce: e.layer._id,
+            data: e,
           }
         );
         //高亮
@@ -515,7 +513,9 @@
           //   new DC.Position(115.86798885, 28.72502592, 2100, 0, -45)
           // );
           let doit = (int) => {
-            if (val == 1) {
+            if (int == "建模") {
+              viewer.flyTo(tileset);
+            } else if (val == 1) {
               viewer.camera.setView({
                 // Cesium的坐标是以地心为原点,一向指向南美洲,一向指向亚洲,一向指向北极州
                 // fromDegrees()方法,将经纬度和高程转换为世界坐标
@@ -553,7 +553,8 @@
           };
           that.dimension == "2.5D"
             ? doit([116.36618337, 27.95911915, 2000.0])
-            : doit([117.08513731, 31.64790556, 600.0]);
+            : // : doit([116.39038494750986, 39.902393222208644, 330.0]);
+              doit("建模");
         };
         // startPoint(1);
       }

--
Gitblit v1.9.3