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

shuishen

2021-11-17 45f6dd436ad910d9ff1c65913452d6bc141b052a

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

 src/components/map/main.vue

@@ -58,7 +58,7 @@
import { get as getProjection } from "ol/proj";
import XYZ from "ol/source/XYZ";

import start from "@/assets/img/start.png";
import start from "/img/mapicon/start.png";

export default {
    name: "Map",

 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-15 15:52:11
 * menu-name 监管信息
 */
<template>
@@ -85,7 +85,7 @@
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList } from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
import peoplePng from "/img/mapicon/people.png";

export default {
    data () {
@@ -395,7 +395,7 @@
                            "peopleAddlayer"
                        );
                    })
                    

                }
            });
        },

 src/views/home/index.vue

@@ -746,9 +746,9 @@
  getSecurityUnitInfoPage
} from "../../api/index/index";

import car from "@/assets/img/car.png";
import peo from "@/assets/img/people.png";
import gun from "@/assets/img/gun.png";
import car from "/img/mapicon/car.png";
import peo from "/img/mapicon/people.png";
import gun from "/img/mapicon/gun.png";

import website from "@/config/website";


 src/views/home/indexEchart.js

@@ -586,7 +586,7 @@
        item.linkman +
        "<br />联系电话：" +
        item.tel;
      symbolUrl = require("@/assets/img/people.png");
      symbolUrl = require("/img/mapicon/people.png");
      obj = {
        name: label,
        value: allData["geoData"][i]
@@ -604,7 +604,7 @@
        item.linkman +
        "<br />联系电话：" +
        item.tel;
      symbolUrl = require("@/assets/img/car.png");
      symbolUrl = require("/img/mapicon/car.png");
      obj = {
        name: label,
        value: allData["geoData"][i]
@@ -622,7 +622,7 @@
        item.linkman +
        "<br />联系电话：" +
        item.tel;
      symbolUrl = require("@/assets/img/gun.png");
      symbolUrl = require("/img/mapicon/gun.png");
      obj = {
        name: label,
        value: allData["geoData"][i]

 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-09-03 16:20:17
 * @Last Modified time: 2021-11-15 15:52:47
 * menu-name 押运人员定位
 */
<template>
@@ -139,7 +139,7 @@
<script>
import { getCarList, getPosition, getTrack } from "@/api/map/car";

import carPng from "@/assets/img/car.png";
import carPng from "/img/mapicon/car.png";

export default {
    data () {

 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-07-23 11:20:51
 * @Last Modified time: 2021-11-15 15:52:52
 * menu-name 押运人员定位
 */
<template>
@@ -143,7 +143,7 @@
<script>
import { getGunList, getPosition, getTrack } from "@/api/map/gun";

import gunPng from "@/assets/img/gun.png";
import gunPng from "/img/mapicon/gun.png";

export default {
  data() {

 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-07-23 14:54:47
 * @Last Modified time: 2021-11-15 15:52:56
 * menu-name 押运人员定位
 */
<template>
@@ -133,7 +133,7 @@
<script>
import { getPeopleList, getPosition, getTrack } from "@/api/map/people";

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

export default {
    data () {