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 | 130 ++++++------------------------------------
1 files changed, 20 insertions(+), 110 deletions(-)
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 37beb26..b891a2a 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -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 v-if="seeLocationFlag" ref="locationForm" />
+ <Map v-if="seeLocationFlag"
+ ref="locationForm" />
</el-dialog>
<el-dialog class="see-track"
@@ -67,7 +65,8 @@
</el-button>
</div>
- <Map v-if="seeTrackFlag" ref="tarckForm" />
+ <Map v-if="seeTrackFlag"
+ ref="tarckForm" />
</el-dialog>
</basic-container>
</template>
@@ -84,7 +83,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} from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
@@ -228,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) => {
@@ -381,17 +330,13 @@
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
- })
-
+ 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,
@@ -399,25 +344,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"
- // );
- // })
- // }
+ })
+ }
});
},
@@ -470,38 +398,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