From 36175817422a2c319c92673b162385d29b88f381 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Fri, 15 Dec 2023 20:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=89=A7=E6=B3=95=E9=98=9F?=
 =?UTF-8?q?=E5=91=98=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                   |   2 +-
 src/assets/images/personInfo.png  | Bin 0 -> 734 bytes
 src/assets/styles/leaflet.scss    |  23 ++++++++++++++++++++++-
 src/views/bigScreen/map/index.vue |  26 ++++++++++++++++++++------
 4 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/images/personInfo.png

diff --git a/.env.production b/.env.production
index 4070ee3..61fc6e0 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 城市精细化管理监测主题
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://39.101.188.84:9029'
+VUE_APP_BASE_API = 'http://39.101.188.84:9037'
diff --git a/src/assets/images/personInfo.png b/src/assets/images/personInfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8f809c6a879eef213a17ce8ea9f5336bb9e9371
GIT binary patch
literal 734
zcmeAS@N?(olHy`uVBq!ia0vp^CxF<7gAGV3M}M6Nq!^2X+?^QKos)UVz`!)a)5S5Q
zBJS;7#{4D&fwsiC|Nrafd%Lo9U3jgS7AYqzES^)~xxW1U_t?{4jrQ!5d;j{_^P<{4
z+rG|y@%6U-uJoVbb!qS4zk2_3>$T@^Zus|Uf7e=nue$I4ds*xK{^xJ}`o8q|G*4ZJ
zWvq+J6$KPdvnFK=3Mj}*y0KN-uB-}wT4+>PG>2!=kyl!(sREKIN7W@#G)^A-B+|U4
z*`;&okzI$Yw%xHbGOIp+#zJ+Pkay?S#YZ>=7?m7YPN>|ST&Z5a{9BXK8rDm<{}}4a
zSO4kQ_2!M_Y4(*pXRoE$c}IyUFtv1<3M*tO2R3kkbj>rh^k9FfAiJdbOSx&P*2XCj
zUOFIScmLk?bpO(xOw-O(exvvD6Jx$N%{jAs-kB(0rr4`JPHu_W%Hel=ZYJNjs{3<q
za_)><E8ZKg+r}fLU%Bb*#FRKA{h8Cxct2D9{4DA-&=)Rj6CG1PRHm#!;eNlPi;@C2
zmi6TcDKNP-a7^G{JRwlR)J^>UWQd}Pj&T~n7e%K|ewTAE{rINE?%(fL*m20W@E>A-
z*!;oqheFMSNM#k#?k>?(J*{if)*ZP!drJkZXJ5a$=iIa04c?lWZ`f}}&ON^C|C*xX
zbrWu6)jip%6r!Ug2GrsTwtGcH$eN?fZm&57LrX1Q&MEP$`tWj(1WR**08f*n0SDVb
z1t7;}Q)2)BL!Qr<Ecf+A5{9Tb@!>|(wZ&ZLUj4sxR{AxNSUuaEcc1$#_RZ}9>Bk#O
zCh%Qyw1S2#m{YY(Tf8}^n;T?VQ~(1w$k9~YvlH>(U7dV;L)heRDqS{gj7yr~Dil5b
Zvl_G*UaI<h(3=4WJYD@<);T3K0Ra9uK?48)

literal 0
HcmV?d00001

diff --git a/src/assets/styles/leaflet.scss b/src/assets/styles/leaflet.scss
index ae85a07..3c0b7fc 100644
--- a/src/assets/styles/leaflet.scss
+++ b/src/assets/styles/leaflet.scss
@@ -432,4 +432,25 @@
 //   -moz-filter: invert(1) grayscale(0) saturate(0.5) brightness(1.6) opacity(1) hue-rotate(334deg) sepia(10%) !important;
 // filter: invert(1) grayscale(0) saturate(0.5) brightness(1.6) opacity(1) hue-rotate(10deg) sepia(100%) !important;
 // filter: invert(1) grayscale(0) saturate(0.5) brightness(1.6) opacity(1) hue-rotate(195deg) !important;
-// }
\ No newline at end of file
+// }
+// 执法人员icon
+.divIcon-marker {
+  .markers {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .marker-title {
+      width: 100%;
+      height: 100%;
+      text-align: center;
+      padding: 5px;
+      font-size: 14px;
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 20px;
+      background-image: url('../images/personInfo.png');
+      background-size: 100% 100%;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index acb204d..51339b2 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -503,6 +503,7 @@ export default {
     },
     // 执法人员点位
     getTem(){
+      this.personLine = [];
       getDeviceList({imei:'861316060217211'}).then(res=>{
         console.log('res0',res);
         let obj = [];
@@ -527,12 +528,21 @@ export default {
         this.addMark(obj);
       })
     },
+    getIcons(name,src){
+      let icon = L.divIcon({
+        className: 'divIcon-marker',
+        html: `<div class="markers"><div class="marker-title">${name}</div><img src="${src}" /></div>`,
+        iconSize: [100, 50],
+      });
+      return icon
+    },
     addMark(obj) {
       this.mapEvent.mapEvent1.clearLayers();
-      let ico1 = L.icon({
-        iconUrl: require("../../../assets/images/icon/icon1.png"),
-        iconSize: [52, 81],
-      });
+      let ico1 = require("../../../assets/images/icon/icon1.png")
+      // let ico1 = L.icon({
+      //   iconUrl: require("../../../assets/images/icon/icon1.png"),
+      //   iconSize: [52, 81],
+      // });
       let ico2 = L.icon({
         iconUrl: require("../../../assets/images/icon/icon2.png"),
         iconSize: [44, 91],
@@ -556,7 +566,7 @@ export default {
               lng: item.longitude,
               lat: item.latitude,
             },
-            { icon: ico1 }
+            { icon: this.getIcons(item.userName,ico1) }
           )
             .bindPopup(
               `
@@ -1110,7 +1120,11 @@ export default {
     // 切换地图事件
     changeMap(id) {
       this.actionMap = id;
-      this.addMark();
+      if(id == 1) {
+        this.getTem();
+      } else {
+        this.addMark();
+      }
       // switch (id) {
       //   case 1:
       //     this.addMark("执法人员");