From 833cc05e4a0d5a66fecda772be3ac07b621c4cd9 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期日, 26 三月 2023 17:14:46 +0800
Subject: [PATCH] 官网一张图修改,发布管理修改,模型挂附件修改

---
 src/components/Screen/bottom.vue |    2 
 src/components/preview_map.vue   |   15 +++++++
 src/components/mapsdk.vue        |   21 ++++++++--
 src/components/Screen/mapsdk.vue |   25 +++++++-----
 4 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/components/Screen/bottom.vue b/src/components/Screen/bottom.vue
index 0a1b2c1..6bc6c64 100644
--- a/src/components/Screen/bottom.vue
+++ b/src/components/Screen/bottom.vue
@@ -283,7 +283,7 @@
       }
     },
     handleMenuClick(menu) {
-      debugger
+
       this.currMenu = menu.menuName
     },
     handlePopoverClick(child) {
diff --git a/src/components/Screen/mapsdk.vue b/src/components/Screen/mapsdk.vue
index 900a42e..5817a9a 100644
--- a/src/components/Screen/mapsdk.vue
+++ b/src/components/Screen/mapsdk.vue
@@ -67,12 +67,12 @@
         })
       }, 1000);
 
-      Viewer.imageryLayers.addImageryProvider(
-        new Cesium.UrlTemplateImageryProvider({
-          url: gaoDeBaseUrl[0].url,
-        })
-      )
-      Viewer.imageryLayers._layers[1].show = false
+      // Viewer.imageryLayers.addImageryProvider(
+      //   new Cesium.UrlTemplateImageryProvider({
+      //     url: gaoDeBaseUrl[0].url,
+      //   })
+      // )
+      // Viewer.imageryLayers._layers[1].show = false
 
       // Viewer.imageryLayers.addImageryProvider(
       //   new Cesium.UrlTemplateImageryProvider({
@@ -95,10 +95,15 @@
       //寮�鍚繁搴︽娴�
       sgworld.Analysis.depthTestAgainstTerrain(true)
 
-      Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
-        url: demLayer,
-      })
-
+      // Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
+      //   url: demLayer,
+      // })
+      var option = {
+        url: window.sceneConfig.SGUrl,
+        layerName: window.sceneConfig.mptName,
+        requestVertexNormals: true,
+      };
+      window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
       //鏀瑰彉澶╃┖棰滆壊涓洪粦鑹�
       Viewer.scene.skyBox.show = false //鍏抽棴澶╃┖鐩掞紝鍚﹀垯浼氭樉绀哄ぉ绌洪鑹�
       //鑳屾櫙閫忔槑
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index ac9f321..ab50685 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -846,15 +846,26 @@
         layerid: pickedFeature.primitive.layerId,
         modelid: pickedFeature.getProperty(modelKey)
       }
+
       const data1 = await comprehensive_selectModelByGuid(obj);
+
       if (data1.code != 200) {
         return;
       }
+      var name = null;
+      var bak = null;
+      var type = null;
+      if (data1.result) {
+        name = data1.result.name;
+        bak = data1.result.bak;
+        type = data1.result.type;
+      }
+
       that.$store.state.catModelInfo = {
         id: pickedFeature.getProperty(modelKey),
-        name: data1.result.name,
-        type: data1.result.type,
-        bak: data1.result.bak,
+        name: name,
+        type: type,
+        bak: bak,
         layerId: pickedFeature.primitive.layerId,
         layerName: pickedFeature.primitive.id
       };
@@ -917,9 +928,9 @@
       //鏄剧ずfps
       Viewer.scene.debugShowFramesPerSecond = false;
       //瀵艰埅鎺т欢
-      window.sgworld.navControl("nav", false);
+      // window.sgworld.navControl("nav", false);
       //姣斾緥灏�
-      window.sgworld.navControl("scale", false);
+      // window.sgworld.navControl("scale", false);
       //寮�鍚繁搴︽娴�
       // sgworld.Analysis.depthTestAgainstTerrain(true)
       Viewer.scene.globe.depthTestAgainstTerrain = true;
diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue
index 3defe49..f99013c 100644
--- a/src/components/preview_map.vue
+++ b/src/components/preview_map.vue
@@ -1014,6 +1014,21 @@
       return Math.round(d * p) / p;
     },
     update() {
+      if (isNaN(this.modelForm.lon) || !this.modelForm.lon) {
+        return
+      }
+      if (isNaN(this.modelForm.lat) || !this.modelForm.lat) {
+        return
+      }
+      if (isNaN(this.modelForm.height) || !this.modelForm.height) {
+        return
+      }
+      if (isNaN(this.modelForm.alpha) || !this.modelForm.alpha) {
+        return
+      }
+      if (isNaN(this.modelForm.yaw) || !this.modelForm.yaw) {
+        return
+      }
       this.setTilesetArgs(this.modelForm);
       sgworld.Analysis.UndergroundMode(this.app.under, this.modelForm.alpha)
     },

--
Gitblit v1.9.3