From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteWater.js | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 267fe0a..29658e1 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -8,7 +8,7 @@
const AnimalService = require('../service/AnimalService').default
const mapApi = require('../../../api/mapApi').default
// 寮圭獥鏁版嵁寮曡繘
-const WasteWaterIndex = require('@components/BaseNav/WasteWater/WasteWaterIndex').default
+const WasteWaterIndex = require('@components/base-page/WasteWater/WasteWaterIndex').default
const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
@@ -27,7 +27,20 @@
L: L,
layer: layer
})
- const res = await mapApi.getWasteWater()
+ const res = await mapApi.getWasteWater({
+ companyId: 3900100145, // 浼佷笟鍚嶇О
+ id: '',
+ monType: 1, // 鍊间负1鏌ヨ搴熸按
+ userCode: 'wenchun.deng', // 瑙掕壊鍚嶇О
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ })
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
@@ -61,7 +74,7 @@
const res = e.layer.options.totransferData
window.$layer.open({
content: {
- content: WasteWaterIndex, // 缁勪欢
+ comp: WasteWaterIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
// info: this.info
--
Gitblit v1.8.0