From 60e16bd5406c4cbdf61bf20a50e8e1b49a45b2aa Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 06 Sep 2024 11:14:59 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/list/road.vue | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/src/views/list/road.vue b/src/views/list/road.vue
index b302774..ebdfce7 100644
--- a/src/views/list/road.vue
+++ b/src/views/list/road.vue
@@ -28,9 +28,6 @@
<a-button type="primary" style="margin-left: 10px" @click="selectCheck"
>������</a-button
>
- <a-button type="primary" style="margin-left: 10px" @click="reosurce"
- >������������������</a-button
- >
</div>
<div class="left-five">
<a-input
@@ -44,12 +41,6 @@
<a-button type="primary" style="margin-left: 10px" @click="clearPolygon"
>������������</a-button
>
- <a-button
- type="primary"
- style="margin-left: 10px"
- @click="showAllPolygon"
- >������������������</a-button
- >
</div>
<div class="left-two">
<a-table
@@ -62,6 +53,15 @@
></a-table>
</div>
<div class="left-three" style="margin-top: 20px">
+ <a-button type="primary" style="margin-left: 10px" @click="reosurce"
+ >������������������</a-button
+ >
+ <a-button
+ type="primary"
+ style="margin-left: 10px"
+ @click="showAllPolygon"
+ >������������������</a-button
+ >
<a-button
v-show="upa === ''"
type="primary"
@@ -317,16 +317,10 @@
private opRender(text: string, record: any, index: number) {
return (
- <div style="width:180px">
+ <div style="width:180px;text-align:left">
<a onClick={() => this.handleEditModalVisible(record)}> ������ </a>
<a-divider type="vertical" />
<a onClick={() => this.handleEditbatch(record)}> ������������ </a>
- <a-divider type="vertical" />
- <a onClick={() => this.canvasbatch(record)}> ������������������ </a>
- <a-divider type="vertical" />
- <a onClick={() => this.handleEditCanves(record)}> ������������ </a>
- <a-divider type="vertical" />
- <a onClick={() => this.handleShowPolygon(record)}> ������������ </a>
<a-divider type="vertical" />
<a-popconfirm
title="������������������"
@@ -336,6 +330,12 @@
>
<a href="#">������</a>
</a-popconfirm>
+ <br></br>
+ <a onClick={() => this.canvasbatch(record)}> ������������������ </a>
+ <a-divider type="vertical" />
+ <a onClick={() => this.handleEditCanves(record)}> ������������ </a>
+ <br></br>
+ <a onClick={() => this.handleShowPolygon(record)}> ������������ </a>
</div>
);
}
@@ -386,16 +386,24 @@
}
// ������������������
showAllPolygon() {
- console.log("this.dataSource", this.dataSource);
- this.dataSource.forEach((item: any) => {
- if (item.bdValues) {
- let pointList = item.bdValues.map((item: any) => {
- return new BMapGL.Point(item.lng, item.lat);
- });
- let polygon = new BMapGL.Polygon([...pointList]);
- console.log("polygon", polygon);
- this.map.addOverlay(polygon);
- }
+ let macType = null;
+ if (this.carvalue !== "������������������") {
+ macType = this.carvalue;
+ }
+ get("coordinate/selectCruiserRoad", {
+ name: "",
+ mac: macType,
+ }).then((res) => {
+ res.data.data.forEach((item: any) => {
+ if (item.bdValues) {
+ let pointList = item.bdValues.map((item: any) => {
+ return new BMapGL.Point(item.lng, item.lat);
+ });
+ let polygon = new BMapGL.Polygon([...pointList]);
+ console.log("polygon", polygon);
+ this.map.addOverlay(polygon);
+ }
+ });
});
}
// ������������
@@ -435,7 +443,6 @@
flylat: currentCoord[1],
});
});
- console.log("data", data);
this.check = false;
this.startstate = "batch";
post("coordinateDetail/batch", {
--
Gitblit v1.8.0