From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/left/layerTree.vue | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/components/left/layerTree.vue b/src/components/left/layerTree.vue
index 953b438..b3b0c3c 100644
--- a/src/components/left/layerTree.vue
+++ b/src/components/left/layerTree.vue
@@ -598,13 +598,10 @@
Bus.$on("switchImage", () => {
this.clearSwitchLayer();
this.$refs.tree.setChecked("C0698021", true, true);
-
this.setChecked("C0698021", true);
-
//this.$refs.tree.setChecked("shijingsanwei", true, true);
});
// Bus.$on("switchImage", () => {
-
// this.$refs.tree.setChecked("shijingsanwei", true, true);
// });
},
@@ -1292,7 +1289,7 @@
level: treeNode.Level,
minimumLevel: treeNode.minimumLevel,
maximumLevel: 18,
- tilingScheme: sgworld.Core.getOffsetTilingScheme(), // 鍋忕Щ绾犳
+ tilingScheme: sgworld.Core.getOffsetTilingScheme() , // 鍋忕Щ绾犳
alpha: treeNode.alpha
},
"0",
--
Gitblit v1.9.3