From 142720dc771df774b5531c0a2a3c448e214ecda6 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 13:25:47 +0800
Subject: [PATCH] 弹框修改
---
src/components/LayerController/logic/WasteGas.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 2ac1651..60bf0ef 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -7,17 +7,20 @@
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓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
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').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)
@@ -40,8 +43,8 @@
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [20, 20],
- iconAnchor: [10, 10]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -59,15 +62,48 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
+ // console.log(e.layer.options.test.EpsGisMonPointId)
+ const title = e.layer.options.test.Name
+ const res = e.layer.options.test
+ console.log(res)
+ // 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, 80)
+ console.log(result.Result.DataInfo)
+ // const PublicBounced = window.Vue.extend(publicBounced)
+ // const instance = new PublicBounced()
+ // // 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')
+ window.$layer.open({
+ content: {
+ content: WasteGasIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: res
+ }
+ },
+ title: title // 鏍囬
+ })
+ // console.log(e.layer.options.totransferData.EpsGisMonPointId)
+ this.setPanTo(e.latlng, 150)
+ // console.log(e.latlng)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
--
Gitblit v1.8.0