From f7a430f8ca7fcf9dc9bf1ed65c8886875d73f276 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: Fri, 10 Dec 2021 09:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BF=E7=BA=A7=E7=9B=91=E6=B5=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistic/components/search.vue           |  2 +-
 .../drinking-water/statistic/county/base.vue  | 53 ++++++++--
 .../drinking-water/statistic/county/index.vue | 99 +++++++++++++++++++
 .../water/drinking-water/statistic/index.vue  | 31 +++---
 4 files changed, 160 insertions(+), 25 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/components/search.vue b/src/views/water/drinking-water/statistic/components/search.vue
index 7d3e65b..7fee8cd 100644
--- a/src/views/water/drinking-water/statistic/components/search.vue
+++ b/src/views/water/drinking-water/statistic/components/search.vue
@@ -77,7 +77,7 @@
       </a-col>
     </a-row>
 
-    <a-modal v-model:visible="visible" width="700px" title="监测指标" @ok="handleOk" @cancel="handleCancel">
+    <a-modal v-model:visible="visible" width="760px" title="监测指标" @ok="handleOk" @cancel="handleCancel">
         <div :style="{ borderBottom: '1px solid #E9E9E9', marginBottom: '5px', paddingBottom: '5px' }">
             <a-checkbox
             v-model:checked="checkAll"
diff --git a/src/views/water/drinking-water/statistic/county/base.vue b/src/views/water/drinking-water/statistic/county/base.vue
index 8ca167c..6b8d1c0 100644
--- a/src/views/water/drinking-water/statistic/county/base.vue
+++ b/src/views/water/drinking-water/statistic/county/base.vue
@@ -9,18 +9,26 @@
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
+        :visiable="visiable"
+        :loading="loading"
       />
       <!-- 表格 -->
       <ele-pro-table
         v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
-        :datasource="url"
+        :datasource="datasource"
         :columns="columns"
         :where="where"
         :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)"
       >
+      <template #footer>
+        <div class="footer">
+          饮用水源水质监测累积月份统计样品数：10个
+        </div>
+      </template>
+
         <template #waterCode="{ text, record }">
           <span>
             {{
@@ -54,7 +62,7 @@
 <script>
 import XLSX from "xlsx";
 import {
-  countyPageBsaeListUrl
+  countyPageBsaeData
 } from "@/api/ecology/new-drinking-water";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { tableColumns } from "./../colums/base";
@@ -79,14 +87,18 @@ export default {
         return [];
       },
     },
+    visiable:{
+        typeof:Boolean
+    }
   },
   data() {
     return {
+      current:0,
       data: [],
       locale,
       bill: {},
       // 表格数据接口
-      url: countyPageBsaeListUrl,
+      datasource: [],
       selection: [],
       columns: [...tableColumns],
 
@@ -94,11 +106,11 @@ export default {
       regionLevelOptions: [],
       // 表格搜索条件
       where: {
-        checked: 1,
-        ionLevel:'县级'
+        
       },
       // 表格选中数据
       selectionList: [],
+      loading:false
     };
   },
   watch: {
@@ -110,6 +122,23 @@ export default {
     // this.loadOptionData();
   },
   methods: {
+
+        // 获取列表数据
+        getPageData(){
+            this.loading = true;
+            countyPageBsaeData(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);
     },
@@ -140,24 +169,25 @@ export default {
 
     // 执行搜索
     searchData(data) {
-      this.where = {...this.where,...data};
+      this.where = data;
       this.$emit("search", this.where);
       this.reload();
     },
     /* 刷新表格 */
     reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
     },
     /* 重置搜索 */
     reset() {
       this.where = {
         checked: 1,
-        ionLevel:'县级'
       };
       this.reload();
     },
+
     exportFile() {
       const columns = [...tableColumns];
       const arr = [];
@@ -175,4 +205,7 @@ export default {
 </script>
 
 <style scoped lang="less">
+.footer{
+  text-align: right;
+}
 </style>
diff --git a/src/views/water/drinking-water/statistic/county/index.vue b/src/views/water/drinking-water/statistic/county/index.vue
index e69de29..35dc7fc 100644
--- a/src/views/water/drinking-water/statistic/county/index.vue
+++ b/src/views/water/drinking-water/statistic/county/index.vue
@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <a-tabs v-model:activeKey="activeKey">
+            <a-tab-pane tab="监测数据报送表" key="base" >
+              <base-statistic :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base'"></base-statistic>
+            </a-tab-pane>
+            <!-- <a-tab-pane tab="报送情况说明表" key="base1">
+              <city-appraise  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base1'"></city-appraise>
+            </a-tab-pane>
+            <a-tab-pane tab="取水量统计" key="base3">
+              <city-water-withdrawal  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base3'"></city-water-withdrawal>
+            </a-tab-pane>
+            <a-tab-pane tab="超标评价" key="base4">
+              <city-over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base4'"></city-over-standard>
+            </a-tab-pane>
+            <a-tab-pane tab="水质类别" key="base2" >
+              <city-water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base2'"></city-water-quality>
+            </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="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="base5">
+              <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='base5'"></water-nutritional>
+            </a-tab-pane> -->
+          </a-tabs>
+    </div>
+</template>
+
+
+<script>
+  /**
+   *
+   *
+   *
+   */
+  //市级监测数据报表
+  import BaseStatistic from "./base.vue"
+  // 报送情况说明
+//   import cityAppraise from "./situation.vue"
+//   // 取水量
+//   import cityWaterWithdrawal from "./waterCount.vue"
+//   // 超标评价
+//   import cityOverStandard from './overStandard.vue'
+//   // 水质类别
+//   import cityWaterQuality 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,
+    //   cityAppraise,
+    //   cityWaterQuality,
+    //   waterQualityCount,
+    //   waterQualityUp,
+    //   waterNutritional,
+    //   cityWaterWithdrawal,
+    //   cityOverStandard
+    },
+    data() {
+      return {
+        activeKey:'base',
+        searchForm:{
+            checked: 1,
+            page:1,
+            limit:10,
+            drinkingWaterAnalyse:{
+                regionLevel:"县级"
+            },
+        },
+        filterKeys:[]
+      };
+
+    },
+    methods: {
+      changeSearch(data){
+          this.searchForm = data
+      },
+      changeFilter(data){
+          this.filterKeys = data
+      }
+    }
+
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/water/drinking-water/statistic/index.vue b/src/views/water/drinking-water/statistic/index.vue
index ddbc253..c9a2bb5 100644
--- a/src/views/water/drinking-water/statistic/index.vue
+++ b/src/views/water/drinking-water/statistic/index.vue
@@ -7,7 +7,8 @@
         </a-tab-pane>
 
         <a-tab-pane key="county" tab="县级">
-          <a-tabs v-model:active="activeCounty">
+          <County />
+          <!-- <a-tabs v-model:active="activeCounty">
             <a-tab-pane tab="监测数据报送表" key="County">
               <county-data :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></county-data>
             </a-tab-pane>
@@ -26,7 +27,7 @@
              <a-tab-pane tab="综合指数" key="base5">
               <county-avg-index></county-avg-index>
             </a-tab-pane>
-          </a-tabs>
+          </a-tabs> -->
         </a-tab-pane>
 
         <a-tab-pane key="village" tab="农村">
@@ -56,6 +57,7 @@
 <script>
 
 import City from './city/index.vue'
+import County from './county/index.vue'
 
   /**
    *
@@ -65,36 +67,37 @@ import City from './city/index.vue'
 
 //县级监测数据报表
   // import countyData from "./countyData.vue"
-  import countyData from "./county/base.vue"
+  // import countyData from "./county/base.vue"
 
   import village from "./villageData.vue"
 
-  import countyAppraise from "./countyAppraise.vue"
+  // import countyAppraise from "./countyAppraise.vue"
   import villageAppraise from "./villageAppraise.vue"
-  import countyWaterQuality from "./countyWaterQuality.vue"
+  // import countyWaterQuality from "./countyWaterQuality.vue"
   import villageWaterQuality from "./villageWaterQuality.vue"
-  import countyAvgIndex from "./county-avg-index.vue"
+  // import countyAvgIndex from "./county-avg-index.vue"
   import villageAvgIndex from "./village-avg-index.vue"
-  import countyMonthStandard from "./county-base-standard.vue"
+  // import countyMonthStandard from "./county-base-standard.vue"
   import villageMonthStandard from "./village-base-standard.vue"
-  import countyWaterWithdrawal from "./countyWaterWithdrawal.vue"
+  // import countyWaterWithdrawal from "./countyWaterWithdrawal.vue"
 
 
   export default {
     name: 'DrinkWaterCollectIndex',
     components: {
       City,
-      countyData,
+      County,
+      // countyData,
       village,
-      countyAppraise,
+      // countyAppraise,
       villageAppraise,
-      countyWaterQuality,
+      // countyWaterQuality,
       villageWaterQuality,
-      countyAvgIndex,
+      // countyAvgIndex,
       villageAvgIndex,
-      countyMonthStandard,
+      // countyMonthStandard,
       villageMonthStandard,
-      countyWaterWithdrawal,
+      // countyWaterWithdrawal,
       
     },
     data() {