From 30e9bcbb74e210146b114aea7c530e5b09f3c0d4 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 19:08:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/assets/css/map/map-panel-style.less | 1 +
src/components/BaseNav/PublicBounced/PublicBounced.vue | 4 ++--
src/components/panel/topicSearch/SolidWasteSearch.vue | 31 +++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 2ed915f..83a6ced 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -48,6 +48,7 @@
}
.el-dialog {
+ height: 500px;
border: 0.00521rem solid @color;
box-shadow: 0 0 0.03rem @color;
background: rgba(0, 16, 30, 0.8);
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 787f244..8ccfd54 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -59,7 +59,7 @@
ManualData: []
}
},
- beforeUpdate () {
+ destoryed () {
this.$refs.PublicChart.$refs.Echats.CreateChart()
this.$refs.PublicChart.$refs.Echats.effChartShow()
},
@@ -102,7 +102,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 15%;
+ top: 35%;
left: 20%;
.public-bounced-title {
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index d98e78a..3457c1d 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -44,6 +44,7 @@
import mapApi from '@/api/mapApi'
import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
+import defaultImg from '../../../../public/assets/images/map/solidwaste/gf_green2.png'
export default {
name: 'SolidWasteSearch',
@@ -152,10 +153,40 @@
const result = await mapApi.getSolidWaste(data)
this.searchDataDisplay = result.Result.DataInfo
},
+ // 涓嶅悓绫诲瀷鍥剧墖灏佽
+ differentTypes (judgeValue) {
+ var effectOfChange
+ if (judgeValue === 1) {
+ effectOfChange = defaultImg
+ } else {
+ effectOfChange = defaultImg
+ }
+ return effectOfChange
+ },
// 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
async setBounced (val) {
const pos = [val.Latitude, val.Longitude]
window.map.flyTo(pos, 11)
+ // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
+ // for (let i = 0; i < this.searchDataDisplay.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = val.Latitude
+ const positionY = val.Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
+ const judgeValue = val.StorageQty
+ var iconUrl = this.differentTypes(judgeValue)
+
+ const marker = this.L.marker([positionX, positionY], {
+ // totransferData: this.searchDataDisplay[i],
+ icon: this.L.icon({
+ iconUrl: iconUrl,
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
+ })
+ })
+ this.layer.addLayer(marker)
+ // }
const t1 = setTimeout(async () => {
const dataValue = {
StoragePlaceId: val.StoragePlaceId
--
Gitblit v1.8.0