Merge remote-tracking branch 'origin/yinyongshui'

src/api/ecology/new-drinking-water.js

@@ -20,6 +20,8 @@ export const villageListInfo = function (data) {
     return axios.get(villageListInfoUrl,data)
 }
 
+// 下拉结束
+
 // 市级监测数据报送表
 export const pageBsaeListUrl = '/drinkingWater/drinkingWater/AnalysePage';
 export const analysePageData = function (data) {
@@ -41,7 +43,7 @@ export const getWaterCount = function (data) {
 }
 
 //市级—超标评价
-export const overStandardtUrl = '/drinkingWater/drinkingWater/AnalysePage';
+export const overStandardtUrl = '/drinkingWater/drinkingWater/getWaterEvaluate';
 export const overStandardCount = function (data) {
     return axios.post(overStandardtUrl,data)
 }
@@ -87,7 +89,7 @@ export const countyDescripFormData = function (data) {
 }
 
 //县级—超标评价
-export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/AnalysePage';
+export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getCompositeNutritionIndex';
 export const countyOverStandardCount = function (data) {
     return axios.post(countyOverStandardtUrl,data)
 }
@@ -128,3 +130,9 @@ export const villageWaterQualityUpUrl = '/drinkingWaterVillage/drinkingWaterVill
 export const villageWaterQualityUpData = function (data) {
     return axios.post(villageWaterQualityUpUrl,data)
 }
+
+//农村—超标评价
+export const villageOverStandardtUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterVillageEvaluate';
+export const villageOverStandardCount = function (data) {
+    return axios.post(villageOverStandardtUrl,data)
+}

src/views/water/drinking-water/statistic/city/base.vue

@@ -14,7 +14,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -199,7 +198,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/city/index.vue

@@ -77,9 +77,7 @@
             checked: 1,
             page:1,
             limit:10,
-            drinkingWaterAnalyse:{
+            regionLevel:"市级"
-                regionLevel:"市级"
-            },
         },
         filterKeys:[]
       };

src/views/water/drinking-water/statistic/city/overStandard.vue

@@ -12,7 +12,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -68,12 +67,12 @@ export default {
       datasource:[],
       selection: [],
       columns: [
-       {title: "城市名称",dataIndex: "sourceWaterName",sorter: true,},
+       {title: "城市名称",dataIndex: "city",sorter: true,},
-       {title: "水源地名称",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "水源地名称",dataIndex: "sectionName",sorter: true,},
        {title: "取水量（万m3）",dataIndex: "waterWithdrawal",sorter: true,},
-       {title: "超标水源取水量",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "超标水源取水量",dataIndex: "overWaterWithdrawal",sorter: true,},
-       {title: "超标项目",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "超标项目",dataIndex: "overTargetname",sorter: true,},
-       {title: "水源性质",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "水源性质",dataIndex: "waterSourceProperty",sorter: true,},
       ],
 
       // 表格列配置
@@ -142,7 +141,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/city/situation.vue

@@ -86,8 +86,7 @@ import {
 } from "@/api/ecology/new-drinking-water";
 
 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 { CheckOutlined, EditOutlined } from '@ant-design/icons-vue';
@@ -217,7 +216,7 @@ export default {
       this.getPageData()
       
         this.columns[6].filters = []
-        if(this.where.drinkingWaterAnalyse.waterSourceType ==1 ){
+        if(this.where.waterSourceType ==1 ){
           // 地表水
           this.columns[6].filters =  [
             {
@@ -234,7 +233,7 @@ export default {
             },
         ]
       }
-      if(this.where.drinkingWaterAnalyse.waterSourceType ==2 ){
+      if(this.where.waterSourceType ==2 ){
           // 地下水
            this.columns[6].filters =  [
             {

src/views/water/drinking-water/statistic/city/waterCount.vue

@@ -12,7 +12,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -144,7 +143,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/city/waterNutritional.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -145,7 +144,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/city/waterQuality.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"

src/views/water/drinking-water/statistic/city/waterQualityCount.vue

@@ -14,7 +14,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -145,7 +144,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/city/waterQualityUp.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -115,8 +114,9 @@ export default {
               let newData = []
               const resData = res.data.data || {}
               for(let i in resData){
-                newData.push(resData[i])
+                newData.push(...resData[i])
               }
+              console.log('newData',newData)
               this.datasource = newData
             }
         }).catch(()=>{
@@ -156,7 +156,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

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.regionLevel
-          regionLevel: this.where.drinkingWaterAnalyse.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);
     },

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.regionLevel
-          regionLevel: this.where.drinkingWaterCountyAnalyse.regionLevel
-        }
       }
       this.searchData();
     },

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.regionLevel
-          regionLevel: this.where.drinkingWaterVillageAnalyse.regionLevel
-        }
       }
       this.searchData();
     },

src/views/water/drinking-water/statistic/countryside/base.vue

@@ -14,7 +14,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -196,7 +195,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/countryside/index.vue

@@ -9,30 +9,18 @@
               <water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base2'"></water-quality>
             </a-tab-pane>
 
-            <a-tab-pane tab="水质达标情况" key="base8" >
-              <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">
+            <a-tab-pane tab="水质达标情况" key="base8" >
-              <county-appraise  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base1'"></county-appraise>
+              <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="base3">
+
-              <county-water-withdrawal  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base3'"></county-water-withdrawal>
+          <a-tab-pane tab="超标评价" key="base4">
+              <over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base4'"></over-standard>
             </a-tab-pane>
-            <a-tab-pane tab="超标评价" key="base4">
-              <county-over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base4'"></county-over-standard>
-            </a-tab-pane> -->
-            <!--
 
-            
-            
-            <a-tab-pane tab="备用水源营养指数" key="base5">
-              <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base5'"></water-nutritional>
-            </a-tab-pane> -->
           </a-tabs>
     </div>
 </template>
@@ -46,37 +34,24 @@
    */
   //市级监测数据报表
   import BaseStatistic from "./base.vue"
-  // 报送情况说明
-  // import countyAppraise from "./situation.vue"
-  // // 取水量
-  // import countyWaterWithdrawal from "./waterCount.vue"
   // // 超标评价
-  // import countyOverStandard from './overStandard.vue'
+  import overStandard from './overStandard.vue'
   // 水质类别
   import waterQuality from "./waterQuality.vue"
 //   // 水质统计
   import waterQualityCount from "./waterQualityCount.vue";
   // 水质达标情况
   import waterQualityUp from "./waterQualityUp.vue";
-//   //综合营养指数
-
-//   import waterNutritional from "./waterNutritional.vue"
-
-
-
 
 
   export default {
     name: 'city-com',
     components: {
       BaseStatistic,
-      // countyAppraise,
       waterQuality,
       waterQualityCount,
       waterQualityUp,
-    //   waterNutritional,
+      overStandard
-      // countyWaterWithdrawal,
-      // countyOverStandard
     },
     data() {
       return {
@@ -85,9 +60,7 @@
             checked: 1,
             page:1,
             limit:10,
-            drinkingWaterVillageAnalyse:{
+            regionLevel:"农村"
-                regionLevel:"农村"
-            },
         },
         filterKeys:[]
       };

src/views/water/drinking-water/statistic/countryside/overStandard.vue

@@ -0,0 +1,156 @@
+<!--超标评价-->
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+        <search
+        :searchForm="searchForm"
+        :filterKeys="filterKeys"
+        @search="searchData"
+        @exportFile="exportFile"
+        @filterColumns="changeFilter"
+      />
+      <!-- 表格 -->
+      <ele-pro-table
+        ref="table"
+        row-key="drinkingWaterId"
+        :datasource="datasource"
+        :loading="loading"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+       
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+// import _ from "lodash";
+import XLSX from "xlsx";
+import Search from "./../components/countySideSeatch.vue";
+import {
+  villageOverStandardCount
+} from "@/api/ecology/new-drinking-water";
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+// import { tableColumns } from "./colums";
+
+export default {
+  name: "DrinkingWaterBase",
+  components: {
+      Search
+  },
+    props:{
+        // 表格搜索条件
+        searchForm:{
+            typeof:Object,
+            default: function () {
+                return {}
+            },
+        },
+        filterKeys:{
+            typeof:Object,
+            default: function () {
+                return []
+            },
+        }
+    },
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      datasource:[],
+      selection: [],
+      columns: [
+       {title: "城市名称",dataIndex: "city",sorter: true,},
+       {title: "水源地名称",dataIndex: "sectionName",sorter: true,},
+       {title: "取水量（万m3）",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "超标水源取水量",dataIndex: "overWaterWithdrawal",sorter: true,},
+       {title: "超标项目",dataIndex: "overTargetname",sorter: true,},
+       {title: "水源性质",dataIndex: "waterSourceProperty",sorter: true,},
+      ],
+
+      // 表格列配置
+      regionLevelOptions: [],
+      // 表格搜索条件
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+      loading:false
+    };
+  },
+  mounted() {
+    // this.loadOptionData();
+  },
+  methods: {
+
+    // 获取列表数据
+    getPageData(){
+          this.loading = true;
+        villageOverStandardCount(this.where).then(res=>{
+              this.loading = false;
+            if(res.data.code){
+                this.$message.error(res.data.msg);
+                this.datasource = []
+            }else{
+                this.datasource = res.data.data
+            }
+        }).catch(()=>{
+              this.loading = false;
+        })
+    },
+
+    JumpFieldClick(record, column) {
+      console.log(column.dataIndex);
+    },
+
+        // 传上父级
+    changeFilter(data){
+        this.$emit('changeFilter',data)
+    },
+    // 执行搜索
+    searchData(data){
+        this.where = data;
+        this.$emit("search", this.where);
+        this.reload();
+    },
+
+    /* 刷新表格 */
+    reload() {
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+    exportFile() {
+      const columns = [...this.columns];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      arr.push(th);
+      this.datasource.forEach((d) => {
+        const td = columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>

src/views/water/drinking-water/statistic/countryside/waterQuality.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"

src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue

@@ -14,7 +14,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -145,7 +144,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -109,7 +108,7 @@ export default {
               let newData = []
               const resData = res.data.data || {}
               for(let i in resData){
-                newData.push(resData[i])
+                newData.push(...resData[i])
               }
               this.datasource = newData
             }
@@ -150,7 +149,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/county/base.vue

@@ -14,7 +14,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -196,7 +195,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/county/index.vue

@@ -25,13 +25,7 @@
             <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>
-            </a-tab-pane> -->
           </a-tabs>
     </div>
 </template>
@@ -57,12 +51,6 @@
   import waterQualityCount from "./waterQualityCount.vue";
   // 水质达标情况
   import waterQualityUp from "./waterQualityUp.vue";
-//   //综合营养指数
-
-//   import waterNutritional from "./waterNutritional.vue"
-
-
-
 
 
   export default {
@@ -84,9 +72,7 @@
             checked: 1,
             page:1,
             limit:10,
-            drinkingWaterCountyAnalyse:{
+            regionLevel:"县级"
-                regionLevel:"县级"
-            },
         },
         filterKeys:[]
       };

src/views/water/drinking-water/statistic/county/overStandard.vue

@@ -12,7 +12,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -32,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";
@@ -68,12 +67,12 @@ export default {
       datasource:[],
       selection: [],
       columns: [
-       {title: "城市名称",dataIndex: "sourceWaterName",sorter: true,},
+       {title: "城市名称",dataIndex: "city",sorter: true,},
-       {title: "水源地名称",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "水源地名称",dataIndex: "sectionName",sorter: true,},
        {title: "取水量（万m3）",dataIndex: "waterWithdrawal",sorter: true,},
-       {title: "超标水源取水量",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "超标水源取水量",dataIndex: "overWaterWithdrawal",sorter: true,},
-       {title: "超标项目",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "超标项目",dataIndex: "overTargetname",sorter: true,},
-       {title: "水源性质",dataIndex: "waterWithdrawal",sorter: true,},
+       {title: "水源性质",dataIndex: "waterSourceProperty",sorter: true,},
       ],
 
       // 表格列配置
@@ -142,7 +141,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/county/situation.vue

@@ -217,7 +217,7 @@ export default {
       this.getPageData()
       
         this.columns[6].filters = []
-        if(this.where.drinkingWaterCountyAnalyse.waterSourceType ==1 ){
+        if(this.where.waterSourceType ==1 ){
           // 地表水
           this.columns[6].filters =  [
             {
@@ -234,7 +234,7 @@ export default {
             },
         ]
       }
-      if(this.where.drinkingWaterCountyAnalyse.waterSourceType ==2 ){
+      if(this.where.waterSourceType ==2 ){
           // 地下水
            this.columns[6].filters =  [
             {

src/views/water/drinking-water/statistic/county/waterCount.vue

@@ -12,7 +12,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -144,7 +143,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/county/waterQuality.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"

src/views/water/drinking-water/statistic/county/waterQualityCount.vue

@@ -14,7 +14,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -145,7 +144,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });

src/views/water/drinking-water/statistic/county/waterQualityUp.vue

@@ -13,7 +13,6 @@
       />
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
         :datasource="datasource"
@@ -115,7 +114,7 @@ export default {
               let newData = []
               const resData = res.data.data || {}
               for(let i in resData){
-                newData.push(resData[i])
+                newData.push(...resData[i])
               }
               this.datasource = newData
             }
@@ -156,7 +155,7 @@ export default {
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = columns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });