From f280311895f7354eed1b51732c0d9f0db978e114 Mon Sep 17 00:00:00 2001
From: zyzm <1534695664@qq.com>
Date: Mon, 7 Nov 2022 17:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=A5=E5=BF=97=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/logManage/doorLog/index.vue  | 8 ++++++--
 src/views/system/logManage/loginLog/index.vue | 4 ++--
 src/views/system/logManage/warnLog/index.vue  | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/system/logManage/doorLog/index.vue b/src/views/system/logManage/doorLog/index.vue
index 6d8e7c8..010c603 100644
--- a/src/views/system/logManage/doorLog/index.vue
+++ b/src/views/system/logManage/doorLog/index.vue
@@ -70,8 +70,9 @@ import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
 import DateRangePicker from '@/components/DateRangePicker'
 import pagination from '@crud/Pagination'
-import { exportFile } from '@/utils/index'
+import { parseTime, saveAs, getBlob } from '@/utils/index'
 import { mapGetters } from 'vuex'
+import qs from 'qs'
 export default {
   name: 'DoorLog',
   components: { rrOperation, DateRangePicker, pagination },
@@ -123,7 +124,10 @@ export default {
     // 导出
     handleDownload() {
       this.crud.downloadLoading = true
-      exportFile(this.baseApi + '/api/securitydoor/exportSecurityDoorLogList')
+      const fileName = parseTime(new Date()) + '-门禁日志.xlsx'
+      getBlob(this.baseApi + '/api/securitydoor/exportSecurityDoorLogList' + '?' + qs.stringify(this.crud.query, { indices: false }), function(blob) {
+        saveAs(blob, fileName)
+      })
       this.crud.downloadLoading = false
     },
     clickRowHandler(row) {
diff --git a/src/views/system/logManage/loginLog/index.vue b/src/views/system/logManage/loginLog/index.vue
index 5e6f003..56b48a4 100644
--- a/src/views/system/logManage/loginLog/index.vue
+++ b/src/views/system/logManage/loginLog/index.vue
@@ -63,6 +63,7 @@ import DateRangePicker from '@/components/DateRangePicker'
 import pagination from '@crud/Pagination'
 import { mapGetters } from 'vuex'
 import { parseTime, saveAs, getBlob } from '@/utils/index'
+import qs from 'qs'
 export default {
   name: 'LoginLog',
   components: { rrOperation, DateRangePicker, pagination },
@@ -111,7 +112,7 @@ export default {
     handleDownload() {
       this.crud.downloadLoading = true
       const fileName = parseTime(new Date()) + '-登录日志'
-      getBlob(this.baseApi + '/api/loginlogs/download', function(blob) {
+      getBlob(this.baseApi + '/api/loginlogs/download' + '?' + qs.stringify(this.crud.query, { indices: false }), function(blob) {
         saveAs(blob, fileName)
       })
       this.crud.downloadLoading = false
@@ -131,5 +132,4 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
-
 </style>
diff --git a/src/views/system/logManage/warnLog/index.vue b/src/views/system/logManage/warnLog/index.vue
index 2470724..f7ee44a 100644
--- a/src/views/system/logManage/warnLog/index.vue
+++ b/src/views/system/logManage/warnLog/index.vue
@@ -85,7 +85,7 @@ import DateRangePicker from '@/components/DateRangePicker'
 import pagination from '@crud/Pagination'
 import { warnRemark } from '@/api/system/logs'
 import { parseTime, saveAs, getBlob } from '@/utils/index'
-// import qs from 'qs'
+import qs from 'qs'
 import { mapGetters } from 'vuex'
 export default {
   name: 'LoginLog',
@@ -151,7 +151,7 @@ export default {
     handleDownload() {
       this.crud.downloadLoading = true
       const fileName = parseTime(new Date()) + '-报警日志'
-      getBlob(this.baseApi + '/api/alarmlog/download', function(blob) {
+      getBlob(this.baseApi + '/api/alarmlog/download' + '?' + qs.stringify(this.crud.query, { indices: false }), function(blob) {
         saveAs(blob, fileName)
       })
       this.crud.downloadLoading = false