[viewer]解决合并冲突

Jin Lei

2023-11-11 076cd08a4abcae33957e4de5b15babfcb6fed8ce

 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) => {
@@ -546,6 +546,10 @@
      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) => {
      if (data) {