From 8cbb44a2182a992faeeb0c1fa08e64fb104ae75c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 30 Nov 2021 14:30:18 +0800
Subject: [PATCH] 武装修改
---
src/views/map/gunGps.vue | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/views/map/gunGps.vue b/src/views/map/gunGps.vue
index 0a0b251..987d2d4 100644
--- a/src/views/map/gunGps.vue
+++ b/src/views/map/gunGps.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-17 09:21:20
+ * @Last Modified time: 2021-11-30 14:22:39
* menu-name 押运人员定位
*/
<template>
@@ -141,7 +141,7 @@
</template>
<script>
-import { getGunList, getPosition, getTrack } from "@/api/map/gun";
+import { getGunList, getPosition, getTrack, getNewTrack } from "@/api/map/gun";
import gunPng from "@/assets/img/gun.png";
@@ -230,13 +230,7 @@
"-" +
this.disposeTime(startTime.getMonth() + 1) +
"-" +
- this.disposeTime(startTime.getDate()) +
- " " +
- this.disposeTime(startTime.getHours()) +
- ":" +
- this.disposeTime(startTime.getMinutes()) +
- ":" +
- this.disposeTime(startTime.getSeconds());
+ this.disposeTime(startTime.getDate());
if (this.trackTime.length == 1) {
this.$message({ message: "请选择结束时间", duration: 2000 });
return;
@@ -247,31 +241,44 @@
"-" +
this.disposeTime(endTime.getMonth() + 1) +
"-" +
- this.disposeTime(endTime.getDate()) +
- " " +
- this.disposeTime(endTime.getHours()) +
- ":" +
- this.disposeTime(endTime.getMinutes()) +
- ":" +
- this.disposeTime(endTime.getSeconds());
+ this.disposeTime(endTime.getDate());
- getTrack({
- workerId: this.detailObj.id,
- type: 3,
+ // getTrack({
+ // workerId: this.detailObj.id,
+ // type: 3,
+ // startTime: start,
+ // endTime: end,
+ // }).then((res) => {
+ // var result = res.data.data;
+ // if (result.length > 1) {
+ // let arr = [];
+
+ // result.forEach((item) => {
+ // arr.push([Number(item.longitude), Number(item.latitude)]);
+ // });
+
+ // this.$refs.modalForm.addLines(arr);
+ // }
+ // });
+
+ getNewTrack({
startTime: start,
endTime: end,
}).then((res) => {
+ console.log(res, "车辆轨迹");
var result = res.data.data;
if (result.length > 1) {
let arr = [];
- result.forEach((item) => {
- arr.push([Number(item.longitude), Number(item.latitude)]);
+ result.res.forEach((item) => {
+ arr.push([Number(item.dwjd), Number(item.dwwd)]);
});
this.$refs.modalForm.addLines(arr);
}
});
+
+
},
// 处理时间补零操作
disposeTime(s) {
--
Gitblit v1.9.3