From 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 18:04:10 +0800
Subject: [PATCH] +解决和冲突合并，加上适应1366*768分辨率
---
src/views/commandQuery/taskDistribution.vue | 122 +++++-----------------------------------
1 files changed, 16 insertions(+), 106 deletions(-)
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index aa9cf46..d8a7608 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -16,9 +16,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"
@@ -96,8 +93,6 @@
import {
getDirectiveLiveLocationVoList,
getDirectiveLocusInfoList,
- getNewPeople,
- getNewTark,
} from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
@@ -179,7 +174,6 @@
search: true,
searchLabelWidth: 90,
searchSpan: 4,
- width: 100,
// hide: true,
// editDisplay: false,
// addDisplay: false
@@ -248,56 +242,6 @@
this.$store.commit("setWindowSizeHeightAdd");
},
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) => {
@@ -345,8 +289,8 @@
this.data = data.records;
// for (var k in this.data) {
// this.data[k]["url"] = "https://avuejs.com/images/logo-bg.jpg";
- this.$store.commit("setWindowSizeHeightAdd");
// }
+ this.$store.commit("setWindowSizeHeightAdd");
// console.log(this.data, "getLisperetaskDistribution");
this.loading = false;
// this.selectionClear();
@@ -404,16 +348,13 @@
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;
- });
-
+ var res = result.data.data;
+ if (JSON.stringify(res) != "[]") {
+ res.forEach((data) => {
this.$refs.locationForm.addEntitys(
{
- LGTD: arr[0].gis_jd,
- LTTD: arr[0].gis_wd,
+ LGTD: data.longitude,
+ LTTD: data.latitude,
name: "人员位置",
},
peoplePng,
@@ -421,25 +362,8 @@
"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"
- // );
- // })
- // }
+ });
+ }
});
},
@@ -492,34 +416,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