Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk-storeroom-system

src/api/RFID/RFID.js

@@ -26,7 +26,8 @@ export function writeEPC(params) {
 
 export function getDeviceMac() {
   return request({
-    url: 'api/RFID/getDeviceMac',
+    // url: 'api/RFID/getDeviceMac',
+    url: 'api/RFID/getDeviceMacLinux',
     method: 'get'
   })
 }

src/api/storeManage/deviceManage/mac.js

@@ -2,7 +2,8 @@ import request from '@/utils/request'
 
 export function getMac() {
   return request({
-    url: 'api/RFID/getDeviceMac',
+    // url: 'api/RFID/getDeviceMac',
+    url: 'api/RFID/getDeviceMacLinux',
     method: 'get'
   })
 }

src/views/storeManage/deviceManage/module/deviceDetail.vue

@@ -27,6 +27,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
+          <!-- <el-input v-model="form.storeroomId" type="hidden" /> -->
           <el-form-item label="设备厂商" prop="supplier">
             <el-select v-model="form.supplier" style="width: 370px;" :disabled="crud.status.edit === 1">
               <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.id" />
@@ -418,7 +419,6 @@ export default {
       return false
     },
     [CRUD.HOOK.beforeSubmit]() {
-      this.crud.form.storeroomId = this.storeroomId
       this.crud.form.supplierId = this.supplierOptions.find(item => item.id === this.crud.form.supplier)
       this.crud.form.deviceTypeId = this.deviceTypeOptions.find(item => item.name === this.selectedDeviceType)
     },

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) {

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>

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