From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/WaterWasteSearch.vue | 96 +++++-------------------------------------------
1 files changed, 10 insertions(+), 86 deletions(-)
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 1a1f807..3fca159 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -98,18 +98,14 @@
<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/wastewater/fs_bright_green.png'
+import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
export default {
name: 'WaterWasteSearch',
props: ['title'],
data () {
return {
- layer: window.map,
- L: window.L,
gdVisible: true,
- instance: null,
list: [],
total: 0,
inareaTypeOptions: [],
@@ -172,88 +168,16 @@
console.log(val)
const pos = [val.Latitude, val.Longitude]
window.map.flyTo(pos, 15)
- const positionX = val.Latitude
- const positionY = val.Longitude
-
- // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
- const testValue = val.testValue
- var iconUrl = this.differentTypes(testValue)
-
- const marker = this.L.marker([positionX, positionY], {
- icon: this.L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- })
+ window.$layer.open({
+ content: {
+ content: 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
- console.log(title)
- // 鍩烘湰淇℃伅 tabs
- const detailData = await mapApi.getWasteWater(dataValue)
- const WaterOnlinedata = {
- onLineMonEmissPointId: '23',
- monItemId: '28,31',
- beginTime: '2020-04-06 15:13:20',
- endTime: '2020-04-07 15:13:20',
- dataType: '1'
- }
- const WaterManualData = {
- companyId: '3900100145',
- labMonPointId: '219',
- beginTime: '2020-04-06 15:13:20',
- endTime: ' 2020-04-07 15:13:20'
- }
- const dateData = await mapApi.getQueryLabMonData(WaterManualData)
- const hourData = await mapApi.getQueryOnlineMonData(WaterOnlinedata)
- // 缁戝畾寮规瀹炰緥
- 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.setWaterData(title, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
- console.log(title, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo)
- // this.setPanTo(pos, 250)
- }, 100)
- console.log(t1)
- },
- // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
- differentTypes (testValue) {
- const testChange = ImagGreen
- // switch (testValue) {
- // case 1:
- // testChange = NormalImg
- // break
- // case 2:
- // testChange = OffImg
- // break
- // case 3:
- // testChange = AbnormalImg
- // break
- // case 4:
- // testChange = MissImg
- // break
- // case 5:
- // testChange = NormalImg
- // break
- // case 6:
- // testChange = AlarmImg
- // break
- // case 7:
- // testChange = AbnormalImg
- // break
- // case 8:
- // testChange = WarnImg
- // break
- // }
- return testChange
}
}
}
--
Gitblit v1.8.0