From 2716502f2a9bd81f2e8f2de2165b8d3ad284de24 Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Sat, 04 Dec 2021 20:11:55 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys
---
src/views/commandQuery/taskDistribution.vue | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 330bee0..c9f7c71 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-25 15:47:19
+ * @Last Modified time: 2021-12-04 15:54:03
* menu-name 监管信息
*/
<template>
@@ -86,7 +86,7 @@
// import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
-import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList, getNewPeople } from "@/api/map/people";
+import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList } from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
@@ -407,43 +407,25 @@
this.seeLocationFlag = true
getDirectiveLiveLocationVoList({ type: 1, userIds: row.receiveDirectiveIds }).then((result) => {
- getNewPeople().then(res => {
-
- if (JSON.stringify(res.data) != "{}") {
- var arr = res.data.sort(function (a, b) {
- return a['date'] < b['date'] ? 1 : -1
- })
-
- this.$refs.locationForm.addEntitys(
+ var res = result.data.data;
+ if (JSON.stringify(res) != "[]") {
+ res.forEach((data)=>{
+ this.$refs.locationForm.addTextEntitys(
{
- LGTD: arr[0].gis_jd,
- LTTD: arr[0].gis_wd,
+ LGTD: data.longitude,
+ LTTD: data.latitude,
name: "人员位置",
+ deptname: data.deptname,
+ rname: data.rname,
+ phone: data.phone
},
peoplePng,
0.5,
"peoplelayer",
"peopleAddlayer"
);
- }
- })
-
- // var res = result.data.data;
- // if (JSON.stringify(res) != "[]") {
- // res.forEach((data)=>{
- // this.$refs.locationForm.addEntitys(
- // {
- // LGTD: data.longitude,
- // LTTD: data.latitude,
- // name: "人员位置",
- // },
- // peoplePng,
- // 0.5,
- // "peoplelayer",
- // "peopleAddlayer"
- // );
- // })
- // }
+ })
+ }
});
},
--
Gitblit v1.9.3