From 2c562e0c277ffe2bc90a39081a2b456e9d23c948 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 01 Dec 2021 09:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys
---
src/views/commandQuery/taskDistribution.vue | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 454a66c..330bee0 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -86,7 +86,7 @@
// import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
-import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList, getNewPeople, getNewTark } from "@/api/map/people";
+import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList, getNewPeople } from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
@@ -496,38 +496,20 @@
startTime: start,
endTime: end,
}).then((res) => {
- getNewTark().then(res => {
-
- if (JSON.stringify(res.data.track) != "{}") {
-
- if (res.data.track.length > 1) {
+ var result = res.data.data;
+ if (JSON.stringify(res) != "[]") {
+ result.forEach((item) => {
+ if (item.length > 1) {
let arr = [];
- res.data.track.forEach((item) => {
- arr.push([Number(item.gis_jd), Number(item.gis_wd)]);
+ item.forEach((data) => {
+ arr.push([Number(data.longitude), Number(data.latitude)]);
});
this.$refs.tarckForm.addLines(arr);
}
-
- }
-
- })
-
- // var result = res.data.data;
- // if (JSON.stringify(res) != "[]") {
- // result.forEach((item) => {
- // if (item.length > 1) {
- // let arr = [];
-
- // item.forEach((data) => {
- // arr.push([Number(data.longitude), Number(data.latitude)]);
- // });
-
- // this.$refs.tarckForm.addLines(arr);
- // }
- // })
- // }
+ })
+ }
});
},
--
Gitblit v1.9.3