From 5db479913ea0e37964064742fb6e82b6e76f5165 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 13 四月 2021 13:48:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteWater.js | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 16c4f17..5b510ae 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -6,10 +6,10 @@
// 寮圭獥鏁版嵁寮曡繘
const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const NormalImg = '/assets/images/map/wastewater/fs_green.png' // 姝ｅ父
+const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
const AbnormalImg = '/assets/images/map/wastewater/fs_blue.png' // 寮傚父
-const MissImg = '/assets/images/map/wastewater/fs_yellow.png' // 缂哄け
+const MissImg = '/assets/images/map/wastewater/fs_bright_green.png' // 缂哄け
const AlarmImg = '/assets/images/map/wastewater/fs_red.png' // 鎶ヨ闂儊
const WarnImg = '/assets/images/map/wastewater/fs_orange.png' // 棰勮闂儊
@@ -24,9 +24,7 @@
layer: layer
})
const res = await mapApi.getWasteWater()
- console.log(res)
- const data = res.Result.DataInfo
- console.log(data)
+ const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
@@ -35,18 +33,20 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
- const marker = L.marker.magic([positionX, positionY], {
+ const marker = L.marker([positionX, positionY], {
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [35, 35],
+ iconAnchor: [18, 18]
})
})
layer.addLayer(marker)
}
}
+ // 鍒嗗壊绾�-------------------------------------------------------------------------------
+ // this.
this.bindTooltip = (layer) => {
return layer.options.test.Name
}
@@ -57,12 +57,33 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
- const result = await mapApi.getWasteWater(dataValue)
+ const hourValue = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '2'
+ }
+ const dateValue = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06',
+ endTime: '2020-04-07',
+ dataType: '1'
+ }
+ const hourData = await mapApi.getQueryOnlineMonData(hourValue)
+ const dateData = await mapApi.getQueryOnlineMonData(dateValue)
+ // console.log(dateData)
+ // const drawback = await mapApi.getWasteWaterMonitoring()
+ // console.log(drawback)
+ const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result)
+ instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
+ // console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
+ this.setPanTo(e.latlng, 80)
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -96,4 +117,11 @@
}
return testChange
}
+ this.setPanTo = (pos, value) => {
+ var position = pos
+ position = window.map.latLngToLayerPoint(position)
+ position.y += value
+ position = window.map.layerPointToLatLng(position)
+ window.map.flyTo(position)
+ }
}
--
Gitblit v1.8.0