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/api/mapUrl.js |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index fceb5ae..4ce8883 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -1,26 +1,40 @@
 /**
  * 璇ユ枃浠堕厤缃帴鍙ｇ殑URL鍦板潃
  */
-import { $HOST } from './host'
+import { $HOST, $HOSTANALYSE } from './host'
 
 export const GetUser = $HOST + '/user/getUser'
 
+// 鍥哄簾
 export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
 export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
 export const getSolidWasteDetail = $HOST + '/wasteSolid/getSolidWasteDetail'
 export const getSolidWasteSurveyDetail = $HOST + '/wasteSolid/getSolidWasteSurveyDetail'
 
+// 搴熸皵
 export const getWasteGas = $HOST + '/wasteGas/getWasteGas'
 export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
-export const DataItems = $HOST + '/wasteWater/RTDB/DataItems'
+export const DataItems = $HOST + '/wasteGas/RTDB/DataItems' // 搴熸皵瀹炴椂鏁版嵁
 export const getWasteGasMonData = $HOST + '/wasteGas/QueryOnlineMonData'
 export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'
 
-export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 搴熸按鐐逛俊鎭�
+// 搴熸按
+export const getWasteWater = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo' // 搴熸按鐐逛俊鎭�
 export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
 export const getWasteWaterMonitoringDetails = $HOST + '/wasteWater/getWasteWaterMonitoringDetails' // 搴熸按鐩戞祴鏁版嵁鏄庣粏琛�
-export const getQueryOnlineMonData = $HOST + '/wasteWater/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
-export const getQueryLabMonData = $HOST + '/wasteWater/QueryLabMonMonData' // 浜哄伐鏁版嵁
+export const getQueryOnlineMonData = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
+export const getQueryLabMonData = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryLabMonData' // 浜哄伐鏁版嵁
 export const getDataItems = $HOST + '/wasteWater/RTDB/DataItems' // 瀹炴椂鏁版嵁
 
+// 鍏徃
 export const getCompany = $HOST + '/company/getCompany'
+
+// 绠＄嚎鍒嗘瀽
+export const findPipelineByClickPoint = $HOSTANALYSE + '/findPipelineByClickPoint'
+export const findConnectedPipelines = $HOSTANALYSE + '/findConnectedPipelines'
+export const findFlowDirection = $HOSTANALYSE + '/findFlowDirection'
+export const findLeakages = $HOSTANALYSE + '/findLeakages'
+export const getCrossSection = $HOSTANALYSE + '/getCrossSection'
+
+// 姹℃煋婧�
+export const getSourcesPoll = 'http://localhost:8080/static/SourcesPoll.json'

--
Gitblit v1.8.0