From 5d73bad0d529727d9617496e41c35a5b7928ef30 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 11 九月 2023 19:01:07 +0800
Subject: [PATCH] 钻孔柱状图修改
---
src/components/MapView/mapSpacePop.vue | 114 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 52 deletions(-)
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 318a72c..010381d 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -674,7 +674,7 @@
this.tableData = val
- this.$refs.filterTable.doLayout()
+ // this.$refs.filterTable.doLayout()
},
async setCartesianToEightFour(entities) {
@@ -763,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
@@ -783,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);
}
@@ -906,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) {
@@ -915,45 +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
- }
- })
- console.log(1, col)
- if (col.length == 0) {
- col = outlineList.filter((ste) => {
- if (ste.name == '鍏朵粬') {
+ 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
+
+ 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)
}
- 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: 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)
+ this.$store.state.histLenged = true;
}
- this.$store.state.histLenged = true;
+
+
+
},
--
Gitblit v1.9.3