From c4acc9cdfc3a3a22bd89661a4af1429e01e2e260 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 20 四月 2021 18:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/api/mapApi.js |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index bb2c314..515f8fb 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -40,13 +40,13 @@
   getWasteGasMonData (data) {
     return axios.get(mapUrl.getWasteGasMonData, data)
   },
+  // 搴熸皵浜哄伐鏁版嵁
+  getWasteGasManualData (data) {
+    return axios.get(mapUrl.getWasteGasManualData, data)
+  },
   // 搴熸按鐐�
   getWasteWater (data) {
     return axios.get(mapUrl.getWasteWater, data)
-  },
-  // 搴熸按鐩戞祴鏁版嵁
-  getWasteWaterMonitoring (data) {
-    return axios.get(mapUrl.getWasteWaterMonitoring, data)
   },
   // 搴熸按鐐规槑缁嗚〃
   getWasteWaterMonitoringDetails (data) {
@@ -66,5 +66,8 @@
   },
   getCompany (data) {
     return axios.get(mapUrl.getCompany, data)
+  },
+  DataItems (data) {
+    return axios.get(mapUrl.DataItems, data)
   }
 }

--
Gitblit v1.8.0