From bdaf8175c4a99326e7d1b1bb4b6d1775b22bed33 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 15 Nov 2021 15:53:25 +0800
Subject: [PATCH] mapicon图标地址更改

---
 public/img/mapicon/gun.png                  |    0 
 public/img/mapicon/people.png               |    0 
 src/views/map/carGps.vue                    |    4 +-
 src/views/commandQuery/taskDistribution.vue |    6 +-
 src/views/home/index.vue                    |    6 +-
 public/img/mapicon/start.png                |    0 
 src/views/map/peopleGps.vue                 |    4 +-
 src/views/map/gunGps.vue                    |    4 +-
 src/views/home/indexEchart.js               |    6 +-
 src/components/map/main.vue                 |   46 +----------------------
 public/img/mapicon/car.png                  |    0 
 11 files changed, 17 insertions(+), 59 deletions(-)

diff --git a/public/img/mapicon/car.png b/public/img/mapicon/car.png
new file mode 100644
index 0000000..3433bab
--- /dev/null
+++ b/public/img/mapicon/car.png
Binary files differ
diff --git a/public/img/mapicon/gun.png b/public/img/mapicon/gun.png
new file mode 100644
index 0000000..8ec6570
--- /dev/null
+++ b/public/img/mapicon/gun.png
Binary files differ
diff --git a/public/img/mapicon/people.png b/public/img/mapicon/people.png
new file mode 100644
index 0000000..a3255a9
--- /dev/null
+++ b/public/img/mapicon/people.png
Binary files differ
diff --git a/public/img/mapicon/start.png b/public/img/mapicon/start.png
new file mode 100644
index 0000000..b6cf24f
--- /dev/null
+++ b/public/img/mapicon/start.png
Binary files differ
diff --git a/src/components/map/main.vue b/src/components/map/main.vue
index 86da603..fae774c 100644
--- a/src/components/map/main.vue
+++ b/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",
@@ -94,49 +94,7 @@
     },
     mounted () {
         //建立地图
-        this.createmap(2); //1为本地
-
-        // 正式服务器上使用
-        this.ol2d = new OlMap({
-            layers: [
-                new OlLayerTile({//矢量地图
-
-                    source: new WMTS({
-                        url: "http://47.49.21.207:7001/PGIS_S_TileMapServer/Maps/YX",
-                        layer: "JX14YGJCIMGL7_L14",
-                        style: "default",
-                        matrixSet: "JX14YGJCIMGL7_L14",
-                        format: "image/png",
-                        wrapX: true,
-                        tileGrid: new WMTSTileGrid({
-                            origin: getTopLeft(projectionExtent),
-                            //resolutions: res.slice(0, 15),
-                            resolutions: resolutions,
-                            matrixIds: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
-                        })
-                    }),
-
-                })
-            ],
-
-            // 注意地图控件的写法
-            controls: defaults().extend([
-                new FullScreen(),
-                new ScaleLine(),
-                // new MousePosition(),
-                new Rotate(),
-                new Attribution()
-            ]),
-            target: 'track_map',
-            view: new OlView({
-                center: [115.85883507433789, 28.708432053474827],
-                projection: projection,
-                zoom: 11,
-                maxZoom: 15,
-                minZoom: 1
-
-            })
-        })
+        this.createmap(1); //1为本地
 
         this.parentParameter();
 
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 2737550..8adc924 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/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"
                         );
                     })
-                    
+
                 }
             });
         },
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f6e0e4e..242e59c 100644
--- a/src/views/home/index.vue
+++ b/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";
 
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index b0c6a9f..b735807 100644
--- a/src/views/home/indexEchart.js
+++ b/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]
diff --git a/src/views/map/carGps.vue b/src/views/map/carGps.vue
index 82ffbed..69b5fea 100644
--- a/src/views/map/carGps.vue
+++ b/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 () {
diff --git a/src/views/map/gunGps.vue b/src/views/map/gunGps.vue
index 2d43106..bfec239 100644
--- a/src/views/map/gunGps.vue
+++ b/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() {
diff --git a/src/views/map/peopleGps.vue b/src/views/map/peopleGps.vue
index f2b73df..6764f35 100644
--- a/src/views/map/peopleGps.vue
+++ b/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 () {

--
Gitblit v1.9.3