Merge remote-tracking branch 'origin/main'

linwe

2024-11-07 05affc703e81728cc58cc89c1815407ad4997dfe

 src/views/sub/components/scomponents/baseMap.vue

@@ -257,11 +257,11 @@
    keyExistBaseMap.forEach((item) => {
      let curLayer = {
        key: item.key,
        mapLayer: global.$viewer?.imageryLayers.addImageryProvider(item.layer),
        mapLayer: window.$viewer?.imageryLayers.addImageryProvider(item.layer),
      }

      curLayer.mapLayer.show = true
      global.$viewer?.imageryLayers.lowerToBottom(curLayer.mapLayer)
      window.$viewer?.imageryLayers.lowerToBottom(curLayer.mapLayer)

      globalBaseMapLayers.push(curLayer)
    })
@@ -269,7 +269,7 @@
  keyNoExistBaseMap.length &&
    keyNoExistBaseMap.forEach((item) => {
      item.mapLayer.show = true
      global.$viewer?.imageryLayers.lowerToBottom(item.mapLayer)
      window.$viewer?.imageryLayers.lowerToBottom(item.mapLayer)
    })

  curMode.value = mode
@@ -284,9 +284,9 @@
    let terrain = DC.TerrainFactory.createTerrain(DC.TerrainType.XYZ, {
      url: 'https://data.marsgis.cn/terrain'
    })
    global.$viewer.setTerrain(terrain)
    window.$viewer.setTerrain(terrain)
  } else {
    global.$viewer.setTerrain()
    window.$viewer.setTerrain()
  }
}
</script>