Merge remote-tracking branch 'origin/yinyongshui'

src/api/ecology/new-drinking-water.js

@@ -1,6 +1,24 @@
 
 import axios from 'axios';
 
+// 获取市级下拉
+
+export const listInfoUrl = '/drinkingWater/drinkingWaterDict/list';
+export const listInfo = function (data) {
+    return axios.get(listInfoUrl,data)
+}
+
+// 县级
+export const countyListInfoUrl = '/drinkingWater/drinkingWaterCountyDict/list';
+export const countyListInfo = function (data) {
+    return axios.get(countyListInfoUrl,data)
+}
+
+// 村级
+export const villageListInfoUrl = '/drinkingWater/drinkingWaterVillageBottomDict/list';
+export const villageListInfo = function (data) {
+    return axios.get(villageListInfoUrl,data)
+}
 
 // 市级监测数据报送表
 export const pageBsaeListUrl = '/drinkingWater/drinkingWater/AnalysePage';
@@ -36,7 +54,7 @@ export const waterQualityData = function (data) {
 }
 
 //市级—水质统计
-export const waterQualityCountUrl = '/drinkingWater/drinkingWater/AnalysePage';
+export const waterQualityCountUrl = '/drinkingWater/drinkingWater/getWaterQualityStatistics';
 export const waterQualityCountData = function (data) {
     return axios.post(waterQualityCountUrl,data)
 }
@@ -48,7 +66,7 @@ export const waterQualityUpData = function (data) {
 }
 
 //市级—备用水源营养指数
-export const waterNutritionalUrl = '/drinkingWater/drinkingWater/AnalysePage';
+export const waterNutritionalUrl = '/drinkingWater/drinkingWater/getCompositeNutritionIndex';
 export const waterNutritionalData = function (data) {
     return axios.post(waterNutritionalUrl,data)
 }
@@ -80,6 +98,12 @@ export const countyWaterQualityData = function (data) {
     return axios.post(countyWaterQualityUrl,data)
 }
 
+//县级—水质统计
+export const countyWaterQualityCountUrl = '/drinkingWater/drinkingWater/getWaterQualityStatistics';
+export const countyWaterQualityCountData = function (data) {
+    return axios.post(countyWaterQualityCountUrl,data)
+}
+
 //县级—水质达标情况
 export const countyWaterQualityUpUrl = '/drinkingWater/drinkingWater/getWaterQualityStandard';
 export const countyWaterQualityUpData = function (data) {