diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 4a3f0c2..c496e6a 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -19,7 +19,7 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.devCode" placeholder="设备" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="设备编号" clearable value="">
               <el-option
                 v-for="item in deviceList"
                 :key="item.id"
@@ -61,7 +61,7 @@
       <el-row class="table-title">
         <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('/records/exportRecord')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 4a3f0c2..c496e6a 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -19,7 +19,7 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.devCode" placeholder="设备" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="设备编号" clearable value="">
               <el-option
                 v-for="item in deviceList"
                 :key="item.id"
@@ -61,7 +61,7 @@
       <el-row class="table-title">
         <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('/records/exportRecord')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index c0318db..c5534f7 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -15,7 +15,7 @@
           <!--v-for="item in doorList"-->
           <!--:key="item.id"-->
           <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
+          <!-- :value="item.doorCode"/> -->
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
@@ -51,7 +51,7 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 4a3f0c2..c496e6a 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -19,7 +19,7 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.devCode" placeholder="设备" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="设备编号" clearable value="">
               <el-option
                 v-for="item in deviceList"
                 :key="item.id"
@@ -61,7 +61,7 @@
       <el-row class="table-title">
         <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('/records/exportRecord')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index c0318db..c5534f7 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -15,7 +15,7 @@
           <!--v-for="item in doorList"-->
           <!--:key="item.id"-->
           <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
+          <!-- :value="item.doorCode"/> -->
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
@@ -51,7 +51,7 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 7964df1..467b00c 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -48,7 +48,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 4a3f0c2..c496e6a 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -19,7 +19,7 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.devCode" placeholder="设备" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="设备编号" clearable value="">
               <el-option
                 v-for="item in deviceList"
                 :key="item.id"
@@ -61,7 +61,7 @@
       <el-row class="table-title">
         <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('/records/exportRecord')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index c0318db..c5534f7 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -15,7 +15,7 @@
           <!--v-for="item in doorList"-->
           <!--:key="item.id"-->
           <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
+          <!-- :value="item.doorCode"/> -->
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
@@ -51,7 +51,7 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 7964df1..467b00c 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -48,7 +48,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 2107ff1..9b8c150 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -4,7 +4,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填"/>
+            <el-input v-model.trim="deptForm.simplename" show-word-limit maxlength="10" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 4a3f0c2..c496e6a 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -19,7 +19,7 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.devCode" placeholder="设备" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="设备编号" clearable value="">
               <el-option
                 v-for="item in deviceList"
                 :key="item.id"
@@ -61,7 +61,7 @@
       <el-row class="table-title">
         <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('/records/exportRecord')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index c0318db..c5534f7 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -15,7 +15,7 @@
           <!--v-for="item in doorList"-->
           <!--:key="item.id"-->
           <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
+          <!-- :value="item.doorCode"/> -->
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
@@ -51,7 +51,7 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 7964df1..467b00c 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -48,7 +48,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 2107ff1..9b8c150 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -4,7 +4,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填"/>
+            <el-input v-model.trim="deptForm.simplename" show-word-limit maxlength="10" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..353feff 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,6 +150,7 @@
     },
     // 查询数据
     search() {
+      this.listQuery.offset = 1
       this.fetchData()
     },
     // 获取日志数据

diff --git a/src/api/person.js b/src/api/person.js
index 4e01b02..7e250ba 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -4,6 +4,17 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
+// 查询员工照片
+export function getPersonPhoto(personId) {
+  return request({
+    url: '/person/getPhoto',
+    method: 'get',
+    params: {
+      personId: personId
+    }
+  })
+}
+
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
diff --git a/src/views/accessPermission/listDoorPermission.vue b/src/views/accessPermission/listDoorPermission.vue
index 6d47c38..158aca0 100644
--- a/src/views/accessPermission/listDoorPermission.vue
+++ b/src/views/accessPermission/listDoorPermission.vue
@@ -127,6 +127,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDoorPermissionList().then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 3cbdb6c..25b9526 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -20,7 +20,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁员工授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
         </el-col>
       </el-row>
@@ -175,6 +175,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getStaffPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 2bf34e5..ddda124 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -17,7 +17,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>{{ doorName }}门禁访客授权列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
+          <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
         </el-col>
       </el-row>
@@ -166,6 +166,9 @@
     // 获取门禁授权数据
     fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getVisitorPermissionByDoor(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 61ecaf5..808c0ee 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -75,6 +75,22 @@
           permission: '/statistics'
         },
         {
+          title: '识别记录',
+          context: '',
+          icon: 'log',
+          color: '#34bfa3',
+          path: '/record',
+          permission: '/record'
+        },
+        {
+          title: '设备管理',
+          context: '',
+          icon: 'chart-pie',
+          color: '#d87a80',
+          path: '/device',
+          permission: '/device'
+        },
+        {
           title: '登录日志',
           context: '',
           icon: 'log',
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 82f0d0a..ba97c98 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -6,6 +6,7 @@
         v-model="timeRange"
         :picker-options="pickerOptions"
         :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
         type="datetimerange"
         size="small"
         class="my-datepick"
@@ -79,6 +80,7 @@
   },
   watch: {
     timeRange(val) {
+      console.log('timeRange', val)
       if (val && val.length > 0) {
         if (typeof val[0] !== 'string') {
           val[0] = val[0].format('YYYY-MM-DD HH:mm:ss')
@@ -104,12 +106,14 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59')
-          s = s.format('yyyy-MM-DD 00:00:00')
+          s = s.format('YYYY-MM-DD 00:00:00')
+          console.log('end', end, 's', s)
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('日期范围不能大于7天')
           end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           s = s.format('YYYY-MM-DD 23:59:59')
+          console.log('end', end, 's', s)
         }
         this.timeRange = [s, end]
       }
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index deb53a9..159e1cf 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -21,17 +21,17 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item label="姓名" prop="name">
-                <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
               <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
+                  :editable="false"
                   type="date"
                   style="width: 100%"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期"/>
+                  value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -182,10 +182,10 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import { getProject } from '@/utils/baseConfig'
-import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+// import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
 import { attendanceEnable } from '@/main.js'
 
@@ -308,7 +308,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
@@ -332,10 +332,10 @@
     }
   },
   watch: {
-    'personForm.idCardNo': function(val) {
-      this.personForm.birthday = getBirthdayByIdNO(val)
-      this.personForm.sex = getSexByIdNO(val)
-    }
+    // 'personForm.idCardNo': function(val) {
+    //   this.personForm.birthday = getBirthdayByIdNO(val)
+    //   this.personForm.sex = getSexByIdNO(val)
+    // }
   },
   mounted() {
     if (attendanceEnable === true) {
@@ -389,12 +389,12 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          personCode: personForm.personCode, // 人员编号
+          // personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -416,9 +416,17 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 2d2eae5..1228fed 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -23,7 +23,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.name" :disabled="isEditMode" show-word-limit maxlength="10" type="text" placeholder="必填"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -493,6 +493,7 @@
     },
     // 重置表单
     resetForm() {
+      const id = this.personForm.id
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -515,6 +516,9 @@
           annualLeave: ''
         }
       }
+      if (id) {
+        this.personForm.id = id
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -551,6 +555,8 @@
           // 如果是新增页面已经保存，则调用update
           // 其他情况均为修改页面
           if (this.isSave === false && this.isEditMode === false) {
+            console.log('add', this.personForm)
+            delete this.personForm.id
             addPerson(this.personForm).then(response => {
               if (response.code === 200) {
                 // 保存用户id
@@ -581,19 +587,6 @@
         }
       })
     },
-    // 注册虹膜 (没用了)
-    registerIris() {
-      // 如果已经保存
-      // this.isSave = true
-      if (this.isSave) {
-        this.step = '2'
-        this.irisBtnName = '初始化设备'
-        this.irisBtnDisable = true
-        this.devLoading = true
-      } else {
-        this.$message.warning('请先保存用户基本信息')
-      }
-    },
     // 接收iframe传来的消息
     receiveParamsFromHtml(res) {
       if (res === 'saveIrisData') {
@@ -602,20 +595,6 @@
         this.iframeMsg = res
       }
     },
-    // 没用了
-    startCapture() {
-      if (this.irisBtnName === '初始化设备') {
-        this.devLoading = true
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].initDev()
-      } else if (this.irisBtnName === '立即采集') {
-        this.irisBtnDisable = true
-        window.frames['iframeMap'].StartCaptureStepTwo()
-      } else if (this.irisBtnName === '保存虹膜数据') {
-        this.irisBtnDisable = true
-        this.saveIrisData()
-      }
-    },
     // 保存虹膜数据
     saveIrisData() {
       this.irisForm.image_zy0 = window.frames['iframeMap'].image0
@@ -633,6 +612,7 @@
             cancelButtonText: '否',
             type: 'info'
           }).then(() => {
+            this.personForm.id = ''
             this.resetForm()
             this.isSave = false
             this.isEditMode = false
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9450c45..5004830 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,14 +31,14 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column v-if="hasPerm('/staff/delete')" align="center" type="selection" width="55"/>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column :index="indexMethod" align="center" label="序号" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
@@ -276,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = false
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index e6454a3..b6e0a3d 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -32,7 +32,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
         </el-col>
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 4a3f0c2..c496e6a 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -19,7 +19,7 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.devCode" placeholder="设备" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="设备编号" clearable value="">
               <el-option
                 v-for="item in deviceList"
                 :key="item.id"
@@ -61,7 +61,7 @@
       <el-row class="table-title">
         <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('/records/exportRecord')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index c0318db..c5534f7 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -15,7 +15,7 @@
           <!--v-for="item in doorList"-->
           <!--:key="item.id"-->
           <!--:label="item.doorName"-->
-          <!--:value="item.doorCode"/>-->
+          <!-- :value="item.doorCode"/> -->
           <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
@@ -51,7 +51,7 @@
       <el-row class="table-title">
         <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('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index 7964df1..467b00c 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -48,7 +48,7 @@
       <el-row class="table-title">
         <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('/records/exportVisitor')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 2107ff1..9b8c150 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -4,7 +4,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填"/>
+            <el-input v-model.trim="deptForm.simplename" show-word-limit maxlength="10" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..353feff 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,6 +150,7 @@
     },
     // 查询数据
     search() {
+      this.listQuery.offset = 1
       this.fetchData()
     },
     // 获取日志数据
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..237d796 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,6 +132,7 @@
     },
     // 查询数据
     search() {
+      this.listQuery.offset = 1
       this.fetchData()
     },
     // 获取日志数据