From 132460dc77bbbfb0f5dcaa8509de0e88cde2fc44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Wed, 15 Dec 2021 22:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E8=B4=A8=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/new-drinking-water.js         | 28 +++++++++++++++++--
 .../statistic/city/waterQualityCount.vue      | 10 +++----
 .../drinking-water/statistic/colums/base.js   |  4 +--
 .../statistic/components/citySearch.vue       |  6 ++--
 .../statistic/components/countySearch.vue     |  6 ++--
 .../statistic/components/countySideSeatch.vue |  6 ++--
 .../statistic/countryside/index.vue           | 12 ++++----
 .../drinking-water/statistic/county/index.vue |  9 +++---
 8 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js
index 4b5417c..9667d27 100644
--- a/src/api/ecology/new-drinking-water.js
+++ b/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) {
diff --git a/src/views/water/drinking-water/statistic/city/waterQualityCount.vue b/src/views/water/drinking-water/statistic/city/waterQualityCount.vue
index 7dec726..9acdfa3 100644
--- a/src/views/water/drinking-water/statistic/city/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQualityCount.vue
@@ -73,11 +73,11 @@ export default {
       datasource:{},
       selection: [],
       columns:[
-        {title:"年份",dataIndex:"city",},
-        {title:"指标",dataIndex:"place",},
-        {title:"平均值",dataIndex:"sourceWaterName",},
-        {title:"最大值",dataIndex:"waterSourceProperty",},
-        {title:"最小值",dataIndex:"",},
+        {title:"年份",dataIndex:"year",},
+        {title:"指标",dataIndex:"targetName",},
+        {title:"平均值",dataIndex:"averageValue",},
+        {title:"最大值",dataIndex:"maxValue",},
+        {title:"最小值",dataIndex:"minValue",},
       ],
         
       
diff --git a/src/views/water/drinking-water/statistic/colums/base.js b/src/views/water/drinking-water/statistic/colums/base.js
index 04005c1..0c49c9c 100644
--- a/src/views/water/drinking-water/statistic/colums/base.js
+++ b/src/views/water/drinking-water/statistic/colums/base.js
@@ -139,7 +139,7 @@ const tableColumns = [
     { title: "城市代码", dataIndex: "cityCode", sorter: true, },
     { title: "重点城市区分", dataIndex: "keyCity", sorter: true, },
     { title: "南北方城市", dataIndex: "cityOrientation", sorter: true, },
-    { title: "断面名称", dataIndex: "place", sorter: true, },
+    { title: "断面名称", dataIndex: "sectionName", sorter: true, },
     { title: "断面代码", dataIndex: "sectionCode", sorter: true, },
     { title: "水源名称", dataIndex: "sourceWaterName", sorter: true, },
     { title: "所属水系", dataIndex: "subordinateWater", sorter: true, },
@@ -294,7 +294,7 @@ const tableColumns2 = [
     {title:"县域名称",dataIndex:"countyName",sorter:true},
     {title:"县域代码",dataIndex:"countyCode",sorter:true},
     // { title: "南北方城市", dataIndex: "cityOrientation", sorter: true, },
-    { title: "断面名称", dataIndex: "place", sorter: true, },
+    { title: "断面名称", dataIndex: "sectionName", sorter: true, },
     // { title: "断面代码", dataIndex: "sectionCode", sorter: true, },
     { title: "水源名称", dataIndex: "sourceWaterName", sorter: true, },
     { title: "所属水系", dataIndex: "subordinateWater", sorter: true, },
diff --git a/src/views/water/drinking-water/statistic/components/citySearch.vue b/src/views/water/drinking-water/statistic/components/citySearch.vue
index ef54c43..2fe0556 100644
--- a/src/views/water/drinking-water/statistic/components/citySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/citySearch.vue
@@ -111,7 +111,7 @@
 <script>
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { filterColumns } from "./../colums/base";
-import { listInfo } from "@/api/ecology/water/river-plcae";
+import { listInfo } from "@/api/ecology/new-drinking-water";
 export default {
   name: "city-search",
   props: {
@@ -248,7 +248,9 @@ export default {
       this.searchData();
     },
     searchData() {
-      this.where.filter = [...this.filter]
+        if(Array.isArray(this.filter) && this.filter.length){
+            this.where.filter = [...this.filter]
+        }
       this.$emit("search", this.where);
     },
     exportFile() {
diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue
index 46a7b17..107bf2e 100644
--- a/src/views/water/drinking-water/statistic/components/countySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySearch.vue
@@ -111,7 +111,7 @@
 <script>
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { filterColumns } from "./../colums/base";
-import { listInfo } from "@/api/ecology/water/river-plcae";
+import { countyListInfo as listInfo } from "@/api/ecology/new-drinking-water";
 export default {
   name: "city-search",
   props: {
@@ -248,7 +248,9 @@ export default {
       this.searchData();
     },
     searchData() {
-      this.where.filter = [...this.filter]
+    if(Array.isArray(this.filter) && this.filter.length){
+            this.where.filter = [...this.filter]
+        }
       this.$emit("search", this.where);
     },
     exportFile() {
diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
index d915732..9719e7f 100644
--- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
@@ -111,7 +111,7 @@
 <script>
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { filterColumns } from "./../colums/base";
-import { listInfo } from "@/api/ecology/water/river-plcae";
+import { villageListInfo as listInfo } from "@/api/ecology/new-drinking-water";
 export default {
   name: "city-search",
   props: {
@@ -248,7 +248,9 @@ export default {
       this.searchData();
     },
     searchData() {
-      this.where.filter = [...this.filter]
+        if(Array.isArray(this.filter) && this.filter.length){
+            this.where.filter = [...this.filter]
+        }
       this.$emit("search", this.where);
     },
     exportFile() {
diff --git a/src/views/water/drinking-water/statistic/countryside/index.vue b/src/views/water/drinking-water/statistic/countryside/index.vue
index b89c0b1..c4f27c8 100644
--- a/src/views/water/drinking-water/statistic/countryside/index.vue
+++ b/src/views/water/drinking-water/statistic/countryside/index.vue
@@ -13,6 +13,10 @@
               <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base8'"></water-quality-up>
             </a-tab-pane>
 
+            <a-tab-pane tab="水质统计" key="base7" >
+              <water-quality-count :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base7'"></water-quality-count>
+            </a-tab-pane>
+
             <!-- <a-tab-pane tab="报送情况说明表" key="base1">
               <county-appraise  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base1'"></county-appraise>
             </a-tab-pane>
@@ -24,9 +28,7 @@
             </a-tab-pane> -->
             <!--
 
-            <a-tab-pane tab="水质统计" key="base7" >
-              <water-quality-count :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base7'"></water-quality-count>
-            </a-tab-pane>
+            
             
             <a-tab-pane tab="备用水源营养指数" key="base5">
               <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base5'"></water-nutritional>
@@ -53,7 +55,7 @@
   // 水质类别
   import waterQuality from "./waterQuality.vue"
 //   // 水质统计
-//   import waterQualityCount from "./waterQualityCount.vue";
+  import waterQualityCount from "./waterQualityCount.vue";
   // 水质达标情况
   import waterQualityUp from "./waterQualityUp.vue";
 //   //综合营养指数
@@ -70,7 +72,7 @@
       BaseStatistic,
       // countyAppraise,
       waterQuality,
-    //   waterQualityCount,
+      waterQualityCount,
       waterQualityUp,
     //   waterNutritional,
       // countyWaterWithdrawal,
diff --git a/src/views/water/drinking-water/statistic/county/index.vue b/src/views/water/drinking-water/statistic/county/index.vue
index 2af25d3..7ca0611 100644
--- a/src/views/water/drinking-water/statistic/county/index.vue
+++ b/src/views/water/drinking-water/statistic/county/index.vue
@@ -22,11 +22,12 @@
               <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base8'"></water-quality-up>
             </a-tab-pane>
 
-            <!--
-
             <a-tab-pane tab="水质统计" key="base7" >
               <water-quality-count :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base7'"></water-quality-count>
             </a-tab-pane>
+            <!--
+
+            
             
             <a-tab-pane tab="备用水源营养指数" key="base5">
               <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base5'"></water-nutritional>
@@ -53,7 +54,7 @@
   // 水质类别
   import waterQuality from "./waterQuality.vue"
 //   // 水质统计
-//   import waterQualityCount from "./waterQualityCount.vue";
+  import waterQualityCount from "./waterQualityCount.vue";
   // 水质达标情况
   import waterQualityUp from "./waterQualityUp.vue";
 //   //综合营养指数
@@ -70,7 +71,7 @@
       BaseStatistic,
       countyAppraise,
       waterQuality,
-    //   waterQualityCount,
+      waterQualityCount,
       waterQualityUp,
     //   waterNutritional,
       countyWaterWithdrawal,