From cfc1abd6b855c3575d5d20646bb4dd97d8601469 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期一, 16 十月 2023 10:51:06 +0800
Subject: [PATCH] 钻孔柱状图修改
---
src/components/MapView/mapSpacePop.vue | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 010381d..ceb8d8c 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -9,7 +9,7 @@
<el-form-item>
<el-input
size="small"
- style="width:47vh"
+ style="width:30vh"
v-model="ruleForm.fileName"
disabled
placeholder="璇疯緭鍏�..."
@@ -507,8 +507,12 @@
async getTableselectFields() {
const data = await inquiry_selectFields({ name: this.spaceLayer })
if (data.code != 200) {
- this.$message.error("鍒楄〃璋冪敤澶辫触")
+ this.$message.error("鍒楄〃璋冪敤瀛楁澶辫触")
}
+ if (data.result.length == 0) {
+ this.$message("鍒楄〃璋冪敤瀛楁鏌ユ棤鏁版嵁")
+ }
+
this.filedsOption = [];
this.optionx = []
var valadata = data.result
@@ -590,10 +594,14 @@
},
//鍒濆鍖栨煡璇㈤槇鍊艰〃
async getDomainsLayer() {
+ this.$store.state.loading = true;
const data = await inquiry_selectDomains({ name: this.spaceLayer })
if (data.code != 200) {
- this.$message.error("鍒楄〃璋冪敤澶辫触")
+ this.$message.error("鍒楄〃闃堝�艰皟鐢ㄥけ璐�")
}
+ // if (data.result.length == 0) {
+ // this.$message("鍒楄〃闃堝�兼煡鏃犳暟鎹�")
+ // }
this.domainsLayer = data.result
this.setListDataStart()
@@ -625,9 +633,16 @@
}
const data = await dataQuerySelectByPage(this.listdata)
+ this.$store.state.loading = false;
if (data.code != 200) {
- this.$message.error("鍒楄〃璋冪敤澶辫触")
+ return this.$message.error("鍒楄〃璋冪敤澶辫触")
}
+ if (data.result.length == 0) {
+ return this.$message("鍒楄〃鏌ユ棤鏁版嵁")
+ }
+
+
+
var val = data.result;
val = val.filter((res) => {
@@ -1015,6 +1030,7 @@
hasGeom: 1,
}
const data = await dataQuerySelectByPage(obj)
+
if (data.code != 200) {
return
}
@@ -1045,11 +1061,12 @@
var val1 = decr(val[i].geom)
var wkt = this.$wkt.parse(val1)
var coord = wkt.coordinates
+ var alt = val[i].elev == null ? 0 : val[i].elev;
std.push({
bh: val[i].exppointid,
X: coord[0],
Y: coord[1],
- Z: val[i].elev,
+ Z: alt,
soilLayers: soilLayers
})
}
@@ -1090,18 +1107,16 @@
for (let i = 0; i < jsonObj.length; i++) {
var p = jsonObj[i];
var layers = p.soilLayers;
- points.features.push(turf.point([parseFloat(p.X), parseFloat(p.Y)], { alt: p.Z }));
+ var alHeight = p.Z;
+ points.features.push(turf.point([parseFloat(p.X), parseFloat(p.Y)], { alt: alHeight }));
for (let j = 0; j < layers.length; j++) {
let obj = layers[j];
-
if (obj.geoname == zfbh) {
if (j == 0) {
-
- featurePoints.push(...[parseFloat(p.X), parseFloat(p.Y), parseFloat(p.Z)]);
- featurePoints1.push(...[parseFloat(p.X), parseFloat(p.Y), (parseFloat(p.Z) - parseFloat(obj.botdepth))]);
+ featurePoints.push(...[parseFloat(p.X), parseFloat(p.Y), parseFloat(alHeight)]);
+ featurePoints1.push(...[parseFloat(p.X), parseFloat(p.Y), (parseFloat(alHeight) - parseFloat(obj.botdepth))]);
} else {
- let obj_height = this.GetRealHeight(j, layers, p.Z);
-
+ let obj_height = this.GetRealHeight(j, layers, alHeight);
featurePoints.push(...[parseFloat(p.X), parseFloat(p.Y), parseFloat(obj_height.topHeight)]);
featurePoints1.push(...[parseFloat(p.X), parseFloat(p.Y), parseFloat(obj_height.bottomHeight)]);
@@ -1129,6 +1144,7 @@
//缁勮椤跺簳闈㈠洓涓《鐐�
this.CreateRoundMian(aboveTin, aboveHull, underTin, underHull, materialColor);
//鍒涘缓闈�
+
this.CreateTin(aboveTin, materialColor);
this.CreateTin(underTin, materialColor);
},
@@ -1201,7 +1217,6 @@
CreateTin(tin, materialColor) {
for (let n = 0; n < tin.features.length; n++) {
let geoms = tin.features[n].geometry.coordinates[0];
-
let points = [];
let p1 = new Cesium.Cartesian3.fromDegrees(geoms[0][0], geoms[0][1], tin.features[n].properties.a);
let p2 = new Cesium.Cartesian3.fromDegrees(geoms[1][0], geoms[1][1], tin.features[n].properties.b);
@@ -1485,7 +1500,7 @@
}
.bottomPage {
position: absolute;
- bottom: 3%;
+ bottom: 10px;
}
/deep/.el-form-item {
margin-bottom: 0px;
--
Gitblit v1.9.3