Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

liuyg

2021-11-19 0855c8cef2f2f414cf9a84285421fdcdd5bc6310

 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-17 09:21:36
 * menu-name 监管信息
 */
<template>
@@ -84,7 +84,7 @@
// 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: "图片",
@@ -377,20 +379,23 @@

            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 +443,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);
                        }
                    })
                }
            });
        },