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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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 69a6087..775e757 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="Staff number" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="Visitor number">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="National" prop="nation">
-                  <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                   <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                     <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                   </el-select> -->
@@ -153,7 +153,7 @@
 import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } 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'
 
 export default {
@@ -236,10 +236,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() {
     // 接收iframe的传值
@@ -307,7 +307,7 @@
         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, // 单位/部门

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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 69a6087..775e757 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="Staff number" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="Visitor number">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="National" prop="nation">
-                  <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                   <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                     <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                   </el-select> -->
@@ -153,7 +153,7 @@
 import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } 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'
 
 export default {
@@ -236,10 +236,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() {
     // 接收iframe的传值
@@ -307,7 +307,7 @@
         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, // 单位/部门
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9695f04..d5dae3e 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -29,9 +29,9 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data List</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">Export data</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export data</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">Delete</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">Add</el-button>
         </el-col>
@@ -95,7 +95,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'Staff number',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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 69a6087..775e757 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="Staff number" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="Visitor number">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="National" prop="nation">
-                  <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                   <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                     <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                   </el-select> -->
@@ -153,7 +153,7 @@
 import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } 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'
 
 export default {
@@ -236,10 +236,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() {
     // 接收iframe的传值
@@ -307,7 +307,7 @@
         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, // 单位/部门
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9695f04..d5dae3e 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -29,9 +29,9 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data List</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">Export data</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export data</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">Delete</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">Add</el-button>
         </el-col>
@@ -95,7 +95,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'Staff number',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 7f5ec77..478d00c 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="Device" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="DeviceCode" 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"/>Data List</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">Export Record</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export Record</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -122,7 +122,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'StaffCode',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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 69a6087..775e757 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="Staff number" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="Visitor number">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="National" prop="nation">
-                  <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                   <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                     <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                   </el-select> -->
@@ -153,7 +153,7 @@
 import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } 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'
 
 export default {
@@ -236,10 +236,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() {
     // 接收iframe的传值
@@ -307,7 +307,7 @@
         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, // 单位/部门
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9695f04..d5dae3e 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -29,9 +29,9 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data List</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">Export data</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export data</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">Delete</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">Add</el-button>
         </el-col>
@@ -95,7 +95,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'Staff number',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 7f5ec77..478d00c 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="Device" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="DeviceCode" 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"/>Data List</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">Export Record</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export Record</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -122,7 +122,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'StaffCode',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index 2afcf16..ae5abcb 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -10,13 +10,13 @@
             <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in doorList"-->
-                <!--:key="item.id"-->
-                <!--:label="item.doorName"-->
-                <!--:value="item.doorCode"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in doorList"-->
+          <!--:key="item.id"-->
+          <!--:label="item.doorName"-->
+          <!--:value="item.doorCode"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">

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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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 69a6087..775e757 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="Staff number" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="Visitor number">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="National" prop="nation">
-                  <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                   <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                     <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                   </el-select> -->
@@ -153,7 +153,7 @@
 import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } 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'
 
 export default {
@@ -236,10 +236,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() {
     // 接收iframe的传值
@@ -307,7 +307,7 @@
         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, // 单位/部门
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9695f04..d5dae3e 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -29,9 +29,9 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data List</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">Export data</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export data</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">Delete</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">Add</el-button>
         </el-col>
@@ -95,7 +95,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'Staff number',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 7f5ec77..478d00c 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="Device" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="DeviceCode" 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"/>Data List</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">Export Record</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export Record</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -122,7 +122,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'StaffCode',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index 2afcf16..ae5abcb 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -10,13 +10,13 @@
             <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in doorList"-->
-                <!--:key="item.id"-->
-                <!--:label="item.doorName"-->
-                <!--:value="item.doorCode"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in doorList"-->
+          <!--:key="item.id"-->
+          <!--:label="item.doorName"-->
+          <!--:value="item.doorCode"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 8c353e3..ebfb50f 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="Short Name" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="Required"/>
+            <el-input v-model.trim="deptForm.simplename" show-word-limit maxlength="15" type="text" placeholder="Required"/>
           </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/components/Clock/clock.vue b/src/components/Clock/clock.vue
index 0478860..618b989 100644
--- a/src/components/Clock/clock.vue
+++ b/src/components/Clock/clock.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card class="box-card">
     <div class="clock">
-<!--      <span class="title">中国，北京时间</span>-->
-      <span class="hours">{{ hours }}</span>:
+      <!--<span class="title">中国，北京时间</span>-->
+      <!-- <span class="hours">{{ hours }}</span>:
       <span class="minutes">{{ minutes }}</span>:
-      <span class="seconds">{{ seconds }}</span>
+      <span class="seconds">{{ seconds }}</span> -->
     </div>
   </el-card>
 </template>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5db6ce0..c151568 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -88,7 +88,7 @@
           } else {
             reject('该用户无角色')
           }
-          if (data.deptId || data.deptId === 0) {
+          if (data.deptId) {
             commit('SET_DEPTID', data.deptId)
             commit('SET_DEPTNAME', data.deptName)
           } else {
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 9c7e0eb..34a6672 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -45,7 +45,7 @@
       const n = plainList[i]
       const id = '' + n.id
       const pid = '' + n.pid
-      if (parseInt(pid) === parseInt(parentId)) {
+      if (pid === parentId) {
         n.children = fa(id)
         temp.push(n)
       }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 8784075..914d9b8 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -51,7 +51,7 @@
           permission: '/device'
         },
         {
-          title: 'Staff Access Records',
+          title: 'Staff Recognition Records',
           context: '',
           icon: 'icon-step-staff',
           color: '#c4b4e4',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6dce9c1..710f07a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,11 +2,27 @@
   <div class="dashboard-container">
     <el-row>
       <el-col :span="16">
+        <el-row>
+          <el-card class="welcome-card">
+            <span class="dashboard-text">Welcome, {{ name }} !</span>
+          </el-card>
+        </el-row>
+        <el-row>
+          <panel-group/>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="16">
         <el-card class="welcome-card">
           <span class="dashboard-text">Welcome, {{ name }} !</span>
         </el-card>
       </el-col>
-      <el-col :span="8">
+       <el-col :span="8">
         <clock/>
       </el-col>
     </el-row>
@@ -17,7 +33,7 @@
       <el-col :span="8">
         <calendar/>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 18bc551..ef1e872 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -3,7 +3,7 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Device List</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button class="edit_btn" size="small" @click="syncRecords">Synchronize recognition records</el-button>
           <el-button class="edit_btn" size="small" @click="updateData">Send data to device</el-button>
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index 4d93fb0..612aa75 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"
@@ -104,7 +105,7 @@
         if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
           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')
         }
         if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) {
           this.$message.warning('The date range cannot be more than 7 days')
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index cad8ec4..fbde1fd 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="Staff number" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
               </el-form-item>
               <el-form-item v-else label="Visitor number">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="IdCard" prop="idCardNo">
-                <el-input v-model.trim="perso111nForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
+                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" show-word-limit type="text" maxlength="32" placeholder="Required"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,7 +45,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="National" prop="nation">
-                <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                 <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                   <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                 </el-select> -->
@@ -133,10 +133,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'
 
 export default {
@@ -186,7 +186,7 @@
       dutyList: [], // 职务列表
       nationList: [], // 民族列表
       rules: {
-        personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
+        // personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
         idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
           { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
@@ -205,10 +205,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() {
     this.fetchSexType()// 获取性别列表
@@ -259,12 +259,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, // 单位/部门
@@ -280,9 +280,17 @@
             address: personForm.ext.address// 住址
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
+        if (personForm.personCode) {
+          this.personForm.personCode = personForm.personCode
         }
+        // if (personForm.photo !== '') {
+        //   this.photo = base_url + personForm.photo
+        // }
+        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 69a6087..775e757 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="Staff number" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
                 </el-form-item>
                 <el-form-item v-else label="Visitor number">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="Will generate automatically"/>
@@ -47,7 +47,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="National" prop="nation">
-                  <el-input v-model.trim="personForm.nation" type="text" placeholder="Required"/>
+                  <el-input v-model.trim="personForm.nation" type="text" placeholder=""/>
                   <!-- <el-select v-model="personForm.nation" placeholder="National" clearable>
                     <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
                   </el-select> -->
@@ -153,7 +153,7 @@
 import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, saveIris } 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'
 
 export default {
@@ -236,10 +236,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() {
     // 接收iframe的传值
@@ -307,7 +307,7 @@
         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, // 单位/部门
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9695f04..d5dae3e 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -29,9 +29,9 @@
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data list</div></el-col>
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>Data List</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">Export data</el-button>
+          <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export data</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">Delete</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">Add</el-button>
         </el-col>
@@ -95,7 +95,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'Staff number',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 7f5ec77..478d00c 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="Device" clearable value="">
+            <el-select v-model="listQuery.devCode" placeholder="DeviceCode" 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"/>Data List</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">Export Record</el-button>
+          <el-button v-if="hasPerm('/records/exportRecord')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">Export Record</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -122,7 +122,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: 'StaffCode',
+          text: 'Staff Number',
           value: 'personCode',
           align: 'center'
         },
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index 2afcf16..ae5abcb 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -10,13 +10,13 @@
             <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in doorList"-->
-                <!--:key="item.id"-->
-                <!--:label="item.doorName"-->
-                <!--:value="item.doorCode"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in doorList"-->
+          <!--:key="item.id"-->
+          <!--:label="item.doorName"-->
+          <!--:value="item.doorCode"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 8c353e3..ebfb50f 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="Short Name" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="Required"/>
+            <el-input v-model.trim="deptForm.simplename" show-word-limit maxlength="15" type="text" placeholder="Required"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/static/eye/eye.html b/static/eye/eye.html
index 720c535..5c10693 100644
--- a/static/eye/eye.html
+++ b/static/eye/eye.html
@@ -20,7 +20,7 @@
 
     <input type="button" id="startDev" value="Start Capture" onclick="StartCaptureStepTwo()"></input>
 
-    <input type="button" id="stopDev" value="Stop Capture" onclick="stopDev()"></input>
+    <!-- <input type="button" id="stopDev" value="Stop Capture" onclick="stopDev()"></input> -->
 
 </div>