饮用水基础框架页面

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

@@ -5,15 +5,19 @@
         <a-tab-pane key="city" tab="市级">
           <a-tabs v-model:active="activeCity">
             <a-tab-pane tab="监测数据报送表" key="city" >
-              <base-statistic></base-statistic>
+              <base-statistic :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></base-statistic>
             </a-tab-pane>
             <a-tab-pane tab="报送情况说明表" key="base1">
-              <city-appraise></city-appraise>
+              <city-appraise  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></city-appraise>
             </a-tab-pane>
             <a-tab-pane tab="取水量统计" key="base3">
-              <city-water-withdrawal></city-water-withdrawal>
-                
+              <city-water-withdrawal  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></city-water-withdrawal>
             </a-tab-pane>
+            <a-tab-pane tab="超标评价" key="base4">
+              <city-over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></city-over-standard>
+            </a-tab-pane>
+
+
             <a-tab-pane tab="水质类别" key="base2">
               <city-water-quality></city-water-quality>
             </a-tab-pane>
@@ -29,7 +33,7 @@
         <a-tab-pane key="county" tab="县级">
           <a-tabs v-model:active="activeCounty">
             <a-tab-pane tab="监测数据报送表" key="County">
-              <county-data></county-data>
+              <county-data :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></county-data>
             </a-tab-pane>
             <a-tab-pane tab="报送情况说明表" key="base1">
               <county-appraise></county-appraise>
@@ -79,10 +83,18 @@
    *
    *
    */
-  import BaseStatistic from "./cityDate.vue"
-  import countyData from "./countyData.vue"
+  //市级监测数据报表
+  // import BaseStatistic from "./cityDate.vue"
+import BaseStatistic from "./city/base.vue"
+
+//县级监测数据报表
+  // import countyData from "./countyData.vue"
+  import countyData from "./county/base.vue"
+
   import village from "./villageData.vue"
-  import cityAppraise from "./cityAppraise.vue"
+  // import cityAppraise from "./cityAppraise.vue"
+    import cityAppraise from "./city/situation.vue"
+
   import countyAppraise from "./countyAppraise.vue"
   import villageAppraise from "./villageAppraise.vue"
   import cityWaterQuality from "./cityWaterQuality.vue"
@@ -94,9 +106,11 @@
   import cityMonthStandard from "./city-base-standard.vue"
   import countyMonthStandard from "./county-base-standard.vue"
   import villageMonthStandard from "./village-base-standard.vue"
-  import cityWaterWithdrawal from "./cityWaterWithdrawal.vue"
+  import cityWaterWithdrawal from "./city/waterCount.vue"
   import countyWaterWithdrawal from "./countyWaterWithdrawal.vue"
 
+import cityOverStandard from './city/overStandard.vue'
+
   // import QuarterStatistic from "./quarter.vue";
   // import Compare from "./compare.vue"
   // import AverageStatistic from "./average.vue"
@@ -120,10 +134,9 @@
       countyMonthStandard,
       villageMonthStandard,
       cityWaterWithdrawal,
-      countyWaterWithdrawal
-      // QuarterStatistic,
-      // Compare,
-      // AverageStatistic
+      countyWaterWithdrawal,
+      
+      cityOverStandard
     },
     data() {
       return {
@@ -131,11 +144,18 @@
         activeCity:'city',
         activeCounty:'county',
         activeVillage:'village', 
+        searchForm:{},
+        filterKeys:[]
       };
 
     },
     methods: {
-
+      changeSearch(data){
+          this.searchForm = data
+      },
+      changeFilter(data){
+          this.filterKeys = data
+      }
     }
 
   }