diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js
index 41bad3f..404555f 100644
--- a/src/api/ecology/new-drinking-water.js
+++ b/src/api/ecology/new-drinking-water.js
@@ -88,26 +88,31 @@ export const countyDescripFormData = function (data) {
return axios.post(countyDescripFormUrl,data)
}
+//县级—取水量统计
+export const countyWaterCount = function (data) {
+ return axios.post('/drinkingWater/drinkingWater/analyseCountyPage',data)
+}
+
//县级—超标评价
-export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getWaterEvaluate';
+export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getCountyWaterEvaluate';
export const countyOverStandardCount = function (data) {
return axios.post(countyOverStandardtUrl,data)
}
//县级—水质类别
-export const countyWaterQualityUrl = '/drinkingWater/drinkingWater/getWaterQualityCategory';
+export const countyWaterQualityUrl = '/drinkingWater/drinkingWater/getCountyWaterQualityCategory';
export const countyWaterQualityData = function (data) {
return axios.post(countyWaterQualityUrl,data)
}
//县级—水质统计
-export const countyWaterQualityCountUrl = '/drinkingWater/drinkingWater/getWaterQualityStatistics';
+export const countyWaterQualityCountUrl = '/drinkingWater/drinkingWater/getCountyWaterQualityStatistics';
export const countyWaterQualityCountData = function (data) {
return axios.post(countyWaterQualityCountUrl,data)
}
//县级—水质达标情况
-export const countyWaterQualityUpUrl = '/drinkingWater/drinkingWater/getWaterQualityStandard';
+export const countyWaterQualityUpUrl = '/drinkingWater/drinkingWater/getCountyWaterQualityStandard';
export const countyWaterQualityUpData = function (data) {
return axios.post(countyWaterQualityUpUrl,data)
}
diff --git a/src/views/water/drinking-water/statistic/county/index.vue b/src/views/water/drinking-water/statistic/county/index.vue
index 93e185c..e6891b3 100644
--- a/src/views/water/drinking-water/statistic/county/index.vue
+++ b/src/views/water/drinking-water/statistic/county/index.vue
@@ -25,7 +25,9 @@
-
+
@@ -51,7 +53,8 @@
import waterQualityCount from "./waterQualityCount.vue";
// 水质达标情况
import waterQualityUp from "./waterQualityUp.vue";
-
+ //综合营养指数
+ // import waterNutritional from "./waterNutritional.vue"
export default {
name: 'city-com',
@@ -61,7 +64,7 @@
waterQuality,
waterQualityCount,
waterQualityUp,
- // waterNutritional,
+ // waterNutritional,
countyWaterWithdrawal,
countyOverStandard
},
diff --git a/src/views/water/drinking-water/statistic/county/waterCount.vue b/src/views/water/drinking-water/statistic/county/waterCount.vue
index b15034d..7338fd1 100644
--- a/src/views/water/drinking-water/statistic/county/waterCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterCount.vue
@@ -35,7 +35,7 @@ import XLSX from "xlsx";
import Search from "./../components/countySearch.vue";
import {
- getWaterCount
+ countyWaterCount as getWaterCount
} from "@/api/ecology/new-drinking-water";
diff --git a/src/views/water/drinking-water/statistic/county/waterNutritional.vue b/src/views/water/drinking-water/statistic/county/waterNutritional.vue
new file mode 100644
index 0000000..ef1085f
--- /dev/null
+++ b/src/views/water/drinking-water/statistic/county/waterNutritional.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+ (data = d.data)"
+ >
+
+
+
+
+
+
+
+
+
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
index 93df842..36c79a5 100644
--- a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
@@ -32,7 +32,7 @@
import XLSX from "xlsx";
import {
- waterQualityCountData
+ countyWaterQualityCountData as waterQualityCountData
} from "@/api/ecology/new-drinking-water";
import locale from "ant-design-vue/es/date-picker/locale/zh_CN";