Merge remote-tracking branch 'origin/master'

src/api/ecology/river-statis.js

@@ -0,0 +1,46 @@
+import axios from 'axios';
+// -------------------江河--水功能数据统计列表-----------------------
+const autonomyWaterFunctionTotalUrl = '/waterFunctionArea/riverStatic/autoPage';
+const nationalWaterFunctionTotalUrl = '/waterFunctionArea/riverStatic/nationalPage';
+//国家级水功能统计
+const nationalWaterFunctionTotal = function (data) {
+    return axios.get("/waterFunctionArea/riverStatic/nationalPage",data)
+}
+// /自治区水功能统计
+const autonomyWaterFunctionTotal = function (data) {
+    return axios.get("/waterFunctionArea/riverStatic/autoPage",data)
+}
+
+
+// -------------------江河--水站数据统计列表--------------
+//水站同比环比统计
+const listWaterSiteYoy = function (data) {
+    return axios.post("/waterFunctionArea/riverStatic/waterSiteYoy",data)
+}
+// 水站日均值统计
+const listWaterSiteMonthTotal = function (data) {
+    return axios.post("/waterFunctionArea/riverStatic/waterSiteMonthTotal",data)
+}
+
+//水质达标统计
+const listMonthWaterQualitySandard = function (data) {
+    return axios.post("/waterFunctionArea/riverStatic/monthWaterQualitySandard",data)
+}
+
+//水质综合指数统计
+const listMonthCompositeIndex = function (data) {
+    return axios.post("/waterFunctionArea/riverStatic/monthCompositeIndex",data)
+}
+
+
+export {
+    autonomyWaterFunctionTotalUrl,
+    nationalWaterFunctionTotalUrl,
+    nationalWaterFunctionTotal,
+    autonomyWaterFunctionTotal,
+    listWaterSiteYoy,
+    listWaterSiteMonthTotal,
+    listMonthWaterQualitySandard,
+    listMonthCompositeIndex
+
+}

src/api/ecology/water/river-water.js

@@ -29,7 +29,7 @@ const getColumnOptions = function(column){
     return axios.get("/waterFunctionArea/WaterStationPoint/options",{params:{column}})
 }
 const listInfo = function(){
-    return axios.post("/waterFunctionArea/autonomousWaterFunctionAreaPoint/listInfo",{})
+    return axios.post("/waterFunctionArea/WaterStationPoint/listInfo",{})
 }
 export {
     listInfo,