From 0b3c77332ac4ce524ad4d8b8c3d8959a0f0cc14e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 07 Jan 2022 14:13:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

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

diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 8193e95..cffab0c 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -268,8 +268,8 @@
         // if (height > 2000) {
         //   conBack(2000);
         // }
-        if (height < 500 && isSet) {
-          conBack(500);
+        if (height < 200 && isSet) {
+          conBack(200);
         }
         if (height > 6000 && isSet) {
           conBack(6000);
@@ -325,7 +325,7 @@
       const tileset = new that.DC.Tileset("/mx/tileset.json", {
         luminanceAtZenith: 0.5,
       });
-      tilesetLayer.addOverlay(tileset);
+      // tilesetLayer.addOverlay(tileset);
       // tilesetLayer.show = false;
 
       let silhouetteBlue =
@@ -473,7 +473,7 @@
       let startPoint;
       if (true) {
         startPoint = () => {
-          let doit2 = (int) => {
+          let doit2 = (int, h) => {
             viewer.camera.setView({
               // Cesium的坐标是以地心为原点,一向指向南美洲,一向指向亚洲,一向指向北极州
               // fromDegrees()方法,将经纬度和高程转换为世界坐标
@@ -487,18 +487,25 @@
               ),
               orientation: {
                 // 指向
-                heading: that.DC.Namespace.Cesium.Math.toRadians(108),
+                heading: that.DC.Namespace.Cesium.Math.toRadians(h[0]),
                 // 视角
-                pitch: that.DC.Namespace.Cesium.Math.toRadians(-26.46),
-                roll: 0.0,
+                pitch: that.DC.Namespace.Cesium.Math.toRadians(h[1]),
+                roll: h[2],
               },
             });
           };
           that.dimension == "2.5D"
-            ? doit2([114.03928791, 27.62954732, 360.0])
+            ? doit2(
+                [114.03928791, 27.62954732, 360.0],
+                [
+                  that.dimensionData.heading,
+                  that.dimensionData.pitch,
+                  that.dimensionData.roll,
+                ]
+              )
             : // : doit([116.39038494750986, 39.902393222208644, 330.0]);
               // doit("建模");
-              doit2([114.0351, 27.6314, 300.0]);
+              doit2([114.0351, 27.6314, 300.0], [108, -26.46, 0.0]);
         };
       } else {
         startPoint = (val) => {

--
Gitblit v1.9.3