饮用水框架页面

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

@@ -25,7 +25,7 @@
       >
       <template #footer>
         <div class="footer">
-          饮用水源水质监测累积月份统计样品数：10个
+          饮用水源水质监测累积月份统计样品数：{{count}}个
         </div>
       </template>
 
@@ -66,7 +66,7 @@ import {
 } from "@/api/ecology/new-drinking-water";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import { tableColumns } from "./../colums/base";
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 
 export default {
   name: "DrinkingWaterBase",
@@ -93,6 +93,7 @@ export default {
   },
   data() {
     return {
+      count:0, //样品数
       current:0,
       data: [],
       locale,
@@ -110,7 +111,7 @@ export default {
       },
       // 表格选中数据
       selectionList: [],
-      loading:false
+      loading:false,
     };
   },
   watch: {
@@ -131,8 +132,10 @@ export default {
                 if(res.data.code){
                     this.$message.error(res.data.msg);
                     this.datasource = []
+                    this.count = 0
                 }else{
                     this.datasource = res.data.data
+                    this.count = res.data.count
                 }
             }).catch(()=>{
                  this.loading = false;

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

@@ -15,7 +15,8 @@
         v-model:selection="selectionList"
         ref="table"
         row-key="drinkingWaterId"
-        :datasource="url"
+        :datasource="datasource"
+        :loading="loading"
         :columns="columns"
         :where="where"
         :scroll="{ x: 'max-content' }"
@@ -31,11 +32,10 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 import {
-  pageDrinkingWaterStatisticUrl,
-  // getColumnOptions
-} from "@/api/ecology/drinking-water";
+  overStandardCount
+} from "@/api/ecology/new-drinking-water";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 // import { tableColumns } from "./colums";
 
@@ -65,7 +65,7 @@ export default {
       locale,
       bill: {},
       // 表格数据接口
-      url: pageDrinkingWaterStatisticUrl,
+      datasource:[],
       selection: [],
       columns: [
        {title: "城市名称",dataIndex: "sourceWaterName",sorter: true,},
@@ -84,12 +84,30 @@ export default {
       },
       // 表格选中数据
       selectionList: [],
+      loading:false
     };
   },
   mounted() {
     // this.loadOptionData();
   },
   methods: {
+
+    // 获取列表数据
+    getPageData(){
+          this.loading = true;
+        overStandardCount(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);
     },
@@ -107,9 +125,10 @@ export default {
 
     /* 刷新表格 */
     reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
+      this.getPageData()
+      // this.$refs.table.reload({
+      //   where: this.where,
+      // });
     },
     /* 重置搜索 */
     reset() {

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

@@ -89,7 +89,7 @@ import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 // import { tableColumns } from "./colums";
 // import moment from "moment";
 
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 import { CheckOutlined, EditOutlined } from '@ant-design/icons-vue';
 export default {
   name: "DrinkingWaterBase",

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

@@ -32,7 +32,7 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 
 import {
   getWaterCount

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

@@ -37,7 +37,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 
 export default {
   name: "waterQuality",

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

@@ -37,7 +37,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 
 export default {
   name: "waterQuality",

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

@@ -38,7 +38,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 
 export default {
   name: "waterQualityCount",

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

@@ -37,7 +37,7 @@ import {
 
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 
-import Search from "./../components/search.vue";
+import Search from "./../components/citySearch.vue";
 
 export default {
   name: "waterQuality",