From cc3fdfc202043f20fd9a932a9ccecbbd82d071ad Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Tue, 15 Mar 2022 14:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/map/components/dimension.vue |   78 ++++++++++++++++++++------------------
 1 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 6a39dd1..4608434 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -248,7 +248,7 @@
                     })
 
                     // 最小
-                    global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 220
+                    global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 100
                     // 最大
                     global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 400
 
@@ -401,13 +401,13 @@
                                     global.viewer.camera.positionCartographic.height
                                 )
 
-                                if (height <= 250) {
+                                if (height < 150) {
                                     global.viewer.camera.setView({
                                         destination:
                                             global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                                                 global.viewer.camera.positionCartographic.longitude,
                                                 global.viewer.camera.positionCartographic.latitude,
-                                                280
+                                                200
                                             ),
                                         orientation: {
                                             // 指向
@@ -417,15 +417,17 @@
                                             roll: 0.0
                                         }
                                     })
+
+                                    return
                                 }
 
-                                if (height > 250 && height <= 310) {
+                                if (height < 250) {
                                     global.viewer.camera.setView({
                                         destination:
                                             global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                                                 global.viewer.camera.positionCartographic.longitude,
                                                 global.viewer.camera.positionCartographic.latitude,
-                                                340
+                                                300
                                             ),
                                         orientation: {
                                             // 指向
@@ -435,9 +437,11 @@
                                             roll: 0.0
                                         }
                                     })
+
+                                    return
                                 }
 
-                                if (height > 310 && height < 370) {
+                                if (height < 350) {
                                     global.viewer.camera.setView({
                                         destination:
                                             global.DC.Namespace.Cesium.Cartesian3.fromRadians(
@@ -467,33 +471,13 @@
                                     global.viewer.camera.positionCartographic.height
                                 )
 
-                                if (height > 370) {
+                                if (height > 350) {
                                     global.viewer.camera.setView({
                                         destination:
                                             global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                                                 global.viewer.camera.positionCartographic.longitude,
                                                 global.viewer.camera.positionCartographic.latitude,
-                                                340
-                                            ),
-                                        orientation: {
-                                            // 指向
-                                            heading: global.DC.Namespace.Cesium.Math.toRadians(0, 0),
-                                            // 视角
-                                            pitch: global.DC.Namespace.Cesium.Math.toRadians(-90),
-                                            roll: 0.0
-                                        }
-                                    })
-
-                                    return
-                                }
-
-                                if (height > 310) {
-                                    global.viewer.camera.setView({
-                                        destination:
-                                            global.DC.Namespace.Cesium.Cartesian3.fromRadians(
-                                                global.viewer.camera.positionCartographic.longitude,
-                                                global.viewer.camera.positionCartographic.latitude,
-                                                280
+                                                300
                                             ),
                                         orientation: {
                                             // 指向
@@ -513,7 +497,27 @@
                                             global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                                                 global.viewer.camera.positionCartographic.longitude,
                                                 global.viewer.camera.positionCartographic.latitude,
-                                                220
+                                                200
+                                            ),
+                                        orientation: {
+                                            // 指向
+                                            heading: global.DC.Namespace.Cesium.Math.toRadians(0, 0),
+                                            // 视角
+                                            pitch: global.DC.Namespace.Cesium.Math.toRadians(-90),
+                                            roll: 0.0
+                                        }
+                                    })
+
+                                    return
+                                }
+
+                                if (height > 150) {
+                                    global.viewer.camera.setView({
+                                        destination:
+                                            global.DC.Namespace.Cesium.Cartesian3.fromRadians(
+                                                global.viewer.camera.positionCartographic.longitude,
+                                                global.viewer.camera.positionCartographic.latitude,
+                                                100
                                             ),
                                         orientation: {
                                             // 指向
@@ -603,12 +607,12 @@
                 }
             })
 
-            if (height <= 250) {
+            if (height < 150) {
                 global.viewer.camera.setView({
                     destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                         global.viewer.camera.positionCartographic.longitude,
                         global.viewer.camera.positionCartographic.latitude,
-                        220
+                        100
                     ),
                     orientation: {
                         // 指向
@@ -620,12 +624,12 @@
                 })
             }
 
-            if (height > 250 && height <= 310) {
+            if (height > 150 && height <= 250) {
                 global.viewer.camera.setView({
                     destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                         global.viewer.camera.positionCartographic.longitude,
                         global.viewer.camera.positionCartographic.latitude,
-                        280
+                        200
                     ),
                     orientation: {
                         // 指向
@@ -637,12 +641,12 @@
                 })
             }
 
-            if (height > 310 && height <= 370) {
+            if (height > 250 && height <= 350) {
                 global.viewer.camera.setView({
                     destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                         global.viewer.camera.positionCartographic.longitude,
                         global.viewer.camera.positionCartographic.latitude,
-                        340
+                        300
                     ),
                     orientation: {
                         // 指向
@@ -654,7 +658,7 @@
                 })
             }
 
-            if (height > 370) {
+            if (height > 350) {
                 global.viewer.camera.setView({
                     destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
                         global.viewer.camera.positionCartographic.longitude,
@@ -877,7 +881,7 @@
                     }
                 })
                 // 最小
-                global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 220
+                global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 100
                 // 最大
                 global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 400
                 // 视角旋转

--
Gitblit v1.9.3