From 03012dbaf8d1dcc43f31feb488f9cbcb7d30f011 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 13 九月 2023 14:24:15 +0800
Subject: [PATCH] 优化
---
src/views/plotting/plottingInquire.vue | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/views/plotting/plottingInquire.vue b/src/views/plotting/plottingInquire.vue
index f6c93a1..c87ada0 100644
--- a/src/views/plotting/plottingInquire.vue
+++ b/src/views/plotting/plottingInquire.vue
@@ -24,10 +24,7 @@
>
<!-- <el-tab-pane label="鍥惧眰灞炴��" name="first">User</el-tab-pane> -->
<el-tab-pane label="鏌ヨ缁撴灉" name="second">
- <div class="chart_box" v-if="chartIsshow">
- <Bar-graph :width="'100%'" :height="'260px'"></Bar-graph>
- </div>
- <div class="inquireContent_input" v-if="!chartIsshow">
+ <div class="inquireContent_input" v-show="pixelIsShow">
<!-- <div class="inquireContent_input_left">
<div class="label">鑼冨洿妗�</div>
<el-input
@@ -38,7 +35,7 @@
<template #append>km</template>
</el-input>
</div> -->
- <div class="inquireContent_input_right" v-show="pixelIsShow">
+ <div class="inquireContent_input_right">
<div class="label">鑼冨洿妗嗗唴鏈�澶у儚绱犲��</div>
<el-select
v-model="ScopeBox.pixel"
@@ -55,6 +52,9 @@
/>
</el-select>
</div>
+ </div>
+ <div class="chart_box" v-if="chartIsshow">
+ <Bar-graph :width="'100%'" :height="'260px'"></Bar-graph>
</div>
<div class="inquireContent_msg" v-if="!chartIsshow">
<div class="inquireContent_msg_k">
@@ -89,7 +89,7 @@
</div>
</div>
</div>
- <div class="download">
+ <div class="download" v-if="!chartIsshow">
<el-button link @click="download">涓嬭浇鍒嗘瀽缁撴灉</el-button>
</div>
</el-tab-pane>
@@ -170,10 +170,12 @@
let resultList = ref([]);
//鍍忕礌閫夋嫨
const pixelChange = (val) => {
- selectPoint({
- pixel: val,
- wkt: `POINT (${store.state.plottingInquireData.entitiesData.lng} ${store.state.plottingInquireData.entitiesData.lat})`,
- });
+ if (store.state.plottingInquireData.entitiesData.icon == "d.png") {
+ selectPoint({
+ pixel: val,
+ wkt: store.state.plottingInquireData.entitiesData.wkt,
+ });
+ }
};
//涓嬭浇csv
const download = () => {
@@ -208,8 +210,7 @@
e.max = "-";
e.min = "-";
}
- console.log(store.state.plottingInquireData.entitiesData.lng);
- console.log(store.state.plottingInquireData.entitiesData.lat);
+
e.lng = store.state.plottingInquireData.entitiesData.lng;
e.lat = store.state.plottingInquireData.entitiesData.lat;
resultList.value.push(e);
@@ -219,6 +220,17 @@
const selectPolyline = async (res) => {
const dt = await selectByPolyline(res);
console.log(dt);
+ // dt.result.forEach((e) => {
+ // if (e.code != 200) {
+ // e.avg = "-";
+ // e.max = "-";
+ // e.min = "-";
+ // }
+
+ // // e.lng = store.state.plottingInquireData.entitiesData.lng;
+ // // e.lat = store.state.plottingInquireData.entitiesData.lat;
+ // // resultList.value.push(e);
+ // });
};
const setLayerLocation = () => {
var entities = Viewer.entities._entities._array;
@@ -261,10 +273,10 @@
inquireData.value = nVal.entitiesData;
if (nVal.entitiesData.icon == "x.png") {
chartIsshow.value = true;
- // selectPolyline({
- // pixel: ScopeBox.value.pixel,
- // wkt: `POINT (${nVal.entitiesData.lng})`,
- // })
+ selectPolyline({
+ pixel: ScopeBox.value.pixel,
+ wkt: nVal.entitiesData.wkt,
+ });
}
if (nVal.entitiesData.icon == "m.png") {
if (nVal.entitiesData.name == oVal.entitiesData.name) {
--
Gitblit v1.9.3