市级饮用水页面框架

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

@@ -13,16 +13,18 @@
             <a-tab-pane tab="超标评价" key="base4">
               <city-over-standard  :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeCity=='base4'"></city-over-standard>
             </a-tab-pane>
-
-
-            <a-tab-pane tab="水质类别" key="base2"  :visiable="activeCity=='base2'">
-              <city-water-quality></city-water-quality>
+            <a-tab-pane tab="水质类别" key="base2" >
+              <city-water-quality :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeCity=='base2'"></city-water-quality>
             </a-tab-pane>
-            <a-tab-pane tab="达标率" key="base6"  :visiable="activeCity=='base6'">
-              <city-month-standard></city-month-standard>
+
+            <a-tab-pane tab="水质统计" key="base7" >
+              <water-quality-count :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeCity=='base7'"></water-quality-count>
             </a-tab-pane>
-             <a-tab-pane tab="综合指数" key="base5"  :visiable="activeCity=='base5'">
-              <city-avg-index></city-avg-index>
+            <a-tab-pane tab="水质达标情况" key="base8" >
+              <water-quality-up :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeCity=='base8'"></water-quality-up>
+            </a-tab-pane>
+            <a-tab-pane tab="备用水源营养指数" key="base5">
+              <water-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeCity=='base5'"></water-nutritional>
             </a-tab-pane>
           </a-tabs>
     </div>
@@ -40,13 +42,19 @@
   // 报送情况说明
   import cityAppraise from "./situation.vue"
   // 取水量
-  import cityWaterWithdrawal from "../city/waterCount.vue"
+  import cityWaterWithdrawal from "./waterCount.vue"
   // 超标评价
-  import cityOverStandard from '../city/overStandard.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"
 
-  import cityWaterQuality from "../cityWaterQuality.vue"
-  import cityAvgIndex from "../city-avg-index.vue"
-  import cityMonthStandard from "../city-base-standard.vue"
 
 
 
@@ -57,10 +65,10 @@
       BaseStatistic,
       cityAppraise,
       cityWaterQuality,
-      cityAvgIndex,
-      cityMonthStandard,
+      waterQualityCount,
+      waterQualityUp,
+      waterNutritional,
       cityWaterWithdrawal,
-      
       cityOverStandard
     },
     data() {