Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

13693261870

2023-05-23 a776668a6c8def39e56140ac29e7d9e729332d11

 src/components/MapView/mapMenuTop.vue

@@ -190,6 +190,7 @@
import { getToken } from "@/utils/auth"
import * as turf from "@turf/turf"
import { wktToGeoJSON } from "@terraformer/wkt"
import { getTreeData } from "@/utils/treeData.js"
export default {
  components: { queryinfo },
  data() {
@@ -265,11 +266,12 @@
      dialogExtentVisible: false,
      setExtent: 10,
      wktExtent: null,
      layerTabe: [],
    }
  },

  mounted() {
    this.menuTopFrom.queryType = "rectangle"
    // this.menuTopFrom.queryType = "rectangle"
    this.getAllTable()
    this.getPipelineData()
    this.$bus.$on("setExtentBUff", res => {
@@ -355,6 +357,7 @@


      var val = data.result
      this.layerData = getTreeData(val)
      // var std = [];
      // val.filter((item) => {
      //   if (std.indexOf(item.bak) == -1) {
@@ -384,20 +387,26 @@
    },
    //获取选择树的节点
    getCheckedNodes() {

      this.layerTabe = [];
      var valTree = this.$refs.tree.getCheckedNodes()
      var parentIds = this.$refs.tree.getHalfCheckedKeys(true)
      if (valTree.length == 0) return

      this.menuTopFrom.queryLayer = null;

      this.$store.state.propertiesName = valTree[0];
      this.treeChange = [];
      this.menuTopFrom.queryLayer = null;
      if (parentIds.length > 0) {
        this.menuTopFrom.queryLayer = this.$refs.tree.getNode(parentIds[0]).data.label
      } else {
        this.menuTopFrom.queryLayer = valTree[0].label
      }
      this.$store.state.propertiesName = valTree[0];

      for (var i = 0; i < valTree.length; i++) {
        if (valTree[i].entity) {
          if (!this.menuTopFrom.queryLayer) {
            this.menuTopFrom.queryLayer = valTree[i].tabDesc;
          }
          this.treeChange.push(valTree[i])
          // if (!this.menuTopFrom.queryLayer) {
          //   this.menuTopFrom.queryLayer = valTree[i].tabDesc;
          // }
          this.layerTabe.push(valTree[i])
          // this.treeChange.push(valTree[i])
        }

      }
@@ -408,6 +417,7 @@
      this.getAllTable()
      this.$refs.tree.setCheckedKeys([]);
      this.treeChange = []
      this.layerTabe = []
      this.menuTopFrom.queryLayer = null

    },
@@ -478,7 +488,7 @@



      if (this.treeChange.length == 0) {
      if (this.layerTabe.length == 0) {
        this.$message.error("请选择要查询的数据")
        return
      }
@@ -586,7 +596,7 @@
      this.showMapMenuPop()
    },
    showMapMenuPop() {
      this.$store.state.mapSpaceQueryLayer = this.treeChange
      this.$store.state.mapSpaceQueryLayer = this.layerTabe
      this.$store.state.mapPopBoxFlag = "1"
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close()
      this.$refs &&
@@ -617,6 +627,7 @@
      this.clearBufferEntities()
      this.$refs.pathClear.value = ""
      this.treeChange = []
      this.layerTabe = []
      this.menuTopFrom.queryLayer = null
      this.menuTopFrom.queryType = "rectangle"
      this.$refs.tree.setCheckedKeys([])