From fb46c859fb0026927c7433f83f10da7ef9ae48ce Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期二, 14 三月 2023 10:59:01 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

---
 src/views/Tools/LayerTree.vue |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 47ba4f6..b3785ee 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -75,7 +75,7 @@
       <div
         class="edit"
         @click="showLayerAttribute()"
-        v-if="!showlocal"
+        v-if="!showlocal && !shwoHistogram"
         v-show="!firstLevel"
       >
         <i class="el-icon-tickets"></i>&nbsp;&nbsp;灞炴��
@@ -83,7 +83,7 @@
       <div
         class="edit"
         @click="positioning()"
-        v-show="showlocal"
+        v-if="showlocal"
       >
         <i class="el-icon-tickets"></i>&nbsp;&nbsp;瀹氫綅
       </div>
@@ -94,13 +94,13 @@
       >
         <i class="el-icon-tickets"></i>&nbsp;&nbsp;閽诲瓟鏌辩姸鍥�
       </div>
-      <div
+      <!-- <div
         class="edit"
         v-show="showModelAttach"
         @click="modelAttach()"
       >
         <i class="el-icon-tickets"></i>&nbsp;&nbsp;妯″瀷灞炴��
-      </div>
+      </div> -->
       <!-- <div
         class="edit"
         @click="menuMoveF( 'up')"
@@ -532,10 +532,10 @@
       console.log("tree drop: ", dropNode.label, dropType);
     },
     handleCheckChange(data, checked, indeterminate) {
+
       if (data.type != 2) return;
       var std = [];
       if (data.serveType == "WMS") {
-        var layers_ol = window.map.getAllLayers();
         for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
           var val_id =
             window.Viewer.imageryLayers._layers[i].imageryProvider.name;
@@ -544,13 +544,6 @@
 
             const img_layer = window.Viewer.imageryLayers._layers[i];
             img_layer.show = checked;
-          }
-        }
-
-        for (var i in layers_ol) {
-          var layerOl = layers_ol[i];
-          if (layerOl.values_.name == data.cnName) {
-            layerOl.setVisible(checked); //鏄剧ず鍥惧眰
           }
         }
       } else if (data.serveType == "WFS") {
@@ -571,7 +564,7 @@
           for (var i in Viewer.scene.primitives._primitives) {
             Viewer.scene.primitives._primitives[i].show = checked;
             if (Viewer.scene.primitives._primitives[i].id == data.cnName) {
-              std.push(res.id);
+              // std.push(res.id);
               Viewer.flyTo(Viewer.scene.primitives._primitives[i]);
             }
           }
@@ -579,14 +572,24 @@
       }
       if (std.length == 0 && checked == true) {
         this.setAddLayers(data);
+      } else {
+        window.map.getLayers().getArray().forEach(item => {
+          if (item.get("name") == data.cnName) {
+            item.setVisible(checked);
+            debugger
+          }
+        });
       }
-      var layers_ol = window.map.getAllLayers();
-      for (var i in layers_ol) {
-        var layerOl = layers_ol[i];
-        if (layerOl.values_.name == data.label) {
-          layerOl.setVisible(checked); //鏄剧ず鍥惧眰
-        }
-      }
+
+
+
+      // var layers_ol = window.map.getAllLayers();
+      // for (var i in layers_ol) {
+      //   var layerOl = layers_ol[i];
+      //   if (layerOl.values_.name == data.label) {
+      //     layerOl.setVisible(checked); //鏄剧ず鍥惧眰
+      //   }
+      // }
     },
     setAddLayers(res) {
       if (res.serveType == "WMS") {
@@ -666,7 +669,6 @@
         });
         window.map.addLayer(vectorLayer);
       } else if (res.serveType == "Tileset") {
-
         var tileset = Viewer.scene.primitives.add(
           new Cesium.Cesium3DTileset({
             name: res.cnName,
@@ -677,13 +679,13 @@
             skipLevelOfDetail: true, // 鍦ㄩ亶鍘嗘椂鍊欒烦杩囪鎯咃細false
           })
         );
-
         tileset.readyPromise.then((tileset) => {
           tileset.id = res.cnName;
           tileset.layerId = res.id;
           this.tileSet(tileset, parseFloat(res.elev))
           Viewer.flyTo(tileset);
         });
+        window.model = tileset
       }
     },
 

--
Gitblit v1.9.3