From f443ca8f07c99f130c863efbb81e4f8d9aec6576 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 03 Apr 2024 11:31:25 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/list/road.vue | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/views/list/road.vue b/src/views/list/road.vue
index cec8579..ea2465c 100644
--- a/src/views/list/road.vue
+++ b/src/views/list/road.vue
@@ -223,7 +223,7 @@
RegExp.$1,
(date.getFullYear() + "").substr(4 - RegExp.$1.length)
);
- for (var k in o)
+ for (let k in o)
if (new RegExp("(" + k + ")").test(fmt))
fmt = fmt.replace(
RegExp.$1,
@@ -240,7 +240,7 @@
enableMapClick: false, //������������������
});
// ������������������������������������
- var point = new BMapGL.Point(116.404, 39.915);
+ let point = new BMapGL.Point(116.404, 39.915);
this.map.centerAndZoom("���������", 15);
this.map.enableScrollWheelZoom(true); // ������������������������������������������������������s
this.drawingManager = new BMapGLLib.DrawingManager(this.map, {
@@ -313,6 +313,8 @@
<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-popconfirm
title="������������������"
ok-text="������"
@@ -337,27 +339,11 @@
private batchid: any = 0;
private batchshow: boolean = false;
private handleEditbatch(record: any) {
- let ptsWithin = turf.pointsWithinPolygon(this.multiPt, this.turfPolygon);
- console.log("ptsWithin", ptsWithin);
- let data: { flylon: number; flylat: number }[] = [];
- turf.coordEach(ptsWithin, (currentCoord) => {
- data.push({
- flylon: currentCoord[0],
- flylat: currentCoord[1],
- });
- });
- console.log("data", data);
this.check = false;
this.startstate = "batch";
- post("coordinateDetail/batch", {
- coordinateId: record.coordinateId,
- list: data,
- mac: this.carvalue,
- }).then((res) => {
- console.log(res);
- this.$message.success(res.data.message);
- // this.selectCar()
- });
+ this.batchshow = true;
+ // this.selectCar();
+ this.batchid = record.coordinateId;
}
private handlebatch() {
// this.selectCar()
@@ -372,6 +358,9 @@
console.log("this.starttime", this.starttime);
console.log("this.starttime", this.endtime);
post("coordinateDetail/batch", {
+ type: "0",
+ time1: this.starttime,
+ time2: this.endtime,
coordinateId: this.batchid,
mac: this.carvalue,
}).then((res) => {
@@ -379,6 +368,30 @@
this.$message.success(res.data.message);
this.starttime = "";
this.endtime = "";
+ // this.selectCar()
+ });
+ }
+ private canvasbatch(record: any) {
+ let ptsWithin = turf.pointsWithinPolygon(this.multiPt, this.turfPolygon);
+ console.log("ptsWithin", ptsWithin);
+ let data: { flylon: number; flylat: number }[] = [];
+ turf.coordEach(ptsWithin, (currentCoord) => {
+ data.push({
+ flylon: currentCoord[0],
+ flylat: currentCoord[1],
+ });
+ });
+ console.log("data", data);
+ this.check = false;
+ this.startstate = "batch";
+ post("coordinateDetail/batch", {
+ type: "1",
+ coordinateId: record.coordinateId,
+ list: data,
+ mac: this.carvalue,
+ }).then((res) => {
+ console.log(res);
+ this.$message.success(res.data.message);
// this.selectCar()
});
}
@@ -564,12 +577,12 @@
that.carDataList = [];
let pointSlint = [];
- for (var i = 0; i < res.data.data.rsData.length; i++) {
+ for (let i = 0; i < res.data.data.rsData.length; i++) {
that.carDate.push(res.data.data.rsData[i]);
pointSlint.push(res.data.data.rsData[i].data.split("_").map(Number));
}
this.multiPt = turf.points([...pointSlint]);
- for (var i = 0; i < res.data.data.data.length; i++) {
+ for (let i = 0; i < res.data.data.data.length; i++) {
that.carDataList.push(res.data.data.data[i]);
}
that.map.clearOverlays();
@@ -578,17 +591,17 @@
if (res.status === 200) {
for (let i = 0; i < that.carDate.length; i++) {
//������������point
- var myIcon = new BMapGL.Icon(
+ let myIcon = new BMapGL.Icon(
require("@/assets/723cd95f31481a502d495b2d814d658.png"),
new BMapGL.Size(50, 50),
{}
);
- var startIcon = new BMapGL.Icon(
+ let startIcon = new BMapGL.Icon(
require("@/assets/start.png"),
new BMapGL.Size(50, 50),
{}
);
- var endIcon = new BMapGL.Icon(
+ let endIcon = new BMapGL.Icon(
require("@/assets/end.png"),
new BMapGL.Size(50, 50),
{}
@@ -620,7 +633,7 @@
};
that.marker[i].iconPng = "myIcon";
}
- var infoWindow = "";
+ let infoWindow = "";
//that.marker[i].name = that.carDate[i].time;
that.marker[i].on("mouseover", function(e) {
infoWindow = new BMapGL.InfoWindow(
@@ -693,7 +706,7 @@
for (let i = 0; i < that.carDataList.length; i++) {
// console.log(that.carDataList[i],'that.carDataList[i]');
//������������point
- var myIcon = new BMapGL.Icon(
+ let myIcon = new BMapGL.Icon(
require("@/assets/fb259ce2e368f6853a58b91d6f6b293.png"),
new BMapGL.Size(50, 50)
);
@@ -767,14 +780,14 @@
}
private setZoom(bPoints: any) {
- var view = this.map.getViewport(eval(bPoints));
- var mapZoom = view.zoom;
- var centerPoint = view.center;
+ let view = this.map.getViewport(eval(bPoints));
+ let mapZoom = view.zoom;
+ let centerPoint = view.center;
this.map.centerAndZoom(centerPoint, mapZoom);
}
private selectLuName: any = null;
private selectLu() {
- var macType = null;
+ let macType = null;
if (this.carvalue !== "������������������") {
macType = this.carvalue;
}
--
Gitblit v1.8.0