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/leftmenu.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/components/left/leftmenu.vue b/src/components/left/leftmenu.vue
index 8931122..9221637 100644
--- a/src/components/left/leftmenu.vue
+++ b/src/components/left/leftmenu.vue
@@ -464,18 +464,18 @@
//鑾峰彇token骞惰姹傚姞杞藉浘灞傛暟鎹�
this.SmartEarthToken = common.smartearthtoken;
this.$nextTick(() => {
- getmenu().then((response) => {
- // // 寰楀埌榛樿閫変腑鐨勬暟鎹殑id
- // this.parseJson(response.data); //鍦烘櫙閰嶇疆
- // this.treeData = response.data;
- // this.setDefaultCheck(response.data);
- // setTimeout(() => {
- // this.randomSelectLayer();
- // let selectedLayers = this.$refs.tree.getCheckedNodes();
- // // .filter((item) => item.sourceType == "cluster");
- // this.$store.commit("selectedLayer", selectedLayers);
- // }, 1000);
- });
+ // getmenu().then((response) => {
+ // // // 寰楀埌榛樿閫変腑鐨勬暟鎹殑id
+ // // this.parseJson(response.data); //鍦烘櫙閰嶇疆
+ // // this.treeData = response.data;
+ // // this.setDefaultCheck(response.data);
+ // // setTimeout(() => {
+ // // this.randomSelectLayer();
+ // // let selectedLayers = this.$refs.tree.getCheckedNodes();
+ // // // .filter((item) => item.sourceType == "cluster");
+ // // this.$store.commit("selectedLayer", selectedLayers);
+ // // }, 1000);
+ // });
this.getLayersData("./static/layers.json");
// axios.get("./static/layers.json").then(
// (response) => {
@@ -545,6 +545,10 @@
Bus.$on("showSPJK", () => {
this.$refs.tree.setChecked("zhianjiankong", true, true);
this.setChecked("zhianjiankong", true);
+ });
+ Bus.$on("closeSPJK", () => {
+ this.$refs.tree.setChecked("zhianjiankong", false, false);
+ this.setChecked("zhianjiankong", false);
});
//鍏抽棴鑿滃崟寮圭獥
Bus.$on("closeMenuPop", (data) => {
@@ -2678,7 +2682,7 @@
// },
initCluster(treeNode) {
- this.$set(treeNode, "disabled", true);//缁檛reeNode娣诲姞disabled灞炴��
+ this.$set(treeNode, "disabled", true); //缁檛reeNode娣诲姞disabled灞炴��
let that = this;
let imgUrl;
@@ -2731,7 +2735,6 @@
// // 鍋忕Щ閲�
// pixelOffset: new Cesium.Cartesian2(15, 0),
// };
-
});
// 娣诲姞鐩戝惉鍑芥暟
@@ -3081,6 +3084,8 @@
.el-tree {
background: transparent;
color: white;
+ height: 93%;
+ overflow: auto;
}
.el-tree /deep/ .el-tree-node__content {
--
Gitblit v1.9.3