解决冲突

TreeWish

2023-02-09 22fcbf0a9ed8e0a2df9695859d7a52d1dd55b386

 src/components/MapView/mapMenuTop.vue

@@ -29,12 +29,12 @@
            </div>
            <div style="margin-top: 5px">
              <el-button
                size="mini"
                size="small"
                plain
                @click="getCheckedNodes"
              >确认</el-button>
              <el-button
                size="mini"
                size="small"
                type="info"
                plain
                @click="resetCheckedNodes"
@@ -77,10 +77,12 @@
      <el-form-item>
        <el-button
          plain
          size="small"
          @click="getAttributeQuery"
        >查询</el-button>
        <el-button
          type="info"
          size="small"
          @click="clearQuery"
          plain
        >重置</el-button>
@@ -181,7 +183,7 @@
      for (var i in option) {
        var val_Data = option[i];
        val_Data.id = '1' + i;
        val_Data.label = val_Data.tabDesc + '(' + val_Data.tab + ')';
        val_Data.label = val_Data.tabDesc  ;
        if (option[i].ns == 'bd') {
          this.layerData[0].children.push(val_Data);
        } else {
@@ -204,6 +206,7 @@
      this.treeChange = [];
      this.menuTopFrom.queryLayer = null;
      this.$refs.tree.setCheckedKeys([]);

    },
    //导入shp文件
    async setMenuTopFile() {
@@ -221,7 +224,11 @@
        }
      }
      if (count != 4) {
        alert('ShapeFile文件选择不全！');

        this.$message({
          message: 'ShapeFile文件选择不全！',
          type: 'warning'
        });
        return;
      }
      $.ajax(BASE_URL + '/inquiry/uploadShp?token=' + getToken(), {
@@ -340,7 +347,7 @@
      console.log(res.geometry)
      var jsonToWkt = this.$wkt.convert(res.geometry);
      this.$store.state.mapMenuShpFile = encr(jsonToWkt);
 

      this.showMapMenuPop();
    },
    showMapMenuPop() {
@@ -350,7 +357,7 @@
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("空间查询", null, {
        close: () => {

         if (this.$store.state.primitLayer != null) {
          if (this.$store.state.primitLayer != null) {
            sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
            this.$store.state.primitLayer = null;
          }
@@ -362,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;
@@ -374,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 = {};
@@ -404,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>