From bf5ba56e8a82f0ef699f2eae413d0dc2c4e4f67d Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Tue, 25 Oct 2022 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web into master

---
 src/components/map/components/dimension.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 4ea5a96..534c29b 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -56,6 +56,7 @@
 const twoVH = 500
 const fourVH = 800
 const fiveVH = 1000
+const sixVH = 1500
 
 const heightDifferenceValue = 100
 
@@ -263,6 +264,8 @@
                     // 最大
                     // global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = maxVH
                     // global.eagleViewer.scene.screenSpaceCameraController.maximumZoomDistance = maxVH + 1000
+                    global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 3500
+                    global.eagleViewer.scene.screenSpaceCameraController.maximumZoomDistance = 4500
 
                     // 设置相机缩小时的速率
                     // global.viewer.scene.screenSpaceCameraController._minimumZoomRate = 2000
@@ -740,7 +743,9 @@
             //     return
             // }
 
-            if (height > fiveVH - heightDifferenceValue) {
+            if (height > sixVH - heightDifferenceValue) {
+                viewerHeight = sixVH
+            } else if (height <= fiveVH + heightDifferenceValue && height > fiveVH - heightDifferenceValue) {
                 viewerHeight = fiveVH
             } else if (height <= fourVH + heightDifferenceValue && height > fourVH - heightDifferenceValue) {
                 viewerHeight = fourVH
@@ -898,7 +903,7 @@
             qxTilesetLayer = new global.DC.TilesetLayer('qxTilesetLayer')
             global.viewer.addLayer(qxTilesetLayer)
 
-            qxTileset = new global.DC.Tileset('/zhxy/qx/tileset.json', {
+            qxTileset = new global.DC.Tileset('/zhjg/qx/tileset.json', {
                 luminanceAtZenith: 0.4,
                 // cullWithChildrenBounds: false,
                 // cullRequestsWhileMoving: false,
@@ -920,7 +925,7 @@
             const that = this
             tilesetLayer = new global.DC.TilesetLayer('tilesetLayer')
             global.viewer.addLayer(tilesetLayer)
-            tileset = new global.DC.Tileset('/zhxy/mx/tileset.json', {
+            tileset = new global.DC.Tileset('/zhjg/mx/tileset.json', {
                 luminanceAtZenith: 0.4,
                 // cullWithChildrenBounds: false,
                 // cullRequestsWhileMoving: false,

--
Gitblit v1.9.3