From 82732610befafe88ae9512c9ac37e6a4bcf291c7 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 22:59:44 +0800
Subject: [PATCH] 废气小时数据、日数据、人工数据接口替换；增加点位id、检测项id查询；无数据提示；UI优化。
---
src/components/LayerController/logic/WasteWater.js | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 21 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index b862b44..c8b0ff8 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -1,23 +1,37 @@
/**
* 搴熸按
*/
-const AnimalService = require('../service/AnimalService').default
-const AjaxUtils = require('../../../utils/AjaxUtils').default
-// const getWasteWater = require('../../../utils/axios').default
+// 鍏叡鏂规硶 panTo() 寮曠敤
+const { setPanTo } = require('../../../utils/utils')
+
+const AnimalService = require('../service/AnimalService').default
+const mapApi = require('../../../api/mapApi').default
+// 寮圭獥鏁版嵁寮曡繘
+const WasteWaterIndex = require('@components/base-page/WasteWater/WasteWaterIndex').default
+
+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_bright_green.png' // 缂哄け
+const AlarmImg = '/assets/images/map/wastewater/fs_red.png' // 鎶ヨ闂儊
+const WarnImg = '/assets/images/map/wastewater/fs_orange.png' // 棰勮闂儊
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
- this.init = (layer, L) => {
- this.animalService = new AnimalService({ L: L, layer: layer })
- AjaxUtils.get4JsonDataByUrl('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', {
- companyId: 3900100145,
+ this.init = async (layer, L) => {
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
+ const param = {
+ companyId: 3900100145, // 浼佷笟缂栫爜
id: '',
- monType: 1,
- userCode: 'wenchun.deng',
+ monType: 1, // 搴熸按
+ userCode: 'wenchun.deng', // 鐢ㄦ埛鍚嶇О
monDuration: '',
epName: '',
secdDeptId: '',
@@ -26,24 +40,83 @@
dataFlag: '',
runStatus: '',
emissTypeId: ''
- }, function (res) {
- console.log(res)
- const data = res.data.Result.DataInfo
- for (let i = 0; i < data.length; i++) {
- // 缁忕含搴� 浣嶇疆
- const positionX = data[i].Latitude
- const positionY = data[i].Longitude
- layer.addLayer(L.marker([positionX, positionY], {}))
- }
- })
+ }
+ const res = await mapApi.getWasteWater(param)
+ const data = res.Result.DataInfo || {}
+ for (let i = 0; i < data.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
+ const testValue = data[i].ContrLevel
+ const iconUrl = this.differentTypes(testValue)
+ const marker = L.marker([positionX, positionY], {
+ totransferData: data[i],
+ icon: L.icon({
+ iconUrl: iconUrl,
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
+ })
+ })
+ layer.addLayer(marker)
+ }
}
this.bindTooltip = (layer) => {
- return 'aaaa'
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.totransferData.Name
}
this.clickListener = (e) => {
- console.log(e)
this.animalService.pulseEffect(e.latlng)
+ setPanTo(e.latlng, 200)
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ const res = e.layer.options.totransferData
+ window.$layer.open({
+ content: {
+ comp: WasteWaterIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ storagePlaceId: res,
+ OnlineMonEmissPointId: e.layer.options.totransferData.OnlineMonEmissPointId,
+ LabMonPointId: res.LabMonPointId
+ }
+ },
+ title: '澶╂触鐭冲寲' + title // 鏍囬
+ })
+ }
+
+ // 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
+ this.differentTypes = (testValue) => {
+ let testChange
+ 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