diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }
diff --git a/src/views/doorManage/listDoorControl.vue b/src/views/doorManage/listDoorControl.vue
index 6eea33c..a475865 100644
--- a/src/views/doorManage/listDoorControl.vue
+++ b/src/views/doorManage/listDoorControl.vue
@@ -13,6 +13,7 @@
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.openStatus" placeholder="门禁状态" clearable>
+              <el-option value="3" label="刷卡开门"/>
               <el-option value="2" label="正常"/>
               <el-option value="1" label="常开"/>
               <el-option value="0" label="常闭"/>
@@ -28,6 +29,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="open()">远程开门</el-button>
+          <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(3)">{{ cardbth }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(1)">{{ openbtn }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(0)">{{ closebtn }}</el-button>
         </el-col>
@@ -70,7 +72,7 @@
 <script>
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import controlDoor from '@/views/doorManage/controlDoor'
-import { getDoorListPage, openDoor } from '@/api/door'
+import { getDoorListPage, openDoorAlways, openDoor } from '@/api/door'
 import { getDoorGroupList } from '@/api/door'
 
 export default {
@@ -115,19 +117,28 @@
         }
       ], // 显示列
       doorForm: {
+        doorId: '', // id
         doorName: '', // 门禁名称
-        alwaysOpen: '', // 常开/常闭状态
-        beginDatetime: '', // 生效时间
-        endDatetime: '' // 失效时间
+        openStatus: '', // 门禁状态
+        beginDateTime: '', // 生效时间
+        endDateTime: '' // 失效时间
       },
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       groupList: [], // 列表数据
       openbtn: '常开',
       closebtn: '常闭',
+      cardbth: '刷卡开门',
       total: 0, // 数据总数
       listLoading: true // 加载动画
     }
+  }, 
+  computed: {  
+    isStatusLenEqual () {
+      return function (status) {
+        return this.multipleSelection.filter(item => item.openStatus === status).length === this.multipleSelection.length
+      }
+    },
   },
   mounted() {
     getDoorGroupList().then(response => {
@@ -146,27 +157,56 @@
     },
     // 控制门禁常开常闭
     control(status) {
-      debugger
+      // debugger
       console.log(status)
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请选中门禁再进行控制')
         return
       }
       this.dialogFormVisible = true
-      if (status === 1) {
-        if (this.openbtn === '常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 1)
-        } else if (this.openbtn === '取消常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
-      } else if (status === 0) {
-        if (this.closebtn === '常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 0)
-        } else if (this.closebtn === '取消常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
+      switch(status) {
+        case 0: 
+          let closeStatus = this.closebtn === '常闭' ? 0 : this.closebtn === '取消常闭' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, closeStatus)
+          break;
+        case 1: 
+          let openStatus = this.openbtn === '常开' ? 1 : this.openbtn === '取消常开' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, openStatus)
+          break;
+        case 3: 
+          let cardStatus = this.cardbth === '刷卡开门' ? 3 : this.cardbth === '取消刷卡开门' ? 2 : ''
+          this.openCard(cardStatus)
+          break;
+        default: 
+          null
       }
     },
+    // 打开/取消刷卡开门
+    openCard(status) {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选中门禁再进行控制')
+        return
+      }
+      // 处理参数
+      this.doorForm.doorId = this.multipleSelection.map(function(item) { return item.id })
+      this.doorForm.doorName = this.multipleSelection.map(function(item) { return item.doorName })
+      this.$confirm(
+        `确定对所选门禁设置${this.cardbth}吗？`,
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        openDoorAlways(this.doorForm, status).then(response => {
+          if (response.code === 200) {
+            this.$message.success('编辑成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 打开门禁
     open() {
       if (this.multipleSelection.length === 0) {
@@ -229,17 +269,11 @@
       if (val.length === 0) {
         this.openbtn = '常开'
         this.closebtn = '常闭'
+        this.cardbth = '刷卡开门'
       } else {
-        if (val.filter(item => item.openStatus === '1').length === val.length) {
-          this.openbtn = '取消常开'
-        } else {
-          this.openbtn = '常开'
-        }
-        if (val.filter(item => item.openStatus === '0').length === val.length) {
-          this.closebtn = '取消常闭'
-        } else {
-          this.closebtn = '常闭'
-        }
+        this.openbtn = this.isStatusLenEqual('1') ? '取消常开' : '常开'
+        this.closebtn =  this.isStatusLenEqual('0') ? '取消常闭' : '常闭'
+        this.cardbth =  this.isStatusLenEqual('3') ? '取消刷卡开门' : '刷卡开门'
       }
     }
   }

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }
diff --git a/src/views/doorManage/listDoorControl.vue b/src/views/doorManage/listDoorControl.vue
index 6eea33c..a475865 100644
--- a/src/views/doorManage/listDoorControl.vue
+++ b/src/views/doorManage/listDoorControl.vue
@@ -13,6 +13,7 @@
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.openStatus" placeholder="门禁状态" clearable>
+              <el-option value="3" label="刷卡开门"/>
               <el-option value="2" label="正常"/>
               <el-option value="1" label="常开"/>
               <el-option value="0" label="常闭"/>
@@ -28,6 +29,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="open()">远程开门</el-button>
+          <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(3)">{{ cardbth }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(1)">{{ openbtn }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(0)">{{ closebtn }}</el-button>
         </el-col>
@@ -70,7 +72,7 @@
 <script>
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import controlDoor from '@/views/doorManage/controlDoor'
-import { getDoorListPage, openDoor } from '@/api/door'
+import { getDoorListPage, openDoorAlways, openDoor } from '@/api/door'
 import { getDoorGroupList } from '@/api/door'
 
 export default {
@@ -115,19 +117,28 @@
         }
       ], // 显示列
       doorForm: {
+        doorId: '', // id
         doorName: '', // 门禁名称
-        alwaysOpen: '', // 常开/常闭状态
-        beginDatetime: '', // 生效时间
-        endDatetime: '' // 失效时间
+        openStatus: '', // 门禁状态
+        beginDateTime: '', // 生效时间
+        endDateTime: '' // 失效时间
       },
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       groupList: [], // 列表数据
       openbtn: '常开',
       closebtn: '常闭',
+      cardbth: '刷卡开门',
       total: 0, // 数据总数
       listLoading: true // 加载动画
     }
+  }, 
+  computed: {  
+    isStatusLenEqual () {
+      return function (status) {
+        return this.multipleSelection.filter(item => item.openStatus === status).length === this.multipleSelection.length
+      }
+    },
   },
   mounted() {
     getDoorGroupList().then(response => {
@@ -146,27 +157,56 @@
     },
     // 控制门禁常开常闭
     control(status) {
-      debugger
+      // debugger
       console.log(status)
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请选中门禁再进行控制')
         return
       }
       this.dialogFormVisible = true
-      if (status === 1) {
-        if (this.openbtn === '常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 1)
-        } else if (this.openbtn === '取消常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
-      } else if (status === 0) {
-        if (this.closebtn === '常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 0)
-        } else if (this.closebtn === '取消常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
+      switch(status) {
+        case 0: 
+          let closeStatus = this.closebtn === '常闭' ? 0 : this.closebtn === '取消常闭' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, closeStatus)
+          break;
+        case 1: 
+          let openStatus = this.openbtn === '常开' ? 1 : this.openbtn === '取消常开' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, openStatus)
+          break;
+        case 3: 
+          let cardStatus = this.cardbth === '刷卡开门' ? 3 : this.cardbth === '取消刷卡开门' ? 2 : ''
+          this.openCard(cardStatus)
+          break;
+        default: 
+          null
       }
     },
+    // 打开/取消刷卡开门
+    openCard(status) {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选中门禁再进行控制')
+        return
+      }
+      // 处理参数
+      this.doorForm.doorId = this.multipleSelection.map(function(item) { return item.id })
+      this.doorForm.doorName = this.multipleSelection.map(function(item) { return item.doorName })
+      this.$confirm(
+        `确定对所选门禁设置${this.cardbth}吗？`,
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        openDoorAlways(this.doorForm, status).then(response => {
+          if (response.code === 200) {
+            this.$message.success('编辑成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 打开门禁
     open() {
       if (this.multipleSelection.length === 0) {
@@ -229,17 +269,11 @@
       if (val.length === 0) {
         this.openbtn = '常开'
         this.closebtn = '常闭'
+        this.cardbth = '刷卡开门'
       } else {
-        if (val.filter(item => item.openStatus === '1').length === val.length) {
-          this.openbtn = '取消常开'
-        } else {
-          this.openbtn = '常开'
-        }
-        if (val.filter(item => item.openStatus === '0').length === val.length) {
-          this.closebtn = '取消常闭'
-        } else {
-          this.closebtn = '常闭'
-        }
+        this.openbtn = this.isStatusLenEqual('1') ? '取消常开' : '常开'
+        this.closebtn =  this.isStatusLenEqual('0') ? '取消常闭' : '常闭'
+        this.cardbth =  this.isStatusLenEqual('3') ? '取消刷卡开门' : '刷卡开门'
       }
     }
   }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index f538fb4..666f05c 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -217,10 +217,16 @@
   data() {
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value) // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }
diff --git a/src/views/doorManage/listDoorControl.vue b/src/views/doorManage/listDoorControl.vue
index 6eea33c..a475865 100644
--- a/src/views/doorManage/listDoorControl.vue
+++ b/src/views/doorManage/listDoorControl.vue
@@ -13,6 +13,7 @@
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.openStatus" placeholder="门禁状态" clearable>
+              <el-option value="3" label="刷卡开门"/>
               <el-option value="2" label="正常"/>
               <el-option value="1" label="常开"/>
               <el-option value="0" label="常闭"/>
@@ -28,6 +29,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="open()">远程开门</el-button>
+          <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(3)">{{ cardbth }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(1)">{{ openbtn }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(0)">{{ closebtn }}</el-button>
         </el-col>
@@ -70,7 +72,7 @@
 <script>
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import controlDoor from '@/views/doorManage/controlDoor'
-import { getDoorListPage, openDoor } from '@/api/door'
+import { getDoorListPage, openDoorAlways, openDoor } from '@/api/door'
 import { getDoorGroupList } from '@/api/door'
 
 export default {
@@ -115,19 +117,28 @@
         }
       ], // 显示列
       doorForm: {
+        doorId: '', // id
         doorName: '', // 门禁名称
-        alwaysOpen: '', // 常开/常闭状态
-        beginDatetime: '', // 生效时间
-        endDatetime: '' // 失效时间
+        openStatus: '', // 门禁状态
+        beginDateTime: '', // 生效时间
+        endDateTime: '' // 失效时间
       },
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       groupList: [], // 列表数据
       openbtn: '常开',
       closebtn: '常闭',
+      cardbth: '刷卡开门',
       total: 0, // 数据总数
       listLoading: true // 加载动画
     }
+  }, 
+  computed: {  
+    isStatusLenEqual () {
+      return function (status) {
+        return this.multipleSelection.filter(item => item.openStatus === status).length === this.multipleSelection.length
+      }
+    },
   },
   mounted() {
     getDoorGroupList().then(response => {
@@ -146,27 +157,56 @@
     },
     // 控制门禁常开常闭
     control(status) {
-      debugger
+      // debugger
       console.log(status)
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请选中门禁再进行控制')
         return
       }
       this.dialogFormVisible = true
-      if (status === 1) {
-        if (this.openbtn === '常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 1)
-        } else if (this.openbtn === '取消常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
-      } else if (status === 0) {
-        if (this.closebtn === '常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 0)
-        } else if (this.closebtn === '取消常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
+      switch(status) {
+        case 0: 
+          let closeStatus = this.closebtn === '常闭' ? 0 : this.closebtn === '取消常闭' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, closeStatus)
+          break;
+        case 1: 
+          let openStatus = this.openbtn === '常开' ? 1 : this.openbtn === '取消常开' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, openStatus)
+          break;
+        case 3: 
+          let cardStatus = this.cardbth === '刷卡开门' ? 3 : this.cardbth === '取消刷卡开门' ? 2 : ''
+          this.openCard(cardStatus)
+          break;
+        default: 
+          null
       }
     },
+    // 打开/取消刷卡开门
+    openCard(status) {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选中门禁再进行控制')
+        return
+      }
+      // 处理参数
+      this.doorForm.doorId = this.multipleSelection.map(function(item) { return item.id })
+      this.doorForm.doorName = this.multipleSelection.map(function(item) { return item.doorName })
+      this.$confirm(
+        `确定对所选门禁设置${this.cardbth}吗？`,
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        openDoorAlways(this.doorForm, status).then(response => {
+          if (response.code === 200) {
+            this.$message.success('编辑成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 打开门禁
     open() {
       if (this.multipleSelection.length === 0) {
@@ -229,17 +269,11 @@
       if (val.length === 0) {
         this.openbtn = '常开'
         this.closebtn = '常闭'
+        this.cardbth = '刷卡开门'
       } else {
-        if (val.filter(item => item.openStatus === '1').length === val.length) {
-          this.openbtn = '取消常开'
-        } else {
-          this.openbtn = '常开'
-        }
-        if (val.filter(item => item.openStatus === '0').length === val.length) {
-          this.closebtn = '取消常闭'
-        } else {
-          this.closebtn = '常闭'
-        }
+        this.openbtn = this.isStatusLenEqual('1') ? '取消常开' : '常开'
+        this.closebtn =  this.isStatusLenEqual('0') ? '取消常闭' : '常闭'
+        this.cardbth =  this.isStatusLenEqual('3') ? '取消刷卡开门' : '刷卡开门'
       }
     }
   }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index f538fb4..666f05c 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -217,10 +217,16 @@
   data() {
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value) // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 6fcfad0..46acedd 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -246,10 +246,16 @@
     }
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value)  // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10 
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }
diff --git a/src/views/doorManage/listDoorControl.vue b/src/views/doorManage/listDoorControl.vue
index 6eea33c..a475865 100644
--- a/src/views/doorManage/listDoorControl.vue
+++ b/src/views/doorManage/listDoorControl.vue
@@ -13,6 +13,7 @@
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.openStatus" placeholder="门禁状态" clearable>
+              <el-option value="3" label="刷卡开门"/>
               <el-option value="2" label="正常"/>
               <el-option value="1" label="常开"/>
               <el-option value="0" label="常闭"/>
@@ -28,6 +29,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="open()">远程开门</el-button>
+          <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(3)">{{ cardbth }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(1)">{{ openbtn }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(0)">{{ closebtn }}</el-button>
         </el-col>
@@ -70,7 +72,7 @@
 <script>
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import controlDoor from '@/views/doorManage/controlDoor'
-import { getDoorListPage, openDoor } from '@/api/door'
+import { getDoorListPage, openDoorAlways, openDoor } from '@/api/door'
 import { getDoorGroupList } from '@/api/door'
 
 export default {
@@ -115,19 +117,28 @@
         }
       ], // 显示列
       doorForm: {
+        doorId: '', // id
         doorName: '', // 门禁名称
-        alwaysOpen: '', // 常开/常闭状态
-        beginDatetime: '', // 生效时间
-        endDatetime: '' // 失效时间
+        openStatus: '', // 门禁状态
+        beginDateTime: '', // 生效时间
+        endDateTime: '' // 失效时间
       },
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       groupList: [], // 列表数据
       openbtn: '常开',
       closebtn: '常闭',
+      cardbth: '刷卡开门',
       total: 0, // 数据总数
       listLoading: true // 加载动画
     }
+  }, 
+  computed: {  
+    isStatusLenEqual () {
+      return function (status) {
+        return this.multipleSelection.filter(item => item.openStatus === status).length === this.multipleSelection.length
+      }
+    },
   },
   mounted() {
     getDoorGroupList().then(response => {
@@ -146,27 +157,56 @@
     },
     // 控制门禁常开常闭
     control(status) {
-      debugger
+      // debugger
       console.log(status)
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请选中门禁再进行控制')
         return
       }
       this.dialogFormVisible = true
-      if (status === 1) {
-        if (this.openbtn === '常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 1)
-        } else if (this.openbtn === '取消常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
-      } else if (status === 0) {
-        if (this.closebtn === '常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 0)
-        } else if (this.closebtn === '取消常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
+      switch(status) {
+        case 0: 
+          let closeStatus = this.closebtn === '常闭' ? 0 : this.closebtn === '取消常闭' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, closeStatus)
+          break;
+        case 1: 
+          let openStatus = this.openbtn === '常开' ? 1 : this.openbtn === '取消常开' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, openStatus)
+          break;
+        case 3: 
+          let cardStatus = this.cardbth === '刷卡开门' ? 3 : this.cardbth === '取消刷卡开门' ? 2 : ''
+          this.openCard(cardStatus)
+          break;
+        default: 
+          null
       }
     },
+    // 打开/取消刷卡开门
+    openCard(status) {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选中门禁再进行控制')
+        return
+      }
+      // 处理参数
+      this.doorForm.doorId = this.multipleSelection.map(function(item) { return item.id })
+      this.doorForm.doorName = this.multipleSelection.map(function(item) { return item.doorName })
+      this.$confirm(
+        `确定对所选门禁设置${this.cardbth}吗？`,
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        openDoorAlways(this.doorForm, status).then(response => {
+          if (response.code === 200) {
+            this.$message.success('编辑成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 打开门禁
     open() {
       if (this.multipleSelection.length === 0) {
@@ -229,17 +269,11 @@
       if (val.length === 0) {
         this.openbtn = '常开'
         this.closebtn = '常闭'
+        this.cardbth = '刷卡开门'
       } else {
-        if (val.filter(item => item.openStatus === '1').length === val.length) {
-          this.openbtn = '取消常开'
-        } else {
-          this.openbtn = '常开'
-        }
-        if (val.filter(item => item.openStatus === '0').length === val.length) {
-          this.closebtn = '取消常闭'
-        } else {
-          this.closebtn = '常闭'
-        }
+        this.openbtn = this.isStatusLenEqual('1') ? '取消常开' : '常开'
+        this.closebtn =  this.isStatusLenEqual('0') ? '取消常闭' : '常闭'
+        this.cardbth =  this.isStatusLenEqual('3') ? '取消刷卡开门' : '刷卡开门'
       }
     }
   }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index f538fb4..666f05c 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -217,10 +217,16 @@
   data() {
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value) // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 6fcfad0..46acedd 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -246,10 +246,16 @@
     }
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value)  // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10 
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/detailGroup.vue b/src/views/memberManage/detailGroup.vue
index 7fbcadb..0d6fbee 100644
--- a/src/views/memberManage/detailGroup.vue
+++ b/src/views/memberManage/detailGroup.vue
@@ -1,6 +1,17 @@
 
 <template>
   <el-dialog :visible.sync="dialogFormVisible" title="分组详情" append-to-body @close="cancel">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keyword" placeholder="员工编号或姓名" clearable/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
     <el-form label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,7 +144,7 @@
           setRowDisableNone(topNum, showRowNum, binding)
 
           // setRowDisableNone(0, showRowNum, binding)
-          debugger
+          // debugger
           // 监听滚动后事件
           selectWrap.addEventListener('scroll', function() {
             let topPx = this.scrollTop - spillDataNum * rowHeight
@@ -175,7 +186,8 @@
       dialogStatus: '',
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        groupId: ''
+        groupId: '',
+        keyword: '',
       }, // 员工查询条件
       list: [], // 搜索结果
       columns: [
@@ -254,6 +266,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.listQuery.groupId = row.id
+      this.listQuery.keyword = ''
       this.row = row
       this.canEdit = true
       this.fetchData()
@@ -270,6 +283,10 @@
       // }
       return true
     },
+    // 查询数据
+    search() {
+      this.fetchData()
+    },
     // 获取查询数据
     fetchData() {
       this.listLoading = true

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }
diff --git a/src/views/doorManage/listDoorControl.vue b/src/views/doorManage/listDoorControl.vue
index 6eea33c..a475865 100644
--- a/src/views/doorManage/listDoorControl.vue
+++ b/src/views/doorManage/listDoorControl.vue
@@ -13,6 +13,7 @@
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.openStatus" placeholder="门禁状态" clearable>
+              <el-option value="3" label="刷卡开门"/>
               <el-option value="2" label="正常"/>
               <el-option value="1" label="常开"/>
               <el-option value="0" label="常闭"/>
@@ -28,6 +29,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="open()">远程开门</el-button>
+          <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(3)">{{ cardbth }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(1)">{{ openbtn }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(0)">{{ closebtn }}</el-button>
         </el-col>
@@ -70,7 +72,7 @@
 <script>
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import controlDoor from '@/views/doorManage/controlDoor'
-import { getDoorListPage, openDoor } from '@/api/door'
+import { getDoorListPage, openDoorAlways, openDoor } from '@/api/door'
 import { getDoorGroupList } from '@/api/door'
 
 export default {
@@ -115,19 +117,28 @@
         }
       ], // 显示列
       doorForm: {
+        doorId: '', // id
         doorName: '', // 门禁名称
-        alwaysOpen: '', // 常开/常闭状态
-        beginDatetime: '', // 生效时间
-        endDatetime: '' // 失效时间
+        openStatus: '', // 门禁状态
+        beginDateTime: '', // 生效时间
+        endDateTime: '' // 失效时间
       },
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       groupList: [], // 列表数据
       openbtn: '常开',
       closebtn: '常闭',
+      cardbth: '刷卡开门',
       total: 0, // 数据总数
       listLoading: true // 加载动画
     }
+  }, 
+  computed: {  
+    isStatusLenEqual () {
+      return function (status) {
+        return this.multipleSelection.filter(item => item.openStatus === status).length === this.multipleSelection.length
+      }
+    },
   },
   mounted() {
     getDoorGroupList().then(response => {
@@ -146,27 +157,56 @@
     },
     // 控制门禁常开常闭
     control(status) {
-      debugger
+      // debugger
       console.log(status)
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请选中门禁再进行控制')
         return
       }
       this.dialogFormVisible = true
-      if (status === 1) {
-        if (this.openbtn === '常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 1)
-        } else if (this.openbtn === '取消常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
-      } else if (status === 0) {
-        if (this.closebtn === '常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 0)
-        } else if (this.closebtn === '取消常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
+      switch(status) {
+        case 0: 
+          let closeStatus = this.closebtn === '常闭' ? 0 : this.closebtn === '取消常闭' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, closeStatus)
+          break;
+        case 1: 
+          let openStatus = this.openbtn === '常开' ? 1 : this.openbtn === '取消常开' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, openStatus)
+          break;
+        case 3: 
+          let cardStatus = this.cardbth === '刷卡开门' ? 3 : this.cardbth === '取消刷卡开门' ? 2 : ''
+          this.openCard(cardStatus)
+          break;
+        default: 
+          null
       }
     },
+    // 打开/取消刷卡开门
+    openCard(status) {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选中门禁再进行控制')
+        return
+      }
+      // 处理参数
+      this.doorForm.doorId = this.multipleSelection.map(function(item) { return item.id })
+      this.doorForm.doorName = this.multipleSelection.map(function(item) { return item.doorName })
+      this.$confirm(
+        `确定对所选门禁设置${this.cardbth}吗？`,
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        openDoorAlways(this.doorForm, status).then(response => {
+          if (response.code === 200) {
+            this.$message.success('编辑成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 打开门禁
     open() {
       if (this.multipleSelection.length === 0) {
@@ -229,17 +269,11 @@
       if (val.length === 0) {
         this.openbtn = '常开'
         this.closebtn = '常闭'
+        this.cardbth = '刷卡开门'
       } else {
-        if (val.filter(item => item.openStatus === '1').length === val.length) {
-          this.openbtn = '取消常开'
-        } else {
-          this.openbtn = '常开'
-        }
-        if (val.filter(item => item.openStatus === '0').length === val.length) {
-          this.closebtn = '取消常闭'
-        } else {
-          this.closebtn = '常闭'
-        }
+        this.openbtn = this.isStatusLenEqual('1') ? '取消常开' : '常开'
+        this.closebtn =  this.isStatusLenEqual('0') ? '取消常闭' : '常闭'
+        this.cardbth =  this.isStatusLenEqual('3') ? '取消刷卡开门' : '刷卡开门'
       }
     }
   }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index f538fb4..666f05c 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -217,10 +217,16 @@
   data() {
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value) // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 6fcfad0..46acedd 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -246,10 +246,16 @@
     }
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value)  // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10 
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/detailGroup.vue b/src/views/memberManage/detailGroup.vue
index 7fbcadb..0d6fbee 100644
--- a/src/views/memberManage/detailGroup.vue
+++ b/src/views/memberManage/detailGroup.vue
@@ -1,6 +1,17 @@
 
 <template>
   <el-dialog :visible.sync="dialogFormVisible" title="分组详情" append-to-body @close="cancel">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keyword" placeholder="员工编号或姓名" clearable/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
     <el-form label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,7 +144,7 @@
           setRowDisableNone(topNum, showRowNum, binding)
 
           // setRowDisableNone(0, showRowNum, binding)
-          debugger
+          // debugger
           // 监听滚动后事件
           selectWrap.addEventListener('scroll', function() {
             let topPx = this.scrollTop - spillDataNum * rowHeight
@@ -175,7 +186,8 @@
       dialogStatus: '',
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        groupId: ''
+        groupId: '',
+        keyword: '',
       }, // 员工查询条件
       list: [], // 搜索结果
       columns: [
@@ -254,6 +266,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.listQuery.groupId = row.id
+      this.listQuery.keyword = ''
       this.row = row
       this.canEdit = true
       this.fetchData()
@@ -270,6 +283,10 @@
       // }
       return true
     },
+    // 查询数据
+    search() {
+      this.fetchData()
+    },
     // 获取查询数据
     fetchData() {
       this.listLoading = true
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index fb341d1..2c5f3d7 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -54,8 +54,8 @@
           <el-upload
             :limit="1"
             :show-file-list="false"
-            :http-request="uploadFile1"
-            :file-list="fileList1"
+            :http-request="importPersonNewUpload"
+            :file-list="personNewList"
             action="string"
             accept=".xls,.xlsx"
             class="edit_btn"
@@ -64,12 +64,25 @@
           </el-upload>
           <download-template ref="downloadTemplate" filename="personNewInfoTemp.xlsx" label="换卡模板下载"/>
 
+          <!--批量导入删除-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="deletePersonUpload"
+            :file-list="deleteFileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入删除</el-button>
+          </el-upload>
+
           <!--批量导入-->
           <el-upload
             :limit="1"
             :show-file-list="false"
-            :http-request="uploadFile"
-            :file-list="fileList"
+            :http-request="importPersonUpload"
+            :file-list="personFileList"
             action="string"
             accept=".xls,.xlsx"
             class="edit_btn"
@@ -121,7 +134,7 @@
 </template>
 <script>
 import DeptSelect from '@/components/DeptSelect'
-import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson, batchImportPerson, batchImportPersonNew } from '@/api/person'
+import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson, batchImportPerson, batchDeletePerson, batchImportPersonNew } from '@/api/person'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
@@ -152,6 +165,7 @@
         sort: '',
         order: ''
       }, // 筛选条件
+      dialogFormVisible: false,
       columns: [], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -162,8 +176,9 @@
       fullscreenLoading: false, // 全屏加载动画
       filename: 'personAtdTempDownload.xlsx',
       attendanceEnable: attendanceEnable,
-      fileList: [],
-      fileList1: [],
+      personFileList: [],
+      deleteFileList: [],
+      personNewList: [],
       timeRange: [], // 时间范围
       updateTimeRange: [] // 时间范围
     }
@@ -385,7 +400,7 @@
       })
     },
     // 批量导入
-    uploadFile(param) {
+    importPersonUpload(param) {
       // 判断文件大小是否符合要求
       const _file = param.file
       const isLt5M = _file.size / 1024 / 1024 < 5
@@ -404,17 +419,47 @@
       batchImportPerson(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fileList = []
+          this.$message.success(`${res.message}`)
+          this.personFileList = []
           this.fetchData(false)
         }
       }).catch(() => {
         loading.close()
       })
-      this.fileList = []
+      this.personFileList = []
     },
-    // 批量导入
-    uploadFile1(param) {
+    // 批量导入删除
+    deletePersonUpload(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchDeletePerson(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success(`${res.message}`)
+          this.deleteFileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+        this.deleteFileList = []
+      })
+      this.deleteFileList = []
+    },
+    // 更换卡
+    importPersonNewUpload(param) {
       // 判断文件大小是否符合要求
       const _file = param.file
       const isLt5M = _file.size / 1024 / 1024 < 5
@@ -433,15 +478,15 @@
       batchImportPersonNew(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fileList1 = []
+          this.$message.success(`${res.message}`)
+          this.personNewList = []
           this.fetchData(false)
         }
       }).catch(() => {
         loading.close()
-        this.fileList1 = []
+        this.personNewList = []
       })
-      this.fileList1 = []
+      this.personNewList = []
     },
     // 查询数据
     search() {
@@ -545,6 +590,7 @@
     }
   }
   .edit_btns{
+    width: 85%;
     .edit_btn{
       float:right;
       margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2

diff --git a/src/api/card.js b/src/api/card.js
index 9c5a62e..3c45a80 100644
--- a/src/api/card.js
+++ b/src/api/card.js
@@ -100,6 +100,8 @@
     data: param
   })
 }
+
+// 批量导入
 export function batchAcsImport(fileobj) {
   const param = new FormData()
   param.append('file', fileobj)
diff --git a/src/api/door.js b/src/api/door.js
index 7b531ff..7a919cd 100644
--- a/src/api/door.js
+++ b/src/api/door.js
@@ -76,7 +76,7 @@
   })
 }
 
-// 常开常闭
+// 常开/常闭/刷卡开门
 export function openDoorAlways(params, status) {
   return request({
     url: 'door/updateOpenStatus',
diff --git a/src/api/log.js b/src/api/log.js
index 1dbb3a3..17af157 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -48,3 +48,13 @@
     method: 'post'
   })
 }
+
+// 设备日志列表
+export function getDeviceLogList(params) {
+  return request({
+    url: 'deviceLog/list',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index a2c3864..63e1dd4 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -148,6 +148,18 @@
   })
 }
 
+// 批量导入删除
+export function batchDeletePerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchDeletePerson',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function saveIris(params) {
   const formData = new FormData()
   formData.append('image_zy0', params.image_zy0)
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b020020..e93d6ba 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -56,6 +56,12 @@
       meta: { title: '日志管理', permission: ['/log'] }
     },
     {
+      path: '/deviceLog',
+      component: () => import('@/views/system/log/deviceLog'), // Parent router-view
+      name: 'DeviceLog',
+      meta: { title: '设备日志', permission: ['/deviceLog'] }
+    },
+    {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 348bba2..7f41888 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -405,14 +405,16 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$confirm('新增成功，是否继续新增?', '提示', {
+            this.$confirm(`${response.message}--新增成功，是否继续新增?`, '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               type: 'info'
             }).then(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.initDialog(this.permissionForm.doorCodes)
             }).catch(() => {
+              // this.$message.info(`${response.message}`)
               this.canEdit = true
               this.cancel()
             })
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 17f201f..ddc38d1 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -108,7 +108,8 @@
         })
         addPermission(permissionForm).then(response => {
           if (response.code === 200) {
-            this.$message.success('新增门禁授权成功')
+            // this.$message.success('新增门禁授权成功')
+            this.$message.success(`${response.message}`)
             this.cancel()
           }
           this.canEdit = true
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 5a9cbbe..4cb3b25 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -192,7 +192,8 @@
         batchAcsImport(_file).then(res => {
           loading.close() // 关闭加载动画
           if (res.code === 200) {
-            this.$message.success('导入成功')
+            // this.$message.success('导入成功')
+            this.$message.success(`${res.message}`)
             this.fileList = []
             this.fetchData(false)
           }
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index c8bd49d..38d47f5 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -101,7 +101,7 @@
       } else {
         this.resetForm()
         this.doorForm.doorId = list.map(function(item) { return item.id })
-        this.doorForm.doorName = list.map(function(item) { return item.doorName })
+        this.doorForm.doorName = list.map(function(item) { return item.doorName }).join(',')
       }
     },
     // 重置表单
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index f834563..cf76fa8 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -151,7 +151,7 @@
       batchImportDoor(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
+          this.$message.success(`${res.message}`)
           this.fileList = []
           this.fetchData(false)
         }
diff --git a/src/views/doorManage/listDoorControl.vue b/src/views/doorManage/listDoorControl.vue
index 6eea33c..a475865 100644
--- a/src/views/doorManage/listDoorControl.vue
+++ b/src/views/doorManage/listDoorControl.vue
@@ -13,6 +13,7 @@
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.openStatus" placeholder="门禁状态" clearable>
+              <el-option value="3" label="刷卡开门"/>
               <el-option value="2" label="正常"/>
               <el-option value="1" label="常开"/>
               <el-option value="0" label="常闭"/>
@@ -28,6 +29,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="open()">远程开门</el-button>
+          <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(3)">{{ cardbth }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(1)">{{ openbtn }}</el-button>
           <el-button v-if="hasPerm('/door/control')" class="edit_btn" size="small" @click="control(0)">{{ closebtn }}</el-button>
         </el-col>
@@ -70,7 +72,7 @@
 <script>
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import controlDoor from '@/views/doorManage/controlDoor'
-import { getDoorListPage, openDoor } from '@/api/door'
+import { getDoorListPage, openDoorAlways, openDoor } from '@/api/door'
 import { getDoorGroupList } from '@/api/door'
 
 export default {
@@ -115,19 +117,28 @@
         }
       ], // 显示列
       doorForm: {
+        doorId: '', // id
         doorName: '', // 门禁名称
-        alwaysOpen: '', // 常开/常闭状态
-        beginDatetime: '', // 生效时间
-        endDatetime: '' // 失效时间
+        openStatus: '', // 门禁状态
+        beginDateTime: '', // 生效时间
+        endDateTime: '' // 失效时间
       },
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       groupList: [], // 列表数据
       openbtn: '常开',
       closebtn: '常闭',
+      cardbth: '刷卡开门',
       total: 0, // 数据总数
       listLoading: true // 加载动画
     }
+  }, 
+  computed: {  
+    isStatusLenEqual () {
+      return function (status) {
+        return this.multipleSelection.filter(item => item.openStatus === status).length === this.multipleSelection.length
+      }
+    },
   },
   mounted() {
     getDoorGroupList().then(response => {
@@ -146,27 +157,56 @@
     },
     // 控制门禁常开常闭
     control(status) {
-      debugger
+      // debugger
       console.log(status)
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请选中门禁再进行控制')
         return
       }
       this.dialogFormVisible = true
-      if (status === 1) {
-        if (this.openbtn === '常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 1)
-        } else if (this.openbtn === '取消常开') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
-      } else if (status === 0) {
-        if (this.closebtn === '常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 0)
-        } else if (this.closebtn === '取消常闭') {
-          this.$refs.controldoor.initDialog(this.multipleSelection, 2)
-        }
+      switch(status) {
+        case 0: 
+          let closeStatus = this.closebtn === '常闭' ? 0 : this.closebtn === '取消常闭' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, closeStatus)
+          break;
+        case 1: 
+          let openStatus = this.openbtn === '常开' ? 1 : this.openbtn === '取消常开' ? 2 : ''
+          this.$refs.controldoor.initDialog(this.multipleSelection, openStatus)
+          break;
+        case 3: 
+          let cardStatus = this.cardbth === '刷卡开门' ? 3 : this.cardbth === '取消刷卡开门' ? 2 : ''
+          this.openCard(cardStatus)
+          break;
+        default: 
+          null
       }
     },
+    // 打开/取消刷卡开门
+    openCard(status) {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选中门禁再进行控制')
+        return
+      }
+      // 处理参数
+      this.doorForm.doorId = this.multipleSelection.map(function(item) { return item.id })
+      this.doorForm.doorName = this.multipleSelection.map(function(item) { return item.doorName })
+      this.$confirm(
+        `确定对所选门禁设置${this.cardbth}吗？`,
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        openDoorAlways(this.doorForm, status).then(response => {
+          if (response.code === 200) {
+            this.$message.success('编辑成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 打开门禁
     open() {
       if (this.multipleSelection.length === 0) {
@@ -229,17 +269,11 @@
       if (val.length === 0) {
         this.openbtn = '常开'
         this.closebtn = '常闭'
+        this.cardbth = '刷卡开门'
       } else {
-        if (val.filter(item => item.openStatus === '1').length === val.length) {
-          this.openbtn = '取消常开'
-        } else {
-          this.openbtn = '常开'
-        }
-        if (val.filter(item => item.openStatus === '0').length === val.length) {
-          this.closebtn = '取消常闭'
-        } else {
-          this.closebtn = '常闭'
-        }
+        this.openbtn = this.isStatusLenEqual('1') ? '取消常开' : '常开'
+        this.closebtn =  this.isStatusLenEqual('0') ? '取消常闭' : '常闭'
+        this.cardbth =  this.isStatusLenEqual('3') ? '取消刷卡开门' : '刷卡开门'
       }
     }
   }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index f538fb4..666f05c 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -217,10 +217,16 @@
   data() {
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value) // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 6fcfad0..46acedd 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -246,10 +246,16 @@
     }
     // 校验数字
     const validateNumber = (rule, value, callback) => {
-      if ((/^([0-9]+)$/).test(value) === false) {
-        callback(new Error('请输入合法数字且不能为空'))
-      } else if (value.length !== 8 && value.length !== 9) {
-        callback(new Error('员工编码位数应该为8位或者9位'))
+      let validateLSBol = (/^LS[0-9|A-Z|a-z]*$/).test(value)  // LS 开头数字和字母组成
+      let validateNumBol = (/^([0-9]+)$/).test(value)  // 数字
+      let lenNumBol = validateNumBol && value.length !== 8 && value.length !== 9
+      let lenLSBol = validateLSBol && value.length > 10 
+      let lenMsg = lenNumBol ? '员工编码位数应该为8位或者9位' : lenLSBol ? '员工编码位数不超过10位' : ''
+
+      if (!validateNumBol && !validateLSBol) {
+        callback(new Error('请输入合法字符且不能为空'))
+      } else if (lenNumBol || lenLSBol) {
+        callback(new Error(`${lenMsg}`))
       } else {
         callback()
       }
diff --git a/src/views/memberManage/detailGroup.vue b/src/views/memberManage/detailGroup.vue
index 7fbcadb..0d6fbee 100644
--- a/src/views/memberManage/detailGroup.vue
+++ b/src/views/memberManage/detailGroup.vue
@@ -1,6 +1,17 @@
 
 <template>
   <el-dialog :visible.sync="dialogFormVisible" title="分组详情" append-to-body @close="cancel">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keyword" placeholder="员工编号或姓名" clearable/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
     <el-form label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -133,7 +144,7 @@
           setRowDisableNone(topNum, showRowNum, binding)
 
           // setRowDisableNone(0, showRowNum, binding)
-          debugger
+          // debugger
           // 监听滚动后事件
           selectWrap.addEventListener('scroll', function() {
             let topPx = this.scrollTop - spillDataNum * rowHeight
@@ -175,7 +186,8 @@
       dialogStatus: '',
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        groupId: ''
+        groupId: '',
+        keyword: '',
       }, // 员工查询条件
       list: [], // 搜索结果
       columns: [
@@ -254,6 +266,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.listQuery.groupId = row.id
+      this.listQuery.keyword = ''
       this.row = row
       this.canEdit = true
       this.fetchData()
@@ -270,6 +283,10 @@
       // }
       return true
     },
+    // 查询数据
+    search() {
+      this.fetchData()
+    },
     // 获取查询数据
     fetchData() {
       this.listLoading = true
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index fb341d1..2c5f3d7 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -54,8 +54,8 @@
           <el-upload
             :limit="1"
             :show-file-list="false"
-            :http-request="uploadFile1"
-            :file-list="fileList1"
+            :http-request="importPersonNewUpload"
+            :file-list="personNewList"
             action="string"
             accept=".xls,.xlsx"
             class="edit_btn"
@@ -64,12 +64,25 @@
           </el-upload>
           <download-template ref="downloadTemplate" filename="personNewInfoTemp.xlsx" label="换卡模板下载"/>
 
+          <!--批量导入删除-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="deletePersonUpload"
+            :file-list="deleteFileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入删除</el-button>
+          </el-upload>
+
           <!--批量导入-->
           <el-upload
             :limit="1"
             :show-file-list="false"
-            :http-request="uploadFile"
-            :file-list="fileList"
+            :http-request="importPersonUpload"
+            :file-list="personFileList"
             action="string"
             accept=".xls,.xlsx"
             class="edit_btn"
@@ -121,7 +134,7 @@
 </template>
 <script>
 import DeptSelect from '@/components/DeptSelect'
-import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson, batchImportPerson, batchImportPersonNew } from '@/api/person'
+import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson, batchImportPerson, batchDeletePerson, batchImportPersonNew } from '@/api/person'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
@@ -152,6 +165,7 @@
         sort: '',
         order: ''
       }, // 筛选条件
+      dialogFormVisible: false,
       columns: [], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -162,8 +176,9 @@
       fullscreenLoading: false, // 全屏加载动画
       filename: 'personAtdTempDownload.xlsx',
       attendanceEnable: attendanceEnable,
-      fileList: [],
-      fileList1: [],
+      personFileList: [],
+      deleteFileList: [],
+      personNewList: [],
       timeRange: [], // 时间范围
       updateTimeRange: [] // 时间范围
     }
@@ -385,7 +400,7 @@
       })
     },
     // 批量导入
-    uploadFile(param) {
+    importPersonUpload(param) {
       // 判断文件大小是否符合要求
       const _file = param.file
       const isLt5M = _file.size / 1024 / 1024 < 5
@@ -404,17 +419,47 @@
       batchImportPerson(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fileList = []
+          this.$message.success(`${res.message}`)
+          this.personFileList = []
           this.fetchData(false)
         }
       }).catch(() => {
         loading.close()
       })
-      this.fileList = []
+      this.personFileList = []
     },
-    // 批量导入
-    uploadFile1(param) {
+    // 批量导入删除
+    deletePersonUpload(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchDeletePerson(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success(`${res.message}`)
+          this.deleteFileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+        this.deleteFileList = []
+      })
+      this.deleteFileList = []
+    },
+    // 更换卡
+    importPersonNewUpload(param) {
       // 判断文件大小是否符合要求
       const _file = param.file
       const isLt5M = _file.size / 1024 / 1024 < 5
@@ -433,15 +478,15 @@
       batchImportPersonNew(_file).then(res => {
         loading.close() // 关闭加载动画
         if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fileList1 = []
+          this.$message.success(`${res.message}`)
+          this.personNewList = []
           this.fetchData(false)
         }
       }).catch(() => {
         loading.close()
-        this.fileList1 = []
+        this.personNewList = []
       })
-      this.fileList1 = []
+      this.personNewList = []
     },
     // 查询数据
     search() {
@@ -545,6 +590,7 @@
     }
   }
   .edit_btns{
+    width: 85%;
     .edit_btn{
       float:right;
       margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
diff --git a/src/views/system/log/deviceLog.vue b/src/views/system/log/deviceLog.vue
new file mode 100644
index 0000000..263f19d
--- /dev/null
+++ b/src/views/system/log/deviceLog.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="doorCode">
+            <el-input v-model.trim="listQuery.doorCode" placeholder="门禁编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="doorName">
+            <el-input v-model.trim="listQuery.doorName" placeholder="门禁名称" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="devCode">
+            <el-input v-model.trim="listQuery.devCode" placeholder="设备编号" clearable/>
+          </el-form-item>
+          <el-form-item>
+            <el-date-picker
+              v-model="listQuery.beginTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择开始时间"/>
+          </el-form-item>
+          <el-form-item>
+            <el-date-picker
+              v-model="listQuery.endTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <!-- <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" type="info" icon="el-icon-delete" @click="cleanAll">清空日志</el-button> -->
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row[column.value] }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getDeviceLogList, delLoginLog } from '@/api/log'
+export default {
+  name: 'LoginLog',
+  data() {
+    return {
+      listQuery: {
+        doorCode: '',
+        doorName: '',
+        devCode: '',
+        beginTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      },
+      columns: [
+        {
+          text: '门禁编号',
+          value: 'doorCode',
+          align: 'center'
+        },
+        {
+          text: '门禁名称',
+          value: 'doorName',
+          align: 'center',
+        },
+        {
+          text: '设备编号',
+          value: 'devCode',
+          align: 'center'
+        },
+        {
+          text: '设备状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '时间',
+          value: 'createtime',
+          align: 'center'
+        },
+      ],
+      list: [],
+      total: 20,
+      listLoading: true,
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 清空日志
+    cleanAll() {
+      this.$confirm(
+        '确定要清空全部日志吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delLoginLog(this.query).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.list = null
+            this.total = 0
+            // this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.listQuery.offset = 1
+      this.fetchData()
+    },
+    // 获取日志数据
+    fetchData() {
+      this.listLoading = true
+      getDeviceLogList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .selectForm-container-item {
+    width: 180px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+</style>