From 38cbc32fe3ccaae57f88ab78274f493231e8e5a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Mon, 20 Dec 2021 21:24:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drinking-water/statistic/city/situation.vue      | 12 +++++++++++-
 .../drinking-water/statistic/county/situation.vue    | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue
index 97d4731..e1ca11c 100644
--- a/src/views/water/drinking-water/statistic/city/situation.vue
+++ b/src/views/water/drinking-water/statistic/city/situation.vue
@@ -13,7 +13,7 @@
         :loading="loading"
       />
       
-      <ele-pro-table ref="table" row-key="drinkingWaterId" :datasource="datasource" :columns="columns" :where="where"
+      <ele-pro-table ref="table" row-key="drinkingWaterId" :datasource="datasource" :columns="columns" :where="where" @change="onChange"
         :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
           <template #county="{text}">
             {{text="市区"}}
@@ -211,11 +211,21 @@ export default {
         this.$emit("search", this.where);
         this.reload();
     },
+
+    onChange(e,filters){
+        this.datasource =  this.datasource.map(item=>(
+            {
+                ...item,
+                index1:filters.index1
+            }
+        ))
+    },
     /* 刷新表格 */
     reload() {
       this.getPageData()
       
         this.columns[6].filters = []
+        this.columns[6].filterMultiple = false
         if(this.where.waterSourceType ==1 ){
           // 地表水
           this.columns[6].filters =  [
diff --git a/src/views/water/drinking-water/statistic/county/situation.vue b/src/views/water/drinking-water/statistic/county/situation.vue
index 56f35af..60a7ab8 100644
--- a/src/views/water/drinking-water/statistic/county/situation.vue
+++ b/src/views/water/drinking-water/statistic/county/situation.vue
@@ -13,7 +13,7 @@
         :loading="loading"
       />
       
-      <ele-pro-table ref="table" row-key="drinkingWaterId" :datasource="datasource" :columns="columns" :where="where"
+      <ele-pro-table ref="table" row-key="drinkingWaterId" :datasource="datasource" :columns="columns" :where="where" @change="onChange"
         :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
           <template #county="{text}">
             {{text="市区"}}
@@ -212,6 +212,16 @@ export default {
         this.$emit("search", this.where);
         this.reload();
     },
+
+      onChange(e,filters){
+        this.datasource =  this.datasource.map(item=>(
+            {
+                ...item,
+                index1:filters.index1
+            }
+        ))
+    },
+    
     /* 刷新表格 */
     reload() {
       this.getPageData()

From 3e6a8a71169f3b878b7c167dcbf1187865c91529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Mon, 20 Dec 2021 22:29:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/drinking-water/statistic/city/base.vue        | 2 +-
 src/views/water/drinking-water/statistic/countryside/base.vue | 2 +-
 src/views/water/drinking-water/statistic/county/base.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue
index ec22536..46955e8 100644
--- a/src/views/water/drinking-water/statistic/city/base.vue
+++ b/src/views/water/drinking-water/statistic/city/base.vue
@@ -138,7 +138,7 @@ export default {
                     this.count = 0
                 }else{
                     this.datasource = res.data.data
-                    this.count = res.data.count
+                    this.count = res.data.data.length
                 }
             }).catch(()=>{
                  this.loading = false;
diff --git a/src/views/water/drinking-water/statistic/countryside/base.vue b/src/views/water/drinking-water/statistic/countryside/base.vue
index 3be5850..4f28a0c 100644
--- a/src/views/water/drinking-water/statistic/countryside/base.vue
+++ b/src/views/water/drinking-water/statistic/countryside/base.vue
@@ -134,7 +134,7 @@ export default {
                     this.count = 0
                 }else{
                     this.datasource = res.data.data
-                    this.count = res.data.data
+                    this.count = res.data.data.length
                 }
             }).catch(()=>{
                  this.loading = false;
diff --git a/src/views/water/drinking-water/statistic/county/base.vue b/src/views/water/drinking-water/statistic/county/base.vue
index daf5913..64c13e2 100644
--- a/src/views/water/drinking-water/statistic/county/base.vue
+++ b/src/views/water/drinking-water/statistic/county/base.vue
@@ -134,7 +134,7 @@ export default {
                     this.count = 0
                 }else{
                     this.datasource = res.data.data
-                    this.count = res.data.count
+                    this.count = res.data.data.length
                 }
             }).catch(()=>{
                  this.loading = false;