From e37f4f58b97d7497265b73e223b16d36bb2f8611 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 13 九月 2023 10:26:45 +0800
Subject: [PATCH] 修改标绘
---
src/views/plotting/plottingInquire.vue | 7 ++++---
src/views/plotting/plotting.vue | 44 ++++++++++++--------------------------------
2 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/src/views/plotting/plotting.vue b/src/views/plotting/plotting.vue
index a794809..b7bf089 100644
--- a/src/views/plotting/plotting.vue
+++ b/src/views/plotting/plotting.vue
@@ -1,14 +1,8 @@
<template>
- <div
- v-drag
- class="plottingBox"
- >
+ <div v-drag class="plottingBox">
<div class="plottingTitle">
<div class="tileLeft">
- <div
- class="titleImg"
- @click="setCloseplotting"
- >
+ <div class="titleImg" @click="setCloseplotting">
<ArrowLeft />
</div>
<div class="titleLable">鏍囩粯鏌ヨ</div>
@@ -18,18 +12,9 @@
<div class="plotting_content_btn">
<span class="plotting_content_title">鏍囩粯宸ュ叿</span>
<div class="plotting_btn">
- <div
- class="btn_box_d btn_box"
- @click="setMenuDraw('point')"
- ></div>
- <div
- class="btn_box_x btn_box"
- @click="setMenuDraw('polyline')"
- ></div>
- <div
- class="btn_box_m btn_box"
- @click="setMenuDraw('polygon')"
- ></div>
+ <div class="btn_box_d btn_box" @click="setMenuDraw('point')"></div>
+ <div class="btn_box_x btn_box" @click="setMenuDraw('polyline')"></div>
+ <div class="btn_box_m btn_box" @click="setMenuDraw('polygon')"></div>
</div>
</div>
<div class="plotting_list">
@@ -47,14 +32,8 @@
/><span>{{ item.name }}</span>
</div>
<div class="plotting_list_tr_btn">
- <div
- class="tr_btn dw"
- @click.stop="setLayerLocation(item)"
- ></div>
- <div
- class="tr_btn sc"
- @click.stop="setLayerRemove(item)"
- ></div>
+ <div class="tr_btn dw" @click.stop="setLayerLocation(item)"></div>
+ <div class="tr_btn sc" @click.stop="setLayerRemove(item)"></div>
</div>
</div>
</div>
@@ -163,13 +142,13 @@
disableDepthTestDistance: Number.POSITIVE_INFINITY,
},
});
- var point = turf.point([geom.lat, geom.lng]);
+ var point = turf.point([geom.lng, geom.lat]);
var wkt = WKT.convert(point.geometry);
list.value.push({
name: name,
- layer: layer,
+ // layer: layer,
icon: "d.png",
wkt: wkt,
lng: geom.lng,
@@ -206,7 +185,7 @@
list.value.push({
wkt: wkt,
name: name,
- layer: layer,
+ // layer: layer,
icon: "x.png",
});
plotNum.value.line++;
@@ -252,7 +231,7 @@
list.value.push({
wkt: wkt,
name: name,
- layer: layer,
+ // layer: layer,
icon: "m.png",
lng: center.geometry.coordinates[0],
lat: center.geometry.coordinates[1],
@@ -280,6 +259,7 @@
getData: {},
};
// store.commit("SET_plotting", obj);
+
store.state.plottingInquireData = obj;
};
watch(
diff --git a/src/views/plotting/plottingInquire.vue b/src/views/plotting/plottingInquire.vue
index fe2e31e..f6c93a1 100644
--- a/src/views/plotting/plottingInquire.vue
+++ b/src/views/plotting/plottingInquire.vue
@@ -90,7 +90,7 @@
</div>
</div>
<div class="download">
- <el-button link @click="download">涓嬭浇 CSV</el-button>
+ <el-button link @click="download">涓嬭浇鍒嗘瀽缁撴灉</el-button>
</div>
</el-tab-pane>
</el-tabs>
@@ -208,6 +208,8 @@
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);
@@ -270,9 +272,8 @@
}
pixelIsShow.value = false;
selectPolygon({ wkt: nVal.entitiesData.wkt });
- // console.log(nVal);
}
- if (nVal.entitiesData.icon == "d.png") {
+ if (nVal && nVal.entitiesData.icon == "d.png") {
selectPoint({
pixel: ScopeBox.value.pixel,
wkt: nVal.entitiesData.wkt,
--
Gitblit v1.9.3