From 9e3fe61241b6c6c0a8527a0a0812f585f3ed66ae Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:31:14 +0800
Subject: [PATCH] 更换废气图标
---
src/components/LayerController/logic/WasteGas.js | 2 +-
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 1 -
public/assets/images/map/exhaust/fq_green_new.png | 0
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 11 +++++++----
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/public/assets/images/map/exhaust/fq_green_new.png b/public/assets/images/map/exhaust/fq_green_new.png
new file mode 100644
index 0000000..10ecab2
--- /dev/null
+++ b/public/assets/images/map/exhaust/fq_green_new.png
Binary files differ
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index bd77d75..5ef6f57 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -11,7 +11,6 @@
<el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
<el-dialog :visible.sync="dialogVisible"
:append-to-body="true"
- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName"
width="68%"
center
v-dialogDrag
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 0422b5f..b8958bf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,10 +37,13 @@
}
},
mounted () {
- this.tableData = this.$attrs.getWasteGasDetails
- // console.log(this.$attrs.getWasteGasDetails)
- this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ if (this.$attrs.getWasteGasDetails) {
+ this.tableData = this.$attrs.getWasteGasDetails
+ console.log(this.$attrs.getWasteGasDetails)
+ } else if (this.$attrs.getWasteWaterMonitoringDetails) {
+ this.tableData = this.$attrs.getWasteWaterMonitoringDetails
+ console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ }
}
}
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 59baf56..a83e948 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -7,7 +7,7 @@
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
// const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
// const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
-const ImagGreen = '/assets/images/map/exhaust/fq_green.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green_new.png'
// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
--
Gitblit v1.8.0