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 | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index c3bccaf..c8b0ff8 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -1,15 +1,19 @@
/**
* 搴熸按
*/
+
+// 鍏叡鏂规硶 panTo() 寮曠敤
+const { setPanTo } = require('../../../utils/utils')
+
const AnimalService = require('../service/AnimalService').default
const mapApi = require('../../../api/mapApi').default
// 寮圭獥鏁版嵁寮曡繘
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const WasteWaterIndex = require('@components/base-page/WasteWater/WasteWaterIndex').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' // 棰勮闂儊
@@ -23,7 +27,21 @@
L: L,
layer: layer
})
- const res = await mapApi.getWasteWater()
+ const param = {
+ companyId: 3900100145, // 浼佷笟缂栫爜
+ id: '',
+ monType: 1, // 搴熸按
+ userCode: 'wenchun.deng', // 鐢ㄦ埛鍚嶇О
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
+ const res = await mapApi.getWasteWater(param)
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
@@ -34,11 +52,11 @@
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
const marker = L.marker([positionX, positionY], {
- test: data[i],
+ totransferData: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [20, 20],
- iconAnchor: [10, 10]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -46,25 +64,28 @@
}
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.totransferData.Name
}
- this.clickListener = async (e) => {
- // console.log(e)
+ this.clickListener = (e) => {
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- 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.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
- // console.log(e.layer.options.test)
- instance.$mount()
- document.body.appendChild(instance.$el)
- this.setPanTo(e.latlng, 80)
+ 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 // 鏍囬
+ })
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -97,12 +118,5 @@
break
}
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