From 0e625aabf7a7d51a4b11633ad637fc8aa94deb01 Mon Sep 17 00:00:00 2001
From: 王旭 <1377869194@qq.com>
Date: 星期四, 11 五月 2023 14:50:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

---
 src/components/mapsdk.vue |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index c8a7364..cc64bbf 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -80,16 +80,24 @@
             <el-form
               ref="form"
               :model="coordFrom"
-
             >
               <el-form-item label="缁忓害:">
-                <el-input v-model="coordFrom.lon" placeholder="璇疯緭鍏ョ粡搴�"></el-input>
+                <el-input
+                  v-model="coordFrom.lon"
+                  placeholder="璇疯緭鍏ョ粡搴�"
+                ></el-input>
               </el-form-item>
               <el-form-item label="绾害:">
-                <el-input v-model="coordFrom.lat" placeholder="璇疯緭鍏ョ淮搴�"></el-input>
+                <el-input
+                  v-model="coordFrom.lat"
+                  placeholder="璇疯緭鍏ョ淮搴�"
+                ></el-input>
               </el-form-item>
               <el-form-item label="楂樺害:">
-                <el-input v-model="coordFrom.height" placeholder="璇疯緭鍏ラ珮搴�"></el-input>
+                <el-input
+                  v-model="coordFrom.height"
+                  placeholder="璇疯緭鍏ラ珮搴�"
+                ></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button
@@ -854,7 +862,7 @@
       },
       coordFrom: {
         lon: "",
-        lat:"",
+        lat: "",
         height: "",
       },
       listData: {
@@ -1173,24 +1181,25 @@
     changeTerrainLayer() {
       if (this.terrainflag) {
         Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
+        window.terrainDemLayer = null;
         var option = {
           url: window.sceneConfig.SGUrl,
           layerName: window.sceneConfig.mptName,
           requestVertexNormals: true,
         };
-        window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+        window.terrainMptLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
         Viewer.camera.flyTo({
           destination: Cesium.Cartesian3.fromDegrees(110, 33, 8000000),
         });
 
       } else {
-        window.terrainLayer.deleteObject();
-        window.terrainLayer = null;
+        window.terrainMptLayer.deleteObject();
+        window.terrainMptLayer = null;
 
-        window.terrainLayer = new Cesium.CesiumTerrainProvider({
+        window.terrainDemLayer = new Cesium.CesiumTerrainProvider({
           url: LFData + '/3d/terrain/dem20230321'
         });
-        Viewer.terrainProvider = window.terrainLayer
+        Viewer.terrainProvider = window.terrainDemLayer
         Viewer.camera.flyTo({
           destination: Cesium.Cartesian3.fromDegrees(113.229279, 31.215949, 1000),
           orientation: {

--
Gitblit v1.9.3