From 05affc703e81728cc58cc89c1815407ad4997dfe Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 07 Nov 2024 20:15:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'

---
 src/views/sub/components/scomponents/layersControl.vue |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/sub/components/scomponents/layersControl.vue b/src/views/sub/components/scomponents/layersControl.vue
index 0826c86..0e2e2ca 100644
--- a/src/views/sub/components/scomponents/layersControl.vue
+++ b/src/views/sub/components/scomponents/layersControl.vue
@@ -51,9 +51,6 @@
 import { getList as getRiskList } from "@/api/riskSource/riskSource"
 
 const { VITE_APP_BASE } = import.meta.env
-import { getViewer } from 'utils/getViewer'
-const globalViewer = getViewer()
-
 const treeRef = ref(null)
 
 const treeProps = {
@@ -235,7 +232,7 @@
 
 let addTileLayers = {}
 let tileLayers = new DC.TilesetLayer('tileLayers')
-globalViewer.addLayer(tileLayers)
+window.$viewer.addLayer(tileLayers)
 
 const handleCheckChange = (data, options) => {
   collectedNodes.value = []
@@ -262,11 +259,11 @@
 
         console.log(addTileLayers[item.layerName], 11111111)
 
-        globalViewer.flyTo(addTileLayers[item.layerName])
+        window.$viewer.flyTo(addTileLayers[item.layerName])
       } else if (item.subType == 'labelPoint') {
         if (!addTileLayers[item.layerName]) {
           addTileLayers[item.layerName] = new DC.HtmlLayer(addTileLayers[item.layerName])
-          globalViewer.addLayer(addTileLayers[item.layerName])
+          window.$viewer.addLayer(addTileLayers[item.layerName])
         }
 
         item.method(item.params).then(res => {
@@ -291,7 +288,7 @@
         if (item.subType == '3Dtile') {
           addTileLayers[item.layerName].show = false
         } else if (item.subType == 'labelPoint') {
-          globalViewer.removeLayer(addTileLayers[item.layerName])
+          window.$viewer.removeLayer(addTileLayers[item.layerName])
         }
 
         delete addTileLayers[item.layerName]

--
Gitblit v1.9.3