From db929db466201b100a5af70add4a8f6b46bb8b5d Mon Sep 17 00:00:00 2001
From: 陈泽平 <qibolin02429@126.com>
Date: 星期一, 17 五月 2021 10:30:50 +0800
Subject: [PATCH] 企业图层展示控制
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 5 +++--
src/components/LayerController/logic/Company.js | 38 +++++++++++++++++++++++++-------------
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 10 +++++-----
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 8c4bd07..962ec96 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -1,6 +1,7 @@
/**
- * 鍥哄簾
+ * 浼佷笟
*/
+
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const companyImg = '/assets/images/map/company_refining.png'
const companyOil = '/assets/images/map/company_oil.png'
@@ -13,8 +14,8 @@
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
+
this.init = async (layer, L) => {
- // const SolidWasteIcon = this.SolidWasteIcon()
this.animalService = new AnimalService({
L: L,
layer: layer
@@ -56,30 +57,41 @@
direction: 'bottom',
className: 'company-bindTooltip'
}) */
- layer.addLayer(marker)
+ // layer.addLayer(marker)
+ if (window.map.getZoom() <= 5) {
+ layer.addLayer(marker)
+ } else if (window.map.getZoom() >= 12) {
+ layer.removeLayer()
+ }
}
}
/*
* 鐐逛綅榧犳爣绉诲叆寮规
* */
this.bindTooltip = (layer) => {
- // console.log(layer)
+ // console.log(layer)
return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
- '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
- '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
- '</ul></div>'// layer.options.test.name
+ '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
+ '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
+ '</ul></div>'// layer.options.test.name
}
/*
* 鐐逛綅鐐瑰嚮浜嬩欢
*
* */
this.clickListener = (e) => {
- // this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.name
+ console.log(e)
+ window.map.setView(e.latlng, 13)
+ if (window.map.getZoom() >= 12) {
+ e.layer.remove()
}
- debugger
- console.log(dataValue)
- // return this.PublicBounced.$el
+ // if (window.map.getZoom() <= 5) {
+ // e.layer.addLayer()
+ // } else if (window.map.getZoom() >= 12) {
+ // e.layer.removeLayer()
+ // }
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.name
+ // }
}
}
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 40bc1b5..6f9f0e8 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -43,8 +43,8 @@
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
:class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
<img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>
- <h3>璧勬簮绫诲瀷:{{item.properties.adminzonename}}</h3>
- <h5>璧勬簮鍚嶇О:{{item.properties.type}}</h5>
+ <h3>璧勬簮绫诲瀷:{{item.properties.type}}</h3>
+ <h5>璧勬簮鍚嶇О:{{item.properties.companyname}}</h5>
<p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p>
<p>鐢佃瘽:<span>{{item.properties.telephone}}</span></p>
</div>
@@ -125,6 +125,7 @@
this.wfsHelper.addLike('name', this.form.keyword)
}
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.list = res.features
}
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 9b9785b..59b3920 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -526,12 +526,12 @@
this.bgPoint = res.data[0].startControlPoint
- const point = JSON.parse(this.bgPoint.geomText)
+ // const point = JSON.parse(this.bgPoint.geomText)
- const p = [point.coordinates[1], point.coordinates[0]]
+ // const p = [point.coordinates[1], point.coordinates[0]]
// this.bgMarker = this.createFlowMarker(p)
- this.bgMarker = pulseEffect(p)
+ // this.bgMarker = pulseEffect(p)
// this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
// this.bgMarker.addTo(window.map)
// window.map.flyTo(p)
@@ -561,11 +561,11 @@
},
bgFmClick (e) {
// console.log('鐐瑰嚮褰卞搷鐨勯榾闂�')
- console.log(e)
+ // console.log(e)
// const point = [e.data[0][0], e.data[0][1]]
const point = [e.startControlPoint.y, e.startControlPoint.x]
- // const marker = this.createFlowMarker(point)
pulseEffect(point)
+ // const marker = this.createFlowMarker(point)
// marker.addTo(window.map)
// window.map.flyTo(point, 17)
},
--
Gitblit v1.8.0