From 4df0471b7dff0494625ff09969b1a13b5359a26e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期一, 31 五月 2021 22:41:47 +0800
Subject: [PATCH] 统计表弹框UI优化；增加点击企业名称缩放至企业；二级表展示功能优化。
---
src/components/LayerController/logic/WasteGas.js | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index b2ead2d..77fba5d 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -3,35 +3,58 @@
*/
const AnimalService = require('../service/AnimalService').default
// const AjaxUtils = require('../../../utils/AjaxUtils').default
-
+// 鍏叡鏂规硶 panTo() 寮曠敤
+const { setPanTo } = require('../../../utils/utils')
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-const defaultImg = '/assets/images/map/exhaust/fq_blue.png'
-const setting = '/assets/images/map/exhaust/fq_gray.png'
+// const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
+// const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green2.png'
+// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
+// const publicBounced = require('../../base-page/PublicBounced/PublicBounced').default
+const WasteGasIndex = require('../../base-page/WasteGas/WasteGasIndex').default
+// const WasteGasChats = require('./WasteGasChats').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
- this.animalService = new AnimalService({ L: L, layer: layer })
- const res = await mapApi.GetWasteGas()
+ // console.log(WasteGasChats)
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
+ const param = {
+ companyId: 3900100145, // 浼佷笟缂栫爜
+ id: '',
+ monType: 2, // 搴熸皵
+ userCode: 'wenchun.deng', // 鐢ㄦ埛鍚嶇О
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
+ const res = await mapApi.getWasteGas(param)
const data = res.Result.DataInfo || {}
- console.log(data)
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
- const judgeValue = data[i].StorageQty
- var iconUrl = this.differentTypes(judgeValue)
-
- const marker = L.marker.magic([positionX, positionY], {
+ const ContrLevel = data[i].ContrLevel
+ var iconUrl = this.differentTypes(ContrLevel)
+ const marker = L.marker([positionX, positionY], {
+ test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -40,22 +63,42 @@
}
this.bindTooltip = (layer) => {
- console.log(layer)
- return '娴嬭瘯搴熸皵'
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.test.Name
}
- this.clickListener = (e) => {
- console.log(e)
+ this.clickListener = async (e) => {
+ // console.log(e)
this.animalService.pulseEffect(e.latlng)
+ setPanTo(e.latlng, 200)
+ const title = e.layer.options.test.Name
+ const res = e.layer.options.test
+ window.$layer.open({
+ content: {
+ comp: WasteGasIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: res,
+ OnlineMonEmissPointId: e.layer.options.test.OnlineMonEmissPointId,
+ LabMonPointId: e.layer.options.test.LabMonPointId
+ }
+ },
+ title: '澶╂触鐭冲寲' + title // 鏍囬
+ })
}
- // 涓嶅悓绫诲瀷鍥剧墖灏佽
- this.differentTypes = (judgeValue) => {
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
+ this.differentTypes = (ContrLevel) => {
var effectOfChange
- if (judgeValue === 1) {
- effectOfChange = defaultImg
- } else {
- effectOfChange = setting
- }
+ /*
+ if (ContrLevel === 1) {
+ effectOfChange = ImgBlue
+ } else if (ContrLevel === 2) {
+ */
+ effectOfChange = ImagGreen
+ // } else if (ContrLevel === 3) {
+ // effectOfChange = ImagBright
+ // } else {
+ // effectOfChange = ImgGray
+ // }
return effectOfChange
}
}
--
Gitblit v1.8.0