From 82732610befafe88ae9512c9ac37e6a4bcf291c7 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 22:59:44 +0800
Subject: [PATCH] 废气小时数据、日数据、人工数据接口替换；增加点位id、检测项id查询；无数据提示；UI优化。
---
src/components/LayerController/logic/WasteGas.js | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 6c2fe65..77fba5d 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -12,8 +12,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 WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').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 () {
/**
@@ -26,10 +26,22 @@
L: L,
layer: layer
})
- const res = await mapApi.getWasteGas()
- // console.log(res)
+ 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
@@ -37,12 +49,6 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
const ContrLevel = data[i].ContrLevel
var iconUrl = this.differentTypes(ContrLevel)
- // 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({
@@ -68,10 +74,12 @@
const res = e.layer.options.test
window.$layer.open({
content: {
- content: WasteGasIndex, // 缁勪欢
+ comp: WasteGasIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
- storagePlaceId: res
+ storagePlaceId: res,
+ OnlineMonEmissPointId: e.layer.options.test.OnlineMonEmissPointId,
+ LabMonPointId: e.layer.options.test.LabMonPointId
}
},
title: '澶╂触鐭冲寲' + title // 鏍囬
--
Gitblit v1.8.0