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

Administrator

2021-12-03 ac6556e77b1008e123a09c91ab1c621a6a2f90dc

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

 src/views/map/gunGps.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-02 08:50:15
 * @Last Modified time: 2021-12-02 17:48:21
 * menu-name 押运人员定位
 */
<template>
@@ -201,11 +201,13 @@

            getTrack({
                idCardNo: val.cardNo,
                startTime: start,
                endTime: end,
                startTime: "2020-05-02",
                endTime: "2020-05-03",
            }).then((res) => {
                var result = res.data.res;
                if (JSON.stringify(res) != "{}") {

                var result = res.data.data.res;

                if (JSON.stringify(result) != "{}") {
                    var array = result.sort(function (a, b) {
                        return a['dwsj'] < b['dwsj'] ? 1 : -1
                    })
@@ -267,7 +269,7 @@
                startTime: start,
                endTime: end,
            }).then((res) => {
                var result = res.data.res;
                var result = res.data.data.res;
                if (result.length > 1) {
                    let arr = [];