Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulator...

liuyg

2021-12-01 2c562e0c277ffe2bc90a39081a2b456e9d23c948

 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 14:54:40
 * @Last Modified time: 2021-11-25 15:47:19
 * menu-name 监管信息
 */
<template>
@@ -43,7 +43,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 +68,8 @@
                </el-button>
            </div>

            <Map v-if="seeTrackFlag" ref="tarckForm" />
            <Map v-if="seeTrackFlag"
                 ref="tarckForm" />
        </el-dialog>
    </basic-container>
</template>
@@ -84,7 +86,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, getNewPeople } from "@/api/map/people";

import peoplePng from "@/assets/img/people.png";

@@ -167,7 +169,26 @@
                        //     editDisplay: false,
                        //     addDisplay: false
                    },

                    {
                        label: "指令时间",
                        prop: "releaseTimeRange",
                        type: "datetime",
                        format: "yyyy-MM-dd hh:mm:ss",
                        valueFormat: "yyyy-MM-dd hh:mm:ss",
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [
                            {
                                required: true,
                                message: "请输入指令时间",
                                trigger: "blur",
                            },
                        ],
                    },
                    {
                        label: "接收指令人",
                        prop: "receiveName",
@@ -315,6 +336,11 @@
        onLoad (page, params = {}) {
            // this.loading = false;
            this.loading = true;
            if (this.query.releaseTimeRange) {
                this.query["startTime"] = this.query.releaseTimeRange[0];
                this.query["endTime"] = this.query.releaseTimeRange[1];
                delete this.query.releaseTimeRange;
            }
            getLisperetaskDistribution(
                page.currentPage,
                page.pageSize,
@@ -470,38 +496,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);
                //         }
                //     })
                // }
                    })
                }
            });
        },