From 43338db5959f96740b5bc0d81a0a13011f9584c8 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 15 四月 2021 17:37:21 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/GasWasteSearch.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index d25e810..b4d485f 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -65,10 +65,10 @@
</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>
+ <h3>{{ item.Name }}</h3>
+ <p>鎵�灞為儴闂細<span>{{ item.porltName }}</span></p>
<p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
@@ -99,11 +99,15 @@
<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 () {
return {
+ layer: window.map,
+ L: window.L,
gdVisible: true,
+ instance: null,
list: [],
total: 0,
inareaTypeOptions: [],
@@ -156,22 +160,38 @@
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
+ console.log(this.list)
},
// 寮圭獥灞曠ず
async handleLocation (val) {
console.log(val)
const pos = [val.Latitude, val.Longitude]
- window.map.flyTo(pos, 13)
+ window.map.flyTo(pos, 15)
+ 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], {
+ 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
}
// 寮规鏍囬
- const title = val.Name
+ const title = val
console.log(title)
// 鍩烘湰淇℃伅 tabs
const result = await mapApi.getWasteGas(dataValue)
@@ -198,9 +218,26 @@
// document.body.removeChild(instance.$el)
// 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
this.instance.setGasData(title, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
+ // console.log(title, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo)
// this.setPanTo(pos, 250)
- }, 1000)
+ }, 100)
console.log(t1)
+ },
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
+ differentTypes (ContrLevel) {
+ // effectOfChange
+ /*
+ if (ContrLevel === 1) {
+ effectOfChange = ImgBlue
+ } else if (ContrLevel === 2) {
+ */
+ const effectOfChange = ImagGreen
+ // } else if (ContrLevel === 3) {
+ // effectOfChange = ImagBright
+ // } else {
+ // effectOfChange = ImgGray
+ // }
+ return effectOfChange
}
}
}
--
Gitblit v1.8.0