From c8cf161d6bd6c77f3e326c3be6c6854ec93a8fbd Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 26 Nov 2021 17:28:47 +0800
Subject: [PATCH] 更新
---
src/views/commandQuery/taskDistribution.vue | 118 +++++++++++++++++++----------------------------------------
1 files changed, 38 insertions(+), 80 deletions(-)
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index f182406..b891a2a 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-08-12 21:00:27
+ * @Last Modified time: 2021-11-25 14:54:40
* menu-name 监管信息
*/
<template>
@@ -14,9 +14,6 @@
:permission="permissionList"
v-model="form"
ref="crud"
- @row-update="rowUpdates"
- @row-save="rowSave"
- @row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -43,7 +40,8 @@
:visible.sync="seeLocationFlag"
:modal-append-to-body="false"
width="width">
- <Map ref="locationForm" />
+ <Map v-if="seeLocationFlag"
+ ref="locationForm" />
</el-dialog>
<el-dialog class="see-track"
@@ -67,7 +65,8 @@
</el-button>
</div>
- <Map ref="tarckForm" />
+ <Map v-if="seeTrackFlag"
+ ref="tarckForm" />
</el-dialog>
</basic-container>
</template>
@@ -84,7 +83,8 @@
// import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
-import { getPosition, getTrack } from "@/api/map/people";
+import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList} from "@/api/map/people";
+
import peoplePng from "@/assets/img/people.png";
export default {
@@ -170,9 +170,9 @@
{
label: "接收指令人",
prop: "receiveName",
- search: true,
+ // search: true,
+ // searchSpan: 4,
searchLabelWidth: 90,
- searchSpan: 4,
},
{
label: "发送指令时间",
@@ -184,6 +184,8 @@
{
label: "指令内容",
prop: "content",
+ search: true,
+ searchSpan: 4,
},
{
label: "图片",
@@ -225,56 +227,6 @@
},
},
methods: {
- rowSave (row, done, loading) {
- adddata(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowUpdates (row, index, done, loading) {
- // console.log(42342);
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowDel (row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- },
// beforeOpen(done, type) {
// if (["edit", "view"].includes(type)) {
// getDetail(this.form.id).then((res) => {
@@ -377,20 +329,22 @@
this.seeLocationFlag = true
- getPosition({ type: 1, workerId: row.receiveDirectiveIds }).then((result) => {
+ getDirectiveLiveLocationVoList({ type: 1, userIds: row.receiveDirectiveIds }).then((result) => {
var res = result.data.data;
- if (JSON.stringify(res) != "{}") {
- this.$refs.locationForm.addEntitys(
- {
- LGTD: res.longitude,
- LTTD: res.latitude,
- name: "人员位置",
- },
- peoplePng,
- 0.5,
- "peoplelayer",
- "peopleAddlayer"
- );
+ if (JSON.stringify(res) != "[]") {
+ res.forEach((data) => {
+ this.$refs.locationForm.addEntitys(
+ {
+ LGTD: data.longitude,
+ LTTD: data.latitude,
+ name: "人员位置",
+ },
+ peoplePng,
+ 0.5,
+ "peoplelayer",
+ "peopleAddlayer"
+ );
+ })
}
});
},
@@ -438,21 +392,25 @@
":" +
this.disposeTime(endTime.getSeconds());
- getTrack({
- workerId: this.rowData.receiveDirectiveIds,
+ getDirectiveLocusInfoList({
+ userIds: this.rowData.receiveDirectiveIds,
type: 1,
startTime: start,
endTime: end,
}).then((res) => {
var result = res.data.data;
- if (result.length > 1) {
- let arr = [];
-
+ if (JSON.stringify(res) != "[]") {
result.forEach((item) => {
- arr.push([Number(item.longitude), Number(item.latitude)]);
- });
+ if (item.length > 1) {
+ let arr = [];
- this.$refs.tarckForm.addLines(arr);
+ item.forEach((data) => {
+ arr.push([Number(data.longitude), Number(data.latitude)]);
+ });
+
+ this.$refs.tarckForm.addLines(arr);
+ }
+ })
}
});
},
--
Gitblit v1.9.3