From 4b4aaa036eaaae8a3afba541f5ff141d12ea1269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Thu, 16 Dec 2021 14:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistic/components/countySearch.vue             | 11 ++++-------
 .../statistic/components/countySideSeatch.vue         | 11 ++++-------
 .../drinking-water/statistic/countryside/base.vue     |  2 +-
 .../statistic/countryside/overStandard.vue            |  2 +-
 .../statistic/countryside/waterQuality.vue            |  2 +-
 .../statistic/countryside/waterQualityCount.vue       |  2 +-
 .../statistic/countryside/waterQualityUp.vue          |  2 +-
 .../water/drinking-water/statistic/county/base.vue    |  2 +-
 .../drinking-water/statistic/county/overStandard.vue  |  2 +-
 .../drinking-water/statistic/county/situation.vue     |  2 +-
 .../drinking-water/statistic/county/waterCount.vue    |  2 +-
 .../drinking-water/statistic/county/waterQuality.vue  |  2 +-
 .../statistic/county/waterQualityCount.vue            |  2 +-
 .../statistic/county/waterQualityUp.vue               |  2 +-
 14 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue
index 107bf2e..766b71d 100644
--- a/src/views/water/drinking-water/statistic/components/countySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySearch.vue
@@ -7,7 +7,7 @@
     <a-row>
       <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="水源类型:">
-              <a-select v-model:value="where.drinkingWaterCountyAnalyse.waterSourceType" allowClear showSearch>
+              <a-select v-model:value="where.waterSourceType" allowClear showSearch>
                 <a-select-option :value="'1'">地表水</a-select-option>
                 <a-select-option :value="'2'">地下水</a-select-option>
               </a-select>
@@ -15,7 +15,7 @@
       </a-col>
       <a-col :lg="6" :md="12" :sm="24" :xs="24">
         <a-form-item label="水源状态:">
-            <a-select v-model:value="where.drinkingWaterCountyAnalyse.drinkingWaterType" allowClear showSearch>
+            <a-select v-model:value="where.drinkingWaterType" allowClear showSearch>
             <a-select-option :value="'1'">在用</a-select-option>
             <a-select-option :value="'2'">备用</a-select-option>
             </a-select>
@@ -48,7 +48,7 @@
     <a-row>
       <a-col :lg="6" :md="12" :sm="24" :xs="24">
       <a-form-item label="断面名称:">
-          <a-select v-model:value="where.drinkingWaterCountyAnalyse.sectionNames" mode="multiple" allowClear showSearch>
+          <a-select v-model:value="where.sectionNames" mode="multiple" allowClear showSearch>
             <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
               </a-select-option>
           </a-select>
@@ -137,7 +137,6 @@ export default {
     indeterminate:false,
       checkAll: true,
       where: {
-        drinkingWaterCountyAnalyse:{}
       },
       filter:[],
       columnsKey:[],
@@ -241,9 +240,7 @@ export default {
         checked: 1,
         limit: 10,
         page: 1,
-        drinkingWaterCountyAnalyse:{
-          regionLevel: this.where.drinkingWaterCountyAnalyse.regionLevel
-        }
+        regionLevel:this.where.regionLevel
       }
       this.searchData();
     },
diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
index 9719e7f..25beed7 100644
--- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
@@ -7,7 +7,7 @@
     <a-row>
       <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="水源类型:">
-              <a-select v-model:value="where.drinkingWaterVillageAnalyse.waterSourceType" allowClear showSearch>
+              <a-select v-model:value="where.waterSourceType" allowClear showSearch>
                 <a-select-option :value="'1'">地表水</a-select-option>
                 <a-select-option :value="'2'">地下水</a-select-option>
               </a-select>
@@ -15,7 +15,7 @@
       </a-col>
       <a-col :lg="6" :md="12" :sm="24" :xs="24">
         <a-form-item label="水源状态:">
-            <a-select v-model:value="where.drinkingWaterVillageAnalyse.drinkingWaterType" allowClear showSearch>
+            <a-select v-model:value="where.drinkingWaterType" allowClear showSearch>
             <a-select-option :value="'1'">在用</a-select-option>
             <a-select-option :value="'2'">备用</a-select-option>
             </a-select>
@@ -48,7 +48,7 @@
     <a-row>
       <a-col :lg="6" :md="12" :sm="24" :xs="24">
       <a-form-item label="断面名称:">
-          <a-select v-model:value="where.drinkingWaterVillageAnalyse.sectionNames" mode="multiple" allowClear showSearch>
+          <a-select v-model:value="where.sectionNames" mode="multiple" allowClear showSearch>
             <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
               </a-select-option>
           </a-select>
@@ -137,7 +137,6 @@ export default {
     indeterminate:false,
       checkAll: true,
       where: {
-        drinkingWaterVillageAnalyse:{}
       },
       filter:[],
       columnsKey:[],
@@ -241,9 +240,7 @@ export default {
         checked: 1,
         limit: 10,
         page: 1,
-        drinkingWaterVillageAnalyse:{
-          regionLevel: this.where.drinkingWaterVillageAnalyse.regionLevel
-        }
+        regionLevel:this.where.regionLevel
       }
       this.searchData();
     },
diff --git a/src/views/water/drinking-water/statistic/countryside/base.vue b/src/views/water/drinking-water/statistic/countryside/base.vue
index 1d612dd..3be5850 100644
--- a/src/views/water/drinking-water/statistic/countryside/base.vue
+++ b/src/views/water/drinking-water/statistic/countryside/base.vue
@@ -65,7 +65,7 @@ import {
 } from "@/api/ecology/new-drinking-water";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { tableColumns } from "./../colums/base";
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySideSeatch.vue";
 
 export default {
   name: "DrinkingWaterBase",
diff --git a/src/views/water/drinking-water/statistic/countryside/overStandard.vue b/src/views/water/drinking-water/statistic/countryside/overStandard.vue
index 6d710a3..3de29fb 100644
--- a/src/views/water/drinking-water/statistic/countryside/overStandard.vue
+++ b/src/views/water/drinking-water/statistic/countryside/overStandard.vue
@@ -31,7 +31,7 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySideSeatch.vue";
 import {
   villageOverStandardCount
 } from "@/api/ecology/new-drinking-water";
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
index c4ddee6..cc3a44b 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue
@@ -36,7 +36,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySideSeatch.vue";
 
 export default {
   name: "waterQuality",
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue
index ba78190..805d21d 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue
@@ -37,7 +37,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySideSeatch.vue";
 
 export default {
   name: "waterQualityCount",
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
index b01fd1d..dd5bf4e 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
@@ -36,7 +36,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySideSeatch.vue";
 
 export default {
   name: "waterQuality",
diff --git a/src/views/water/drinking-water/statistic/county/base.vue b/src/views/water/drinking-water/statistic/county/base.vue
index f99a076..daf5913 100644
--- a/src/views/water/drinking-water/statistic/county/base.vue
+++ b/src/views/water/drinking-water/statistic/county/base.vue
@@ -65,7 +65,7 @@ import {
 } from "@/api/ecology/new-drinking-water";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { tableColumns } from "./../colums/base";
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 
 export default {
   name: "DrinkingWaterBase",
diff --git a/src/views/water/drinking-water/statistic/county/overStandard.vue b/src/views/water/drinking-water/statistic/county/overStandard.vue
index e07ced7..307d13e 100644
--- a/src/views/water/drinking-water/statistic/county/overStandard.vue
+++ b/src/views/water/drinking-water/statistic/county/overStandard.vue
@@ -31,7 +31,7 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 import {
   countyOverStandardCount
 } from "@/api/ecology/new-drinking-water";
diff --git a/src/views/water/drinking-water/statistic/county/situation.vue b/src/views/water/drinking-water/statistic/county/situation.vue
index eaf6da5..ab0a9a5 100644
--- a/src/views/water/drinking-water/statistic/county/situation.vue
+++ b/src/views/water/drinking-water/statistic/county/situation.vue
@@ -89,7 +89,7 @@ import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 // import { tableColumns } from "./colums";
 // import moment from "moment";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 import { CheckOutlined, EditOutlined } from '@ant-design/icons-vue';
 export default {
   name: "DrinkingWaterBase",
diff --git a/src/views/water/drinking-water/statistic/county/waterCount.vue b/src/views/water/drinking-water/statistic/county/waterCount.vue
index 46dd0d0..2a00a29 100644
--- a/src/views/water/drinking-water/statistic/county/waterCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterCount.vue
@@ -31,7 +31,7 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 
 import {
   getWaterCount
diff --git a/src/views/water/drinking-water/statistic/county/waterQuality.vue b/src/views/water/drinking-water/statistic/county/waterQuality.vue
index 9fce8b9..76c4982 100644
--- a/src/views/water/drinking-water/statistic/county/waterQuality.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQuality.vue
@@ -36,7 +36,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 
 export default {
   name: "waterQuality",
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
index ba78190..a17a854 100644
--- a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue
@@ -37,7 +37,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 
 export default {
   name: "waterQualityCount",
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
index 60a86ac..43b3ee5 100644
--- a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
@@ -36,7 +36,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/citySearch.vue";
+import Search from "./../components/countySearch.vue";
 
 export default {
   name: "waterQuality",