From a52129f16bd78bceeae3ee901d3a15d8471b4845 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期六, 18 三月 2023 18:36:26 +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/time/index.vue  |    8 +++-
 src/views/intelligentPatrol/statistics/unlawful/type/index.vue  |   72 +++++++++++++++++++----------------
 src/views/intelligentPatrol/statistics/unlawful/area/index.vue  |    8 +++-
 src/views/intelligentPatrol/statistics/unlawful/point/index.vue |   16 +++++---
 4 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
index f70a479..ce8dfbb 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
@@ -295,9 +295,13 @@
     handleExport(e) {
       this.$axios({
         method: "post",
-        url: `sccg/intelligentPatrol/statistics/export/unlawful`,
-        // url: `sccg/intelligentPatrol/statistics/export/unlawful/street`,
+        // url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+        url: `sccg/intelligentPatrol/statistics/export/unlawful/street`,
         responseType: "arraybuffer",
+        data: {
+          beginTime: this.value2[0],
+          endTime: this.value2[1],
+        }
       }).then((res) => {
         let time = new Date();
         let deathdate = time.toLocaleDateString();
diff --git a/src/views/intelligentPatrol/statistics/unlawful/point/index.vue b/src/views/intelligentPatrol/statistics/unlawful/point/index.vue
index 891edca..7e3e84b 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/point/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/point/index.vue
@@ -309,9 +309,13 @@
     handleExport(e) {
       this.$axios({
         method: "post",
-        url: `sccg/intelligentPatrol/statistics/export/unlawful`,
-        // url: `sccg/intelligentPatrol/statistics/export/unlawful/site`,
+        // url: `sccg/intelligentPatrol/statistics/export/unlawful`,
+        url: `sccg/intelligentPatrol/statistics/export/unlawful/site`,
         responseType: "arraybuffer",
+        data: {
+          beginTime: this.value2[0],
+          endTime: this.value2[1],
+        },
       }).then((res) => {
         let time = new Date();
         let deathdate = time.toLocaleDateString();
@@ -334,11 +338,11 @@
       });
     },
     setTableDataHandle(e) {
-      this.setTableData()
+      this.setTableData();
     },
     resetTableData(e) {
-      this.value2= ''
-      this.setTableData()
+      this.value2 = "";
+      this.setTableData();
     },
     // 璁剧疆琛ㄦ牸鏂戦┈绾�
     tableRowClassName({ row, rowIndex }) {
@@ -356,7 +360,7 @@
         currentPage,
         pageSize,
         beginTime: this.value2[0],
-        endTime:this.value2[1],
+        endTime: this.value2[1],
       }).then((res) => {
         this.list = res.records;
         this.totalNum = res.total;
diff --git a/src/views/intelligentPatrol/statistics/unlawful/time/index.vue b/src/views/intelligentPatrol/statistics/unlawful/time/index.vue
index 4c4ba61..b8de79b 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/time/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/time/index.vue
@@ -144,8 +144,12 @@
     handleExport(e) {
       this.$axios({
         method: 'post',
-        url: `sccg/intelligentPatrol/statistics/export/unlawful`,
-        responseType: 'arraybuffer'
+        url: `sccg/intelligentPatrol/statistics/export/unlawful/time`,
+        responseType: 'arraybuffer',
+        data: {
+          beginTime: this.value2[0],
+          endTime: this.value2[1],
+        }
       })
         .then(res => {
           let time = new Date()
diff --git a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
index 4c35960..376a2fe 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue
@@ -41,11 +41,11 @@
       <div class="main-content">
         <!-- 鏁版嵁灞曠ず -->
         <el-table
-            border
-            stripe
+          border
+          stripe
           ref="multipleTable"
           :header-cell-style="{
-           'background':'#F5F5F5',
+            background: '#F5F5F5',
             'font-weight': '650',
             'line-height': '45px',
           }"
@@ -308,39 +308,45 @@
     },
     handleExport(e) {
       this.$axios({
-        method: 'post',
+        method: "post",
         // url: `sccg/intelligentPatrol/statistics/export/unlawful`,
         url: `sccg/intelligentPatrol/statistics/export/unlawful/type`,
-        responseType: 'arraybuffer'
-      })
-        .then(res => {
-          let time = new Date()
-            let deathdate =time.toLocaleDateString()
-            const blob = new Blob([res.data], {
-              type: "application/vnd.ms-excel;charset=utf-8",
-            });
+        responseType: "arraybuffer",
+        data: {
+          beginTime: this.value2[0],
+          endTime: this.value2[1],
+        },
+      }).then((res) => {
+        let time = new Date();
+        let deathdate = time.toLocaleDateString();
+        const blob = new Blob([res.data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
 
-            if (window.navigator.msSaveBlob) {
-              window.navigator.msSaveBlob(blob, deathdate+"鎸夎繚瑙勭被鍨嬬粺璁�" + ".xlsx");
-            } else {
-              const url = window.URL.createObjectURL(blob);
-              const link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              link.download = deathdate+"鎸夎繚瑙勭被鍨嬬粺璁�" + ".xlsx";
-              document.body.appendChild(link);
-              link.click();
-              document.body.removeChild(link);
-            }
-            this.$message.success('鎿嶄綔鎴愬姛');
-        })
+        if (window.navigator.msSaveBlob) {
+          window.navigator.msSaveBlob(
+            blob,
+            deathdate + "鎸夎繚瑙勭被鍨嬬粺璁�" + ".xlsx"
+          );
+        } else {
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement("a");
+          link.style.display = "none";
+          link.href = url;
+          link.download = deathdate + "鎸夎繚瑙勭被鍨嬬粺璁�" + ".xlsx";
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+        }
+        this.$message.success("鎿嶄綔鎴愬姛");
+      });
     },
     setTableDataHandle(e) {
-      this.setTableData()
+      this.setTableData();
     },
     resetTableData(e) {
-      this.value2= ''
-      this.setTableData()
+      this.value2 = "";
+      this.setTableData();
     },
     // 璁剧疆琛ㄦ牸鏂戦┈绾�
     tableRowClassName({ row, rowIndex }) {
@@ -358,10 +364,10 @@
         currentPage,
         pageSize,
         beginTime: this.value2[0],
-        endTime:this.value2[1],
+        endTime: this.value2[1],
       }).then((res) => {
-          this.list = res.records;
-          this.totalNum = res.total;
+        this.list = res.records;
+        this.totalNum = res.total;
       });
     },
     // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
@@ -423,7 +429,7 @@
           flex: 1;
         }
         // :deep(.el-range-input) {
-          // background-color: #09152f;
+        // background-color: #09152f;
         // }
       }
       .find {

--
Gitblit v1.8.0