保安监管系统-验收版本
shuishen
2021-11-30 3ca8d333c474d35275715a407e61ee53281a4eae
武装押运修改
2 files modified
34 ■■■■■ changed files
src/views/map/carGps.vue 24 ●●●● patch | view | raw | blame | history
src/views/map/peopleGps.vue 10 ●●●● patch | view | raw | blame | history
src/views/map/carGps.vue
@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-11-30 16:08:08
 * @Last Modified time: 2021-11-30 17:31:34
 * menu-name 押运人员定位
 */
<template>
@@ -208,12 +208,11 @@
                var res = result.data.data;
                if (JSON.stringify(res) != "{}") {
                    var csGps = window.coordtransform.bd09togcj02(Number(res.x), Number(res.y));
                    this.$refs.modalForm.addEntitys(
                        {
                            LGTD: csGps[0],
                            LTTD: csGps[1],
                            LGTD: Number(res.x),
                            LTTD: Number(res.y),
                            name: "车辆位置",
                        },
                        carPng,
@@ -297,18 +296,19 @@
                    callbackId: 123
                }).then(res => {
                    axios.get('http://s16s652780.51mypc.cn/car/' + res.data.data).then(result => {
                        var ret = d3.csvParse(result.data)
                        var ret = d3.csvParse(result.data);
                        var b = ret.slice(0, ret.length - 1);
                        var array = b.sort(function (a, b) {
                            return a['ts'] > b['ts'] ? 1 : -1
                        })
                        let arr = [];
                        ret.forEach((item, index) => {
                            if (index < ret.length - 1) {
                        array.forEach((item) => {
                                var csGps = window.coordtransform.bd09togcj02(Number(item.x), Number(item.y));
                                arr.push([csGps[0], csGps[1]]);
                            }
                            arr.push([Number(item.x), Number(item.y)]);
                        })
src/views/map/peopleGps.vue
@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-11-30 15:56:31
 * @Last Modified time: 2021-11-30 17:27:53
 * menu-name 押运人员定位
 */
<template>
@@ -294,10 +294,14 @@
                    if (JSON.stringify(res.data.track) != "{}") {
                        if (res.data.track.length > 1) {
                        var array = res.data.track.sort(function (a, b) {
                            return a['date'] > b['date'] ? 1 : -1
                        })
                        if (array.length > 1) {
                            let arr = [];
                            res.data.track.forEach((item) => {
                            array.forEach((item) => {
                                var csGps = window.coordtransform.bd09togcj02(Number(item.gis_jd), Number(item.gis_wd));
                                arr.push([Number(csGps[0]), Number(csGps[1])]);
                            });