From f11f559192ca5fd9b8ca66197016a1ec7ead9729 Mon Sep 17 00:00:00 2001
From: BaoXs <bao_dida@163.com>
Date: 星期一, 16 五月 2022 10:55:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/DDE-WEB

---
 view/project/layerAnalysis.html |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/view/project/layerAnalysis.html b/view/project/layerAnalysis.html
index 1d3716f..1df3ed5 100644
--- a/view/project/layerAnalysis.html
+++ b/view/project/layerAnalysis.html
@@ -185,21 +185,23 @@
                         }
 
                     }
-                    else if (type == 'DDE') {                    
+                    else if (type == 'DDE') {
                         var lon, lat, alt;
                         lon = obj.data.lon;
                         lat = obj.data.lat;
                         alt = obj.data.altitude;
-                        console.log(lon,lat,alt);
-                        let flyPromise = viewer.camera.flyTo({
-                            duration: 3,
-                            destination: Cesium.Cartesian3.fromDegrees(Number(lon), Number(lat), alt),
-                            orientation: {
-                                heading: Cesium.Math.toRadians(0),                          //缁曞瀭鐩翠簬鍦板績鐨勮酱鏃嬭浆
-                                pitch: Cesium.Math.toRadians(-90),      //缁曠含搴︾嚎鏃嬭浆
-                                roll: Cesium.Math.toRadians(0)                                 //缁曠粡搴︾嚎鏃嬭浆
-                            },
-                        });
+                        console.log(lon, lat, alt);
+                        if (lon != undefined && lat != undefined && alt != undefined) {
+                            let flyPromise = viewer.camera.flyTo({
+                                duration: 3,
+                                destination: Cesium.Cartesian3.fromDegrees(Number(lon), Number(lat), alt),
+                                orientation: {
+                                    heading: Cesium.Math.toRadians(0),                          //缁曞瀭鐩翠簬鍦板績鐨勮酱鏃嬭浆
+                                    pitch: Cesium.Math.toRadians(-90),      //缁曠含搴︾嚎鏃嬭浆
+                                    roll: Cesium.Math.toRadians(0)                                 //缁曠粡搴︾嚎鏃嬭浆
+                                },
+                            });
+                        }
                     }
                 }
                 , oncheck: function (obj) {
@@ -401,7 +403,10 @@
                     request.setRequestHeader("token", token);
                 },
                 success: function (data) {
-                    layerMenu.push(data);
+                    if (parent.getRootById(data.id) == null) {
+                        data.isloading = false;
+                        layerMenu.push(data);
+                    }
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
                     console.log(errorThrown);

--
Gitblit v1.9.1