From c60e56e2b6ceb633c6b10f5dc52e3da88129ad70 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 21 五月 2021 17:35:41 +0800
Subject: [PATCH] 管线分析相关功能问题修改
---
src/components/panel/topicSearch/GasWasteSearch.vue | 93 +++++++++-------------------------------------
1 files changed, 19 insertions(+), 74 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 039db27..73fc8d6 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>
@@ -98,10 +98,12 @@
<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'
+import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
+import { pulseEffect, setPanTo } from '../../../utils/utils'
+
export default {
name: 'GasWasteSearch',
+ props: ['title'],
data () {
return {
gdVisible: true,
@@ -118,8 +120,6 @@
},
// pageSize: 10,
// current: 1,
- isWaybillHover: true,
- isRouteHover: false,
levelOfRisk: [
{ name: '鍏ㄩ儴', value: '1' },
{ name: '姝ｅ父', value: '2' },
@@ -129,7 +129,6 @@
]
}
},
- props: ['title'],
methods: {
// 鍖哄煙绛涢��
areaType (val) {
@@ -161,79 +160,25 @@
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)
- 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]
- })
+ window.map.setView(pos, 15)
+ window.$layer.open({
+ content: {
+ comp: WasteWaterIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: val
+ }
+ },
+ title: '澶╂触鐭冲寲 ' + val.Name
})
- this.layer.addLayer(marker)
- const t1 = setTimeout(async () => {
- const dataValue = {
- StoragePlaceId: val.StoragePlaceId
- }
- // 寮规鏍囬
- const title = val.Name
- console.log(title)
- // 鍩烘湰淇℃伅 tabs
- const result = await mapApi.getWasteGas(dataValue)
- const GasOnlinedata = {
- onLineMonEmissPointId: '23',
- monItemId: '28,31',
- beginTime: '2020-04-06 15:13:20',
- endTime: '2020-04-07 15:13:20',
- dataType: '1'
- }
- const GasManualData = {
- companyId: '3900100145',
- labMonPointId: '219',
- beginTime: '2020-04-06 15:13:20',
- endTime: ' 2020-04-07 15:13:20'
- }
- const ManualData = await mapApi.getWasteGasManualData(GasManualData)
- const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
- // 缁戝畾寮规瀹炰緥
- this.instance && this.instance.closePopup()
- const PublicBounced = window.Vue.extend(publicBounced)
- this.instance = new PublicBounced().$mount()
- document.body.appendChild(this.instance.$el)
- // document.body.removeChild(instance.$el)
- // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
- this.instance.setGasData(title, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
- // 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
+ pulseEffect([val.Latitude, val.Longitude])
+ setPanTo(pos, 250)
}
}
}
--
Gitblit v1.8.0