From e5f105b1acb3c63df8aac97ce1c67ad070c0de2d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 15 四月 2021 11:03:21 +0800
Subject: [PATCH] 废气图标
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 9 +++-
src/components/panel/topicSearch/GasWasteSearch.vue | 41 ++++++++++++++++++--
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 11 ++++-
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 17 +++++---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 4 +-
5 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8ccfd54..40c6d5a 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -60,8 +60,8 @@
}
},
destoryed () {
- this.$refs.PublicChart.$refs.Echats.CreateChart()
- this.$refs.PublicChart.$refs.Echats.effChartShow()
+ this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+ this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
},
methods: {
closePopup () {
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index b7d1745..86445ef 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -54,9 +54,12 @@
data () {
return {
currentTab: this.current(),
- active: '1'
+ active: '0'
}
},
+ // updated () {
+ // this.$refs.Echats.DrawEXHRealTimeDateChart()
+ // },
methods: {
tabTaggle (taggleMenu, num) {
this.currentTab = taggleMenu
@@ -65,9 +68,9 @@
},
current (currentTab) {
if (this.$attrs.value === 'feishui') {
- currentTab = 'EChartsHourWasteWater'
+ currentTab = 'EChartsRealWasteWater'
} else {
- currentTab = 'EChartsHour'
+ currentTab = 'ECharts'
}
return currentTab
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index aa37207..fffd525 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -344,14 +344,19 @@
this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
// console.log(this.formInline.timeStart)
// console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
- this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ },
+ updated () {
+ this.DrawRealTimeDateChart()
},
methods: {
onSubmit () {
- this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ this.DrawRealTimeDateChart()
},
// 鐢诲簾姘存姌绾垮浘--瀹炴椂鏁版嵁
- DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
+ DrawRealTimeDateChart () {
+ var legend = this.JsonRealWasteWater.legend
+ var ydatas = this.JsonRealWasteWater.ydatas
+ var yname = this.JsonRealWasteWater.yname
this.RealTimeChart = this.$echarts.init(this.$refs.main)
var serLists = []
for (var i = 0; i < ydatas.length; i++) {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 60cee1d..a6d8e09 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -36,9 +36,7 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:1.5rem;" >
- <div style="width:100%;height:100%;" ref="echarts"> </div>
- </div>
+ <div style="width:5rem;height:1.5rem;" ref="echarts"> </div>
</div>
</div>
</template>
@@ -561,15 +559,17 @@
step: ''
}
},
+ updated () {
+ this.DrawEXHRealTimeDateChart()
+ },
mounted () {
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
// this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.JSONTimeData.BBZMAPPING)
},
methods: {
onSubmit () {
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ this.DrawEXHRealTimeDateChart()
},
/**
* RTDB 鏍煎紡杞崲
@@ -591,7 +591,12 @@
// return dataArray
// },
// 1.鍧愭爣杞村疄鐜�,鐢诲疄鏃舵暟鎹�
- DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
+ DrawEXHRealTimeDateChart () {
+ // var id = this.JsonTimeCtarts.id
+ // var title = this.JsonTimeCtarts.title
+ var legend = this.JsonTimeCtarts.legend
+ var ydatas = this.JsonTimeCtarts.ydatas
+ var yname = this.JsonTimeCtarts.yname
this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
// this.myChart.clear()
var serLists = []
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index d25e810..039db27 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -65,7 +65,7 @@
</div>
<el-scrollbar style="height:264px">
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)"><!-- -->
- <i class="state"></i>
+ <img src="../../../../public/assets/images/map/exhaust/fq_green2.png" alt="" class="state"/>
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
@@ -99,6 +99,7 @@
<script>
import mapApi from '@/api/mapApi'
import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'// import WfsHelper from '@components/helpers/WfsHelper'
+import ImagGreen from '../../../../public/assets/images/map/exhaust/fq_green2.png'
export default {
name: 'GasWasteSearch',
data () {
@@ -156,9 +157,9 @@
pipelineType: this.form.pipelineType,
dataType: this.form.dataType
}
- console.log(param)
- const res = await mapApi.getWasteGas()
- console.log(res)
+ // console.log(param)
+ const res = await mapApi.getWasteGas(param)
+ // console.log(res)
this.list = res.Result.DataInfo
},
// 寮圭獥灞曠ず
@@ -166,6 +167,22 @@
console.log(val)
const pos = [val.Latitude, val.Longitude]
window.map.flyTo(pos, 13)
+ const positionX = val.Latitude
+ const positionY = val.Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
+ const ContrLevel = val.ContrLevel
+ var iconUrl = this.differentTypes(ContrLevel)
+
+ 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
@@ -201,6 +218,22 @@
// this.setPanTo(pos, 250)
}, 1000)
console.log(t1)
+ },
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
+ differentTypes (ContrLevel) {
+ var effectOfChange
+ /*
+ if (ContrLevel === 1) {
+ effectOfChange = ImgBlue
+ } else if (ContrLevel === 2) {
+ */
+ effectOfChange = ImagGreen
+ // } else if (ContrLevel === 3) {
+ // effectOfChange = ImagBright
+ // } else {
+ // effectOfChange = ImgGray
+ // }
+ return effectOfChange
}
}
}
--
Gitblit v1.8.0