钻孔柱状图修改

Surpriseplus

2023-09-11 5d73bad0d529727d9617496e41c35a5b7928ef30

 src/components/MapView/mapSpacePop.vue

@@ -20,7 +20,7 @@
            @click="conditionVisible = true"
            size="small"
            type="success"
          >新增</el-button>
          >{{$t('common.lable6')}}</el-button>
          <el-button
            size="small"
            @click="resetForm"
@@ -218,7 +218,10 @@
          </el-select>
        </el-form-item>
        <el-form-item v-show="!fromSqlflag">
          <el-input v-model="formSql.value"></el-input>
          <el-input
            v-model="formSql.value"
            :placeholder="$t('shuJuGuanLi.shuJuJianSuo.queryContent')"
          > </el-input>
        </el-form-item>
        <el-form-item v-show="fromSqlflag">
          <el-date-picker
@@ -359,7 +362,9 @@
        { 'name': '卵石', 'color': 'rgba(54,83,173,1)' },
        { 'name': '泥岩', 'color': 'rgba(47,30,13,1)' },
        { 'name': '细砂', 'color': 'rgba(93,88,15,1)' },
        { 'name': '中砂', 'color': 'rgba(164,140,21,1)' }
        { 'name': '中砂', 'color': 'rgba(164,140,21,1)' },
        { 'name': '淤泥质土', 'color': 'rgba(75,74,78,1)' },
        { 'name': '其他', 'color': 'rgba(225,225,225,1)' },
      ]
    }
  },
@@ -461,8 +466,14 @@
      this.formInline.region = this.options[0].value
    },
    setListDataStart() {
      this.listdata.pageSize = 10
      this.listdata.pageIndex = 1
      this.listdata = {
        pageIndex: 1,
        pageSize: 10,
        name: null,
        srid: 4326,
        wkt: null,
        filter: null,
      }
      this.tableData = []
    },
    //初始化查询条件
@@ -608,7 +619,10 @@
      } else {
        this.listdata.filter = null;
      }
      if (this.$store.state.pigCode) {
        this.listdata.dirs = this.$store.state.pigCode;

      }

      const data = await dataQuerySelectByPage(this.listdata)
      if (data.code != 200) {
@@ -660,7 +674,7 @@


      this.tableData = val
      this.$refs.filterTable.doLayout()
      // this.$refs.filterTable.doLayout()
    },

    async setCartesianToEightFour(entities) {
@@ -749,19 +763,27 @@
          )
          window.histogramHandler.setInputAction((event) => {
            var pick = sgworld.Viewer.scene.pick(event.endPosition);
            if (pick) {

            var propertiesFlag = that.$store.state.propertiesFlag
              var propertiesFlag = that.$store.state.propertiesFlag

            if (Cesium.defined(pick)) {
              if (pick && pick.id && pick.id.tag && pick.id.tag == "Histogram") {
                that.$store.state.propertiesInfo = {
                  title: pick.id.properties._exppointid._value,
                  name: pick.id.properties._geoname._value,
                  type: pick.id.properties.geotype._value,
                  botdepth: pick.id.properties._botdepth._value,
                  describe: pick.id.properties._describe._value,
              if (Cesium.defined(pick)) {
                if (pick && pick.id && pick.id.tag && pick.id.tag == "Histogram") {
                  that.$store.state.propertiesInfo = {
                    title: pick.id.properties._exppointid._value,
                    name: pick.id.properties._geoname._value,
                    type: pick.id.properties.geotype._value,
                    botdepth: pick.id.properties._botdepth._value,
                    describe: pick.id.properties._describe._value,
                  }
                  that.$store.state.propertiesFlag = "2"
                } else {
                  if (propertiesFlag == 1) {
                    that.$store.state.propertiesFlag = propertiesFlag
                  } else {
                    that.$store.state.propertiesFlag = null
                  }
                }
                that.$store.state.propertiesFlag = "2"
              } else {
                if (propertiesFlag == 1) {
                  that.$store.state.propertiesFlag = propertiesFlag
@@ -769,13 +791,8 @@
                  that.$store.state.propertiesFlag = null
                }
              }
            } else {
              if (propertiesFlag == 1) {
                that.$store.state.propertiesFlag = propertiesFlag
              } else {
                that.$store.state.propertiesFlag = null
              }
            }

          }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
        }, 500);
      }
@@ -892,7 +909,8 @@
      var coord = wkt.coordinates;

      var std = [];
      var num = res.elev;
      var num = res.elev == null ? 0 : res.elev;

      var height = 0;
      for (var i in data) {
        if (data[i].exppointid == exppointid) {
@@ -901,37 +919,51 @@
      }

      var outlineList = this.outlineList;
      for (var i in std) {
        var line;
        var geoname = std[i].geoname;
        var col = outlineList.filter((ste) => {
          if (ste.name == geoname) {
            return res
      if (std.length > 0) {
        for (var i in std) {
          var line;
          var geoname = std[i].geoname;
          var col = outlineList.filter((ste) => {
            if (ste.name == geoname) {
              return res
            }
          })

          if (col.length == 0) {
            col = outlineList.filter((ste) => {
              if (ste.name == '其他') {
                return res
              }
            })
          }
        })
        line = col[0].color
          line = col[0].color

        var height = num - std[i].botdepth
        var layer = Viewer.entities.add({
          position: Cesium.Cartesian3.fromDegrees(coord[0], coord[1]),
          tag: 'Histogram',
          properties: std[i],
          ellipse: {
            semiMinorAxis: 1.0, //短轴
            semiMajorAxis: 1.0, //长轴
            height: height, //拉伸高度    elev  gwaterdep
            extrudedHeight: num, //离地高度
            rotation: Cesium.Math.toRadians(0), //旋转
            fill: true, //是否显示圆的填充
            material: Cesium.Color.fromCssColorString(line), //圆的颜色,
            outline: false, //是否显示圆轮廓
          var height = num - std[i].botdepth
          // console.log(num, std[i].botdepth)
          var layer = Viewer.entities.add({
            position: Cesium.Cartesian3.fromDegrees(coord[0], coord[1]),
            tag: 'Histogram',
            properties: std[i],
            ellipse: {
              semiMinorAxis: 2.0, //短轴
              semiMajorAxis: 2.0, //长轴
              height: height, //拉伸高度    elev  gwaterdep
              extrudedHeight: num, //离地高度
              rotation: Cesium.Math.toRadians(0), //旋转
              fill: true, //是否显示圆的填充
              material: Cesium.Color.fromCssColorString(line), //圆的颜色,
              outline: false, //是否显示圆轮廓

          },
        });
        num -= std[i].botdepth;
        this.$store.state.histogramLayer.push(layer)
            },
          });
          num -= std[i].botdepth;
          this.$store.state.histogramLayer.push(layer)
        }
        this.$store.state.histLenged = true;
      }
      this.$store.state.histLenged = true;



    },


@@ -1036,7 +1068,9 @@
        { 'name': '卵石', 'color': [54, 83, 173, 1] },
        { 'name': '泥岩', 'color': [47, 30, 13, 1] },
        { 'name': '细砂', 'color': [93, 88, 15, 1] },
        { 'name': '中砂', 'color': [164, 140, 21, 1] }
        { 'name': '中砂', 'color': [164, 140, 21, 1] },
        { 'name': '淤泥质土', 'color': [75, 74, 78, 1] },
        { 'name': '其他', 'color': [225, 225, 225, 1] }
      ]
      for (var i = 0; i < list.length; i++) {
        var out_color = list[i].color
@@ -1303,7 +1337,6 @@
          this.$store.state.queryInfo.push(point)
          sgworld.Navigate.flyToObj(point)
          this.$store.state.primitLayer = point

          break
        case "LineString":
        case "MultiLineString":
@@ -1363,6 +1396,13 @@
          pick.id.tag &&
          pick.id.tag.includes("properties_")
        ) {
          if (this.spaceLayer == 'msurfacedeformationdata') {
            this.$store.state.surfaceDeForm.flag = true;
            this.$store.state.surfaceDeForm.gid = pick.id.properties.gid._value;
          } else {
            this.$store.state.surfaceDeForm.flag = false;
            this.$store.state.surfaceDeForm.gid = null;
          }
          this.$store.state.propertiesFlag = "1"
          let properties = pick.id.properties
          let propertyNames = pick.id.properties.propertyNames