From fde37d20d715a4300ba36ef1f57d6399a6401a59 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 14 三月 2023 10:27:46 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/views/intelligentPatrol/statistics/unlawful/area/index.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
index 35ba7f2..0048a17 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
@@ -13,6 +13,7 @@
             start-placeholder="寮�濮嬫棩鏈�"
             end-placeholder="缁撴潫鏃ユ湡"
             :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </div>
@@ -144,6 +145,7 @@
       this.$axios({
         method: "post",
         url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+        // url: `sccg/intelligentPatrol/statistics/export/unlawful/street`,
         responseType: "arraybuffer",
       }).then((res) => {
         let time = new Date();
@@ -166,8 +168,13 @@
         this.$message.success("鎿嶄綔鎴愬姛");
       });
     },
-    setTableDataHandle(e) {},
-    resetTableData(e) {},
+    setTableDataHandle(e) {
+      this.setTableData()
+    },
+    resetTableData(e) {
+      this.value2= ''
+      this.setTableData()
+    },
     // 璁剧疆琛ㄦ牸鏂戦┈绾�
     tableRowClassName({ row, rowIndex }) {
       if ((rowIndex + 1) % 2 == 0) {
@@ -183,8 +190,8 @@
       this.searchByArea({
         currentPage,
         pageSize,
-        beginTime: "2022-05-01 00:00:00",
-        endTime: "2022-09-01 00:00:00",
+        beginTime: this.value2[0],
+        endTime:this.value2[1],
       }).then((res) => {
         this.list = res.records;
         this.totalNum = res.total;

--
Gitblit v1.8.0