From d1354a020cb13d01edc2e922f5d3d691bd7d71a2 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 03 三月 2021 17:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/helpers/ServiceLayerHelper.js | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 656f362..00e2c6f 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -4,6 +4,7 @@
*/
import AjaxUtils from '@/utils/AjaxUtils'
import store from '@/store'
+import styles from '@/conf/Styles'
class ServiceLayerHelper {
constructor (options) {
@@ -98,17 +99,17 @@
var that = this
var icon = opt.icon
const featureGroup = that.L.featureGroup().addTo(that.map)
- that.L.geoJSON(res.features, {
+ const geojson = that.L.geoJSON(res.features, {
style: function (feature) {
return {
- fill: true,
- weight: 2,
- fillColor: '#06cccc',
- color: '#06cccc',
- fillOpacity: 0.2,
- opacity: 0.8,
- dashArray: '10,4',
- dashSpeed: -10
+ fill: styles.defaultLineStyle.fill,
+ weight: styles.defaultLineStyle.weight,
+ fillColor: styles.defaultLineStyle.fillColor,
+ color: styles.defaultLineStyle.color,
+ fillOpacity: styles.defaultLineStyle.fillOpacity,
+ opacity: styles.defaultLineStyle.opacity
+ // dashArray: styles.defaultLineStyle.dashArray,
+ // dashSpeed: styles.defaultLineStyle.dashSpeed
}
},
pointToLayer: function (geoJsonPoint, latlng) {
@@ -118,7 +119,7 @@
img: {
// url: 'assets/images/map/marker-icon.png',
url: '/assets/images/map/' + icon,
- size: [20, 20]
+ size: styles.defaultLineStyle.size
}
})
}
@@ -131,7 +132,19 @@
minWidth: 300,
closeButton: false,
autoClose: false
- }).addTo(featureGroup).bringToFront()
+ }).on('mouseover', function (e) {
+ console.log(e)
+ var layer = e.layer
+ layer.setStyle({ weight: 5 })
+ }).on('mouseout', function (e) {
+ var layer = e.layer
+ layer.setStyle({ weight: styles.defaultLineStyle.weight })
+ }).addTo(featureGroup)
+ if (Object.prototype.hasOwnProperty.call(res, 'features') && res.features.length > 0 && (res.features[0].geometry.type === 'LineString' || res.features[0].geometry.type === 'MultiLineString')) {
+ geojson.bringToBack()
+ } else {
+ geojson.bringToFront()
+ }
return featureGroup
}
--
Gitblit v1.8.0