From 9b59e4e8fddf3c41c5ecb47fb7db3011bc8b15b7 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 17:43:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 69dc4a1..bc7369b 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -7,7 +7,7 @@
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓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_new.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
@@ -42,8 +42,8 @@
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [30, 38],
- iconAnchor: [15, 19]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -68,16 +68,24 @@
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)
+ // 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, Mondata.Result.DataInfo, 'feiqi')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
this.setPanTo(e.latlng, 80)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
--
Gitblit v1.8.0