饮用水前端页面更新（参数和接口需要修改）

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

@@ -8,17 +8,24 @@
               <base-statistic></base-statistic>
             </a-tab-pane>
             <a-tab-pane tab="报送情况说明表" key="base1">
-              <!-- <function-bill ref="functionWater"></function-bill> -->
               <city-appraise></city-appraise>
             </a-tab-pane>
-            <!-- <a-tab-pane tab="水质类别" key="base2">
-              <city-water-quality></city-water-quality>
-            </a-tab-pane> -->
             <a-tab-pane tab="取水量统计" key="base3">
-              <!-- <city-water-quality></city-water-quality> -->
+              <city-water-withdrawal></city-water-withdrawal>
+                
+            </a-tab-pane>
+            <a-tab-pane tab="水质类别" key="base2">
+              <city-water-quality></city-water-quality>
+            </a-tab-pane>
+            <a-tab-pane tab="达标率" key="base6">
+              <city-month-standard></city-month-standard>
+            </a-tab-pane>
+             <a-tab-pane tab="综合指数" key="base5">
+              <city-avg-index></city-avg-index>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
+
         <a-tab-pane key="county" tab="县级">
           <a-tabs v-model:active="activeCounty">
             <a-tab-pane tab="监测数据报送表" key="County">
@@ -27,14 +34,21 @@
             <a-tab-pane tab="报送情况说明表" key="base1">
               <county-appraise></county-appraise>
             </a-tab-pane>
-            <!-- <a-tab-pane tab="水质类别" key="base2">
+            <a-tab-pane tab="取水量统计" key="base3">
+              <county-water-withdrawal></county-water-withdrawal>
+            </a-tab-pane>
+            <a-tab-pane tab="水质类别" key="base2">
               <county-water-quality></county-water-quality>
-            </a-tab-pane> -->
+            </a-tab-pane>
+            <a-tab-pane tab="达标率" key="base6">
+              <county-month-standard></county-month-standard>
+            </a-tab-pane>
+             <a-tab-pane tab="综合指数" key="base5">
+              <county-avg-index></county-avg-index>
+            </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-        <!-- <a-tab-pane key="quarter" tab="季度报告">
-         <quarter-statistic></quarter-statistic>
-        </a-tab-pane> -->
+
         <a-tab-pane key="village" tab="农村">
          <a-tabs v-model:active="activeVillage">
             <a-tab-pane tab="数据总览" key="village">
@@ -46,6 +60,12 @@
             <a-tab-pane tab="水质类别" key="base2">
               <village-water-quality></village-water-quality>
             </a-tab-pane>
+            <a-tab-pane tab="达标率" key="base6">
+              <village-month-standard></village-month-standard>
+            </a-tab-pane>
+             <a-tab-pane tab="综合指数" key="base5">
+              <village-avg-index></village-avg-index>
+            </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
@@ -59,15 +79,24 @@
    *
    *
    */
-  import BaseStatistic from "./cityDate.vue";
+  import BaseStatistic from "./cityDate.vue"
   import countyData from "./countyData.vue"
   import village from "./villageData.vue"
   import cityAppraise from "./cityAppraise.vue"
   import countyAppraise from "./countyAppraise.vue"
   import villageAppraise from "./villageAppraise.vue"
-  // import cityWaterQuality from "./cityWaterQuality.vue"
-  // import countyWaterQuality from "./countyWaterQuality.vue"
+  import cityWaterQuality from "./cityWaterQuality.vue"
+  import countyWaterQuality from "./countyWaterQuality.vue"
   import villageWaterQuality from "./villageWaterQuality.vue"
+  import cityAvgIndex from "./city-avg-index.vue"
+  import countyAvgIndex from "./county-avg-index.vue"
+  import villageAvgIndex from "./village-avg-index.vue"
+  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 countyWaterWithdrawal from "./countyWaterWithdrawal.vue"
+
   // import QuarterStatistic from "./quarter.vue";
   // import Compare from "./compare.vue"
   // import AverageStatistic from "./average.vue"
@@ -81,9 +110,17 @@
       cityAppraise,
       countyAppraise,
       villageAppraise,
-      // cityWaterQuality,
-      // countyWaterQuality,
-      villageWaterQuality
+      cityWaterQuality,
+      countyWaterQuality,
+      villageWaterQuality,
+      cityAvgIndex,
+      countyAvgIndex,
+      villageAvgIndex,
+      cityMonthStandard,
+      countyMonthStandard,
+      villageMonthStandard,
+      cityWaterWithdrawal,
+      countyWaterWithdrawal
       // QuarterStatistic,
       // Compare,
       // AverageStatistic