From 87e84657a9f90d6575643d9398709ebc2fbe7f7d Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期二, 17 十月 2023 14:47:27 +0800
Subject: [PATCH] 地形切换修改

---
 src/components/mapsdk.vue |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 6f2cdcb..803cf80 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -75,7 +75,7 @@
             <el-form
               ref="form"
               :model="coordFrom"
-              label-width="50px"
+              label-width="70px"
             >
               <el-form-item label="缁忓害:">
                 <el-input
@@ -168,6 +168,7 @@
             >
               <el-form-item label="鍦板悕:">
                 <el-input
+                  size="small"
                   style="width: 160px"
                   v-model="comprehensive.name"
                   placeholder="璇疯緭鍏ュ湴鍚�...."
@@ -177,6 +178,7 @@
                 <el-button
                   @click="setQueryTable"
                   type="info"
+                  size="small"
                 >鏌ヨ</el-button>
               </el-form-item>
             </el-form>
@@ -190,6 +192,7 @@
                 align="center"
                 type="index"
                 label="搴忓彿"
+                width="70"
               />
               <el-table-column
                 prop="name"
@@ -308,7 +311,7 @@
         </el-card>
       </div>
       <!--      <div style="display: flex;">-->
-      <div
+      <!-- <div
         class="changeTerrain"
         @click="changeTerrainLayer"
         style="  position: absolute;
@@ -328,7 +331,7 @@
           id="cenBg"
           class="mapTerrain"
         ></div>
-      </div>
+      </div> -->
       <!--      class="center CenDiv"-->
       <div
         @click="changeMenulayer"
@@ -356,7 +359,7 @@
         @click="changeMapType"
         class="changeMapType"
         style="  position: absolute;
-  bottom: 52px;
+  bottom: 85px;
   right: 46px;
   height: 30px;
   width: 30px;
@@ -796,6 +799,7 @@
       src=""
       style="display: none; border: 0; padding: 0; height: 0; width: 0"
     ></iframe>
+    <model-property ref="modelProperty"></model-property>
   </div>
 </template>
 
@@ -1218,9 +1222,11 @@
       var modelKey = 'id';
       var modelid;
       if (result.tileset) {
+        
         if (result.tileset.pubid && parseInt(result.tileset.pubid) > 0) {
-
+          
           const data = await comprehensive_selectPubById({ id: result.tileset.pubid })
+          
           if (data.code != 200) {
             return
           } else {
@@ -1361,12 +1367,18 @@
         );
       }
 
-      var option = {
-        url: window.sceneConfig.SGUrl,
-        layerName: window.sceneConfig.mptName,
-        requestVertexNormals: true,
-      };
-      window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+      // var option = {
+      //   url: window.sceneConfig.SGUrl,
+      //   layerName: window.sceneConfig.mptName,
+      //   requestVertexNormals: true,
+      // };
+      // window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+      
+      window.terrainLayer = new Cesium.CesiumTerrainProvider({
+          // url: LFData + '/3d/terrain/dem20230321'
+          url: demLayer
+        });
+        Viewer.terrainProvider = window.terrainLayer
       window.terrainFlag = 'MPT'
       window.elevationTool = new SmartEarth.ElevationTool(window.sgworld);
       elevationTool.setContourColor("#F1D487");
@@ -2156,6 +2168,9 @@
       position: absolute;
       right: 8%;
       bottom: 1%;
+      span {
+        width: 100px;
+      }
     }
     .propertiesPop {
       width: 350px;

--
Gitblit v1.9.3