饮用水全部捆绑接口

src/views/water/drinking-water/statistic/components/citySearch.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.drinkingWaterAnalyse.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.drinkingWaterAnalyse.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.drinkingWaterAnalyse.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: {
-        drinkingWaterAnalyse:{}
       },
       filter:[],
       columnsKey:[],
@@ -241,9 +240,7 @@ export default {
         checked: 1,
         limit: 10,
         page: 1,
-        drinkingWaterAnalyse:{
-          regionLevel: this.where.drinkingWaterAnalyse.regionLevel
-        }
+        regionLevel:this.where.regionLevel
       }
       this.searchData();
     },
@@ -251,9 +248,9 @@ export default {
         if(Array.isArray(this.filter) && this.filter.length){
             this.where.filter = [...this.filter]
         }
-        const sectionNames = this.where.drinkingWaterAnalyse.sectionNames
+        const sectionNames = this.where.sectionNames
         if(sectionNames && Array.isArray(sectionNames) && !sectionNames.length){
-            delete this.where.drinkingWaterAnalyse.sectionNames;
+            delete this.where.sectionNames;
         }
       this.$emit("search", this.where);
     },