From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/GasWasteSearch.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index df9dd26..b4d485f 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -67,8 +67,8 @@
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)"><!-- -->
<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>
@@ -104,7 +104,10 @@
name: 'GasWasteSearch',
data () {
return {
+ layer: window.map,
+ L: window.L,
gdVisible: true,
+ instance: null,
list: [],
total: 0,
inareaTypeOptions: [],
@@ -161,6 +164,7 @@
const res = await mapApi.getWasteGas(param)
// console.log(res)
this.list = res.Result.DataInfo
+ console.log(this.list)
},
// 寮圭獥灞曠ず
async handleLocation (val) {
@@ -175,7 +179,6 @@
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],
@@ -188,7 +191,7 @@
StoragePlaceId: val.StoragePlaceId
}
// 寮规鏍囬
- const title = val.Name
+ const title = val
console.log(title)
// 鍩烘湰淇℃伅 tabs
const result = await mapApi.getWasteGas(dataValue)
@@ -215,8 +218,9 @@
// 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)
},
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
--
Gitblit v1.8.0