From 545ba46e971816dc56b4ea80e48ed26a4b152d62 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 19 四月 2021 14:04:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 022588c..60bf0ef 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -11,7 +11,8 @@
// 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 () {
/**
@@ -61,34 +62,48 @@
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)
+ // 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()
- // 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')
+ 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)
+ // console.log(e.latlng)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
--
Gitblit v1.8.0