From d0391dba3708d3f32bcd94e1881d1b598a0d9ef0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:21:10 +0800
Subject: [PATCH] 修改图表问题
---
src/components/LayerController/logic/WasteGas.js | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 59baf56..bb5e353 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -7,19 +7,22 @@
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
// 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_green.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('../../BaseNav/PublicBounced/PublicBounced').default
+// const WasteGasChats = require('./WasteGasChats').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
+ // console.log(WasteGasChats)
this.animalService = new AnimalService({ L: L, layer: layer })
const res = await mapApi.getWasteGas()
+ // console.log(res)
const data = res.Result.DataInfo || {}
// console.log(data)
for (let i = 0; i < data.length; i++) {
@@ -29,13 +32,18 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
const ContrLevel = data[i].ContrLevel
var iconUrl = this.differentTypes(ContrLevel)
-
- const marker = L.marker.magic([positionX, positionY], {
+ // const marker = L.canvasMarker([positionX, positionY], {
+ // img: {
+ // // url: 'assets/images/map/marker-icon.png',
+ // url: iconUrl,
+ // size: STYLES.ICON_SIZE
+ // }
+ 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)
@@ -53,15 +61,33 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
+ console.log(dataValue)
+ const GasOnlinedata = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '1'
+ }
+ const GasManualData = {
+ companyId: '3900100145',
+ labMonPointId: '219',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: ' 2020-04-07 15:13:20'
+ }
+ const ManualData = await mapApi.getWasteGasManualData(GasManualData)
+ console.log(ManualData)
+ const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
+ // console.log(Mondata)
const result = await mapApi.getWasteGasDetails(dataValue)
// console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setGasData(e.layer.options.test, result.Result.DataInfo, 'feiqi')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
- this.setPanTo(e.latlng, 240)
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
+ this.setPanTo(e.latlng, 80)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
--
Gitblit v1.8.0