From ad87695f8b24646370b83674e65ffe9218881a4c Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 17:15:25 +0800
Subject: [PATCH] 修改废气 修改废气废水明細表显示問題
---
src/components/LayerController/logic/WasteGas.js | 13 +++++++++----
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 6 +++---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 5 ++++-
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index c4edc8c..5da2a6f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -40,10 +40,10 @@
console.log(this.$attrs.value)
if (this.$attrs.value === 'feiqi') {
this.tableData = this.$attrs.getWasteGasDetails
- console.log(this.$attrs.getWasteGasDetails)
- } else if (this.$attrs.getWasteWaterMonitoringDetails) {
+ // console.log(this.$attrs.getWasteGasDetails)
+ } else if (this.$attrs.value === 'feishui') {
this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ // console.log(this.$attrs.getWasteWaterMonitoringDetails)
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 6cdf973..2cccd58 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -12,7 +12,10 @@
<public-table v-if="value === 'gufei'"
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+ :value="value"
+ :getWasteWaterMonitoring="getWasteWaterMonitoring"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails
+"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index a83e948..e9f3aeb 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -29,13 +29,18 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
const ContrLevel = data[i].ContrLevel
var iconUrl = this.differentTypes(ContrLevel)
-
- const marker = L.marker.magic([positionX, positionY], {
+ // const marker = L.canvasMarker([positionX, positionY], {
+ // img: {
+ // // url: 'assets/images/map/marker-icon.png',
+ // url: iconUrl,
+ // size: STYLES.ICON_SIZE
+ // }
+ const marker = L.marker([positionX, positionY], {
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [20, 35],
+ iconAnchor: [10, 20]
})
})
layer.addLayer(marker)
--
Gitblit v1.8.0