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 0000000..a8f809c Binary files /dev/null and b/src/assets/images/personInfo.png differ 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: `