From 64e1db9d04bd4e2dd8ee4e61f2ec1de922c2f84d Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期二, 28 十一月 2023 10:53:06 +0800
Subject: [PATCH] 标绘查询点，多边形添加最大最小值，线查询添加单位
---
src/components/BarGraph.vue | 3 +++
src/views/plotting/plottingInquire.vue | 41 +++++++++++++++++++++++++----------------
public/index.html | 7 ++++---
src/components/BarGraphAxisLine.vue | 4 ++++
src/assets/js/Map/menuTool.js | 1 +
5 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/public/index.html b/public/index.html
index 7734da4..4d7e931 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,14 +10,15 @@
<title>
<%= htmlWebpackPlugin.options.title %>
</title>
+ <link rel="stylesheet" href="./WebSDK/WebSDK.min.css">
+ <script src="./WebSDK/Assets/jquery-2.0.3.js"></script>
+
+ <script src="./WebSDK/WebSDK.min.js"></script>
<script src="./OL/ol.js"></script>
<link href="./OL/ol.css" rel="stylesheet" />
<script src="./OL/proj4.js"></script>
<link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css">
- <link rel="stylesheet" href="./WebSDK/WebSDK.min.css">
- <script src="./WebSDK/Workers/jquery-2.0.3.js"></script>
- <script src="./WebSDK/WebSDK.min.js"></script>
<script src="proj4/proj4.js"></script>
<script src="./config/config.js"></script>
diff --git a/src/assets/js/Map/menuTool.js b/src/assets/js/Map/menuTool.js
index fb8e566..d26e3e6 100644
--- a/src/assets/js/Map/menuTool.js
+++ b/src/assets/js/Map/menuTool.js
@@ -632,6 +632,7 @@
},
//绾挎极娓�
lineRoam() {
+ Viewer.scene.globe.depthTestAgainstTerrain = true;
// 缁樺埗璺嚎骞惰幏鍙栬矾寰勫姩鐢绘暟鎹�
earthCtrl.Command.execute(2, 3, "", (data) => {
diff --git a/src/components/BarGraph.vue b/src/components/BarGraph.vue
index b1d5c64..d057e8c 100644
--- a/src/components/BarGraph.vue
+++ b/src/components/BarGraph.vue
@@ -71,6 +71,7 @@
props.layerData.points.forEach((e, i) => {
xAxisData.value.push(e.len);
});
+
data = trans(props.layerData.points);
optionData = props.layerData.points;
seriesData.value = [];
@@ -116,6 +117,7 @@
if (myChart) {
myChart.clear();
}
+ var unit = props.layerData.unit ? props.layerData.unit : '';
var valXData = [];
xAxisData.value.filter((rs) => {
valXData.push((parseFloat(rs) / 1000).toFixed(3));
@@ -213,6 +215,7 @@
},
yAxis: {
+ name: unit,
type: "value",
show: true, // 涓嶆樉绀哄潗鏍囪酱绾裤�佸潗鏍囪酱鍒诲害绾垮拰鍧愭爣杞翠笂鐨勬枃瀛�
axisTick: {
diff --git a/src/components/BarGraphAxisLine.vue b/src/components/BarGraphAxisLine.vue
index 669447e..9fb4ada 100644
--- a/src/components/BarGraphAxisLine.vue
+++ b/src/components/BarGraphAxisLine.vue
@@ -32,6 +32,7 @@
props.layerData.points.forEach((e, i) => {
xAxisData.value.push(returnFloat1(e.len));
});
+ debugger
data = trans(props.layerData.points);
seriesData.value = [];
data.forEach((e) => {
@@ -81,10 +82,12 @@
return result;
}
function initChart() {
+
let chart = myEcharts.init(
document.getElementById("myEchartsBIG"),
"purple-passion"
);
+ var unit = props.layerData.unit ? props.layerData.unit : '';
var val = [];
xAxisData.value.filter(res => {
val.push((res / 1000).toFixed(3));
@@ -197,6 +200,7 @@
},
yAxis: {
+ name:unit,
type: "value",
},
diff --git a/src/views/plotting/plottingInquire.vue b/src/views/plotting/plottingInquire.vue
index 8dad568..8dc5768 100644
--- a/src/views/plotting/plottingInquire.vue
+++ b/src/views/plotting/plottingInquire.vue
@@ -147,6 +147,8 @@
<div class="table_head_td">搴忓彿</div>
<div class="table_head_td">
<span>鍥惧眰鍚�</span>
+ <span>鏈�澶у��</span>
+ <span>鏈�灏忓��</span>
<span>鍒嗘瀽缁撴灉</span>
</div>
</div>
@@ -154,7 +156,10 @@
<div class="table_tr" v-for="(e, i) in resultList" :key="i">
<div class="table_td">{{ i + 1 }}</div>
<div class="table_td">
- <span>{{ e.layerName }}锛堢背锛�</span>
+
+ <span>{{ e.layerName }}</span>
+ <span>{{ e.max }}</span>
+ <span>{{ e.min }}</span>
<span>{{ e.avg }}</span>
</div>
</div>
@@ -411,6 +416,7 @@
return ElMessage.error("鏌ヨ閿欒");
}
+ debugger
dt.result.forEach((e) => {
if (e.code != 200) {
e.avg = "-";
@@ -425,6 +431,7 @@
resultList.value.push(e);
});
+
console.log(resultList.value);
};
//闈㈡煡璇㈡帴鍙�
@@ -689,7 +696,7 @@
position: absolute;
right: 26px;
top: 80px;
- width: 320px;
+ width: 400px;
background: rgba(7, 8, 14, 0.8);
z-index: 100;
@@ -857,7 +864,7 @@
}
.table_head_td:nth-child(2) {
- width: 237px;
+ width:16.34375vw;
display: flex;
justify-content: space-between;
align-items: center;
@@ -887,12 +894,17 @@
align-items: center;
border-right: 1px solid rgba(214, 228, 255, 0.4);
box-sizing: border-box;
-
+ div{
+ width: 100%;
+ background: skyblue;
+ height: 100%;
+ }
// padding: 5px;
// white-space: nowrap;
span {
+
display: block;
- width: 50%;
+ width: 17%;
word-wrap: break-word;
// white-space: pre;
text-align: left;
@@ -903,22 +915,19 @@
// justify-content: flex-end;
// margin-left: 5%;
// float: right;
- width: 40%;
- text-align: right;
+ // width:16.34375vw;
+ text-align: center;
+ // background: skyblue;
}
}
.table_td:nth-child(2) {
- width: 237px;
+ width: 16.34375vw;
display: flex;
- justify-content: space-between;
- align-items: center;
- // padding: 0 10px;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- border-right: 0;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 10px;
+ border-right: 0;
}
}
--
Gitblit v1.9.3