From ada1fb7749d2a1468a5826871775ecc8e5391095 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: Tue, 14 Dec 2021 15:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=8D=86=E7=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/drinking-water/statistic/city/base.vue  | 6 ++++--
 src/views/water/drinking-water/statistic/colums/base.js | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue
index 16f8534..7decdba 100644
--- a/src/views/water/drinking-water/statistic/city/base.vue
+++ b/src/views/water/drinking-water/statistic/city/base.vue
@@ -19,10 +19,10 @@
         row-key="drinkingWaterId"
         :datasource="datasource"
         :columns="columns"
-        :total="count"
         :where="where"
         :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)"
+        @change="handleTableChange"
       >
       <template #footer>
         <div class="footer">
@@ -124,7 +124,9 @@ export default {
     // this.loadOptionData();
   },
   methods: {
-
+        handleTableChange(page){
+          console.log(page)
+        },
         // 获取列表数据
         getPageData(){
             this.loading = true;
diff --git a/src/views/water/drinking-water/statistic/colums/base.js b/src/views/water/drinking-water/statistic/colums/base.js
index 044d8cd..04005c1 100644
--- a/src/views/water/drinking-water/statistic/colums/base.js
+++ b/src/views/water/drinking-water/statistic/colums/base.js
@@ -1,4 +1,4 @@
-import moment from "moment"
+// import moment from "moment"
 //市级数据总览表格
 
 export const filterColumns = [
@@ -147,7 +147,8 @@ const tableColumns = [
     { title: "取水点经度", dataIndex: "longitude", sorter: true, },
     { title: "取水点纬度", dataIndex: "latitude", sorter: true, },
     { title: "本月取水量", dataIndex: "waterWithdrawal", sorter: true, },
-    { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    // { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    { title: "采样时间", dataIndex: "reportTime", sorter: true,},
     { title: "水期代码", dataIndex: "waterPhaseCode",sorter: true, 
         slots:{customRender:'waterCode' }
     },
@@ -301,7 +302,7 @@ const tableColumns2 = [
     { title: "取水点经度", dataIndex: "longitude", sorter: true, },
     { title: "取水点纬度", dataIndex: "latitude", sorter: true, },
     { title: "本月取水量", dataIndex: "waterWithdrawal", sorter: true, },
-    { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    { title: "采样时间", dataIndex: "reportTime", sorter: true},
     { title: "水期代码", dataIndex: "waterPhaseCode",sorter: true, 
         slots:{customRender:'waterCode' }
     },