解决冲突

TreeWish

2023-02-09 22fcbf0a9ed8e0a2df9695859d7a52d1dd55b386

 src/components/MapView/mapMenuTop.vue

@@ -206,6 +206,7 @@
      this.treeChange = [];
      this.menuTopFrom.queryLayer = null;
      this.$refs.tree.setCheckedKeys([]);

    },
    //导入shp文件
    async setMenuTopFile() {
@@ -368,7 +369,7 @@
      });
      this.$bus.$emit('changeMapMenuTop', 'true');
      sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
      sgworld.Creator.SimpleGraphic.clear();
     // sgworld.Creator.SimpleGraphic.clear();
      //清空inputFile
      // var file = document.getElementById('getMenuTopFile');
      // file.outerHTML = file.outerHTML;
@@ -380,7 +381,22 @@
      this.menuTopFrom.queryLayer = null;
      this.menuTopFrom.queryType = 'rectangle';
      this.$refs.tree.setCheckedKeys([]);
      sgworld.Creator.SimpleGraphic.clear();
      
	  
     // //清除对象
     // if (window.Viewer.scene.primitives.length != null) {
     //   window.Viewer.scene.primitives.removeAll();
     // }
     // if (this.$store.state.primitLayer != null) {
     //   sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
     //   this.$store.state.primitLayer = null;
     // }
     //关闭窗口
     this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close("queryinfo");
	  
	  
	  
	 
    },
    setCartesianToEightFour(res) {
      var std = {};
@@ -410,12 +426,5 @@
  padding: 4px 20px;
  font-weight: 400;
}
/deep/.el-input__inner {
  background-color: transparent !important ;
  color: #fff;
  border: 1px solid;
}
/deep/ .el-select .el-input__inner {
  border-color: #fff !important;
}
 
</style>