diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue
index f6a7328..172e32f 100644
--- a/src/views/system/post/listPost.vue
+++ b/src/views/system/post/listPost.vue
@@ -3,7 +3,16 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="岗位名称/编号" clearable/>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="岗位名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" size="small" placeholder="岗位类型" clearable>
+          <el-option
+            v-for="item in postTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -25,17 +34,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <edit-area v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
+    <edit-post v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
   </app-container>
 </template>
 
 <script>
-import { getAreaListPage, delArea } from '@/api/system/area'
-// import EditArea from './editArea'
+import { getPostType, getPostListPage, delPost } from '@/api/system/post'
+import EditPost from './editPost'
 
 export default {
   name: 'ListPost',
-  // components: { EditArea },
+  components: { EditPost },
   data() {
     return {
       listQuery: {
@@ -52,28 +61,18 @@
           align: 'center'
         },
         {
-          text: '岗位编码',
-          value: 'id',
+          text: '岗位类别',
+          value: 'typeName',
           align: 'center'
         },
         {
-          text: '岗位级别',
-          value: 'levelName',
-          align: 'center'
-        },
-        {
-          text: '所属区域',
-          value: 'pName',
-          align: 'center'
-        },
-        {
-          text: '区域排序',
-          value: 'num',
-          width: 80,
+          text: '岗位职责',
+          value: 'duty',
           align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
+      postTypeList: [], // 岗位类别里诶啊哦
       total: 0, // 数据总数
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -82,37 +81,32 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/area/update') || this.hasPerm('/area/delete')
+      return this.hasPerm('/post/update') || this.hasPerm('/post/delete')
     }
   },
   created() {
+    this.fetchPostType()
     this.fetchData()// 获取数据
   },
   activated() {
-    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    // 打开详情对话框
-    detail(row) {
-      this.$refs.detailwell.initDialog(true, row)
-    },
-
-    // 新增区域
+    // 新增岗位
     add() {
       this.dialogFormVisible = true
-      this.$refs.editarea.initDialog('create', this.dialogFormVisible)
+      this.$refs.editpost.initDialog('create', this.dialogFormVisible)
     },
-    // 编辑区域信息
+    // 编辑岗位信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.editarea.initDialog('update', this.dialogFormVisible, row)
+      this.$refs.editpost.initDialog('update', this.dialogFormVisible, row)
     },
-    // 删除区域
+    // 删除岗位
     del(row) {
       this.$confirm(
-        '确定要删除区域吗？',
+        '确定要删除岗位吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -120,7 +114,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delArea(row.id).then(response => {
+        delPost(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -132,13 +126,19 @@
     search() {
       this.fetchData(false)
     },
-    // 获取区域数据
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 获取岗位数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaListPage(this.listQuery).then(response => {
+      getPostListPage(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
           this.total = parseInt(response.data.total)

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue
index f6a7328..172e32f 100644
--- a/src/views/system/post/listPost.vue
+++ b/src/views/system/post/listPost.vue
@@ -3,7 +3,16 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="岗位名称/编号" clearable/>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="岗位名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" size="small" placeholder="岗位类型" clearable>
+          <el-option
+            v-for="item in postTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -25,17 +34,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <edit-area v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
+    <edit-post v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
   </app-container>
 </template>
 
 <script>
-import { getAreaListPage, delArea } from '@/api/system/area'
-// import EditArea from './editArea'
+import { getPostType, getPostListPage, delPost } from '@/api/system/post'
+import EditPost from './editPost'
 
 export default {
   name: 'ListPost',
-  // components: { EditArea },
+  components: { EditPost },
   data() {
     return {
       listQuery: {
@@ -52,28 +61,18 @@
           align: 'center'
         },
         {
-          text: '岗位编码',
-          value: 'id',
+          text: '岗位类别',
+          value: 'typeName',
           align: 'center'
         },
         {
-          text: '岗位级别',
-          value: 'levelName',
-          align: 'center'
-        },
-        {
-          text: '所属区域',
-          value: 'pName',
-          align: 'center'
-        },
-        {
-          text: '区域排序',
-          value: 'num',
-          width: 80,
+          text: '岗位职责',
+          value: 'duty',
           align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
+      postTypeList: [], // 岗位类别里诶啊哦
       total: 0, // 数据总数
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -82,37 +81,32 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/area/update') || this.hasPerm('/area/delete')
+      return this.hasPerm('/post/update') || this.hasPerm('/post/delete')
     }
   },
   created() {
+    this.fetchPostType()
     this.fetchData()// 获取数据
   },
   activated() {
-    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    // 打开详情对话框
-    detail(row) {
-      this.$refs.detailwell.initDialog(true, row)
-    },
-
-    // 新增区域
+    // 新增岗位
     add() {
       this.dialogFormVisible = true
-      this.$refs.editarea.initDialog('create', this.dialogFormVisible)
+      this.$refs.editpost.initDialog('create', this.dialogFormVisible)
     },
-    // 编辑区域信息
+    // 编辑岗位信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.editarea.initDialog('update', this.dialogFormVisible, row)
+      this.$refs.editpost.initDialog('update', this.dialogFormVisible, row)
     },
-    // 删除区域
+    // 删除岗位
     del(row) {
       this.$confirm(
-        '确定要删除区域吗？',
+        '确定要删除岗位吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -120,7 +114,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delArea(row.id).then(response => {
+        delPost(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -132,13 +126,19 @@
     search() {
       this.fetchData(false)
     },
-    // 获取区域数据
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 获取岗位数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaListPage(this.listQuery).then(response => {
+      getPostListPage(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
           this.total = parseInt(response.data.total)
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 1d33eb2..ed9f253 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -63,7 +63,8 @@
       columns: [
         {
           text: '角色名称',
-          value: 'name'
+          value: 'name',
+          align: 'left'
         },
         {
           text: '所在组织机构',

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue
index f6a7328..172e32f 100644
--- a/src/views/system/post/listPost.vue
+++ b/src/views/system/post/listPost.vue
@@ -3,7 +3,16 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="岗位名称/编号" clearable/>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="岗位名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" size="small" placeholder="岗位类型" clearable>
+          <el-option
+            v-for="item in postTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -25,17 +34,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <edit-area v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
+    <edit-post v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
   </app-container>
 </template>
 
 <script>
-import { getAreaListPage, delArea } from '@/api/system/area'
-// import EditArea from './editArea'
+import { getPostType, getPostListPage, delPost } from '@/api/system/post'
+import EditPost from './editPost'
 
 export default {
   name: 'ListPost',
-  // components: { EditArea },
+  components: { EditPost },
   data() {
     return {
       listQuery: {
@@ -52,28 +61,18 @@
           align: 'center'
         },
         {
-          text: '岗位编码',
-          value: 'id',
+          text: '岗位类别',
+          value: 'typeName',
           align: 'center'
         },
         {
-          text: '岗位级别',
-          value: 'levelName',
-          align: 'center'
-        },
-        {
-          text: '所属区域',
-          value: 'pName',
-          align: 'center'
-        },
-        {
-          text: '区域排序',
-          value: 'num',
-          width: 80,
+          text: '岗位职责',
+          value: 'duty',
           align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
+      postTypeList: [], // 岗位类别里诶啊哦
       total: 0, // 数据总数
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -82,37 +81,32 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/area/update') || this.hasPerm('/area/delete')
+      return this.hasPerm('/post/update') || this.hasPerm('/post/delete')
     }
   },
   created() {
+    this.fetchPostType()
     this.fetchData()// 获取数据
   },
   activated() {
-    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    // 打开详情对话框
-    detail(row) {
-      this.$refs.detailwell.initDialog(true, row)
-    },
-
-    // 新增区域
+    // 新增岗位
     add() {
       this.dialogFormVisible = true
-      this.$refs.editarea.initDialog('create', this.dialogFormVisible)
+      this.$refs.editpost.initDialog('create', this.dialogFormVisible)
     },
-    // 编辑区域信息
+    // 编辑岗位信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.editarea.initDialog('update', this.dialogFormVisible, row)
+      this.$refs.editpost.initDialog('update', this.dialogFormVisible, row)
     },
-    // 删除区域
+    // 删除岗位
     del(row) {
       this.$confirm(
-        '确定要删除区域吗？',
+        '确定要删除岗位吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -120,7 +114,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delArea(row.id).then(response => {
+        delPost(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -132,13 +126,19 @@
     search() {
       this.fetchData(false)
     },
-    // 获取区域数据
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 获取岗位数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaListPage(this.listQuery).then(response => {
+      getPostListPage(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
           this.total = parseInt(response.data.total)
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 1d33eb2..ed9f253 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -63,7 +63,8 @@
       columns: [
         {
           text: '角色名称',
-          value: 'name'
+          value: 'name',
+          align: 'left'
         },
         {
           text: '所在组织机构',
diff --git a/src/views/system/staff/addPerson.vue b/src/views/system/staff/addPerson.vue
new file mode 100644
index 0000000..18868d1
--- /dev/null
+++ b/src/views/system/staff/addPerson.vue
@@ -0,0 +1,715 @@
+<template>
+  <app-container>
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" size="small" class="main-form" label-width="120px">
+      <el-collapse v-model="activeNames">
+        <el-collapse-item title="基本信息" name="1">
+          <el-row>
+            <el-col :span="16">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="员工编号" prop="personCode">
+                    <el-input v-model.trim="personForm.personCode" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="身份证号" prop="idCardNo">
+                    <el-input v-model.trim="personForm.idCardNo" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="姓名" prop="name">
+                    <el-input v-model.trim="personForm.name" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item :disabled="dialogStatus!='create'" label="出生日期" prop="birthday">
+                    <el-date-picker
+                      v-model="personForm.birthday"
+                      :disabled="dialogStatus!='create'"
+                      type="date"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择日期"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="性别" prop="sex">
+                    <el-select v-model="personForm.sex" :disabled="dialogStatus=='info'" placeholder="性别" clearable>
+                      <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="民族" prop="nation">
+                    <el-select v-model="personForm.nation" :disabled="dialogStatus=='info'" placeholder="民族" clearable>
+                      <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="personType=='1'" :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="组织机构" prop="deptid">
+                    <dept-select v-model="personForm.deptid" :disabled="dialogStatus=='info'" :need-top="false" placeholder="单位/部门"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="岗位" prop="duty">
+                    <el-select v-model="personForm.duty" :disabled="dialogStatus=='info'" placeholder="岗位" clearable>
+                      <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="住址" prop="address">
+                    <el-input v-model.trim="personForm.ext.address" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="备注" prop="remarks">
+                    <el-input v-model.trim="personForm.remarks" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="6" :offset="2">
+              <el-row>
+                <div class="avatar">
+                  <el-image
+                    :src="photo!==''?photo:defaultPhoto"
+                    fit="cover"
+                    style="width: 130px; height: 175px"/>
+                </div>
+              </el-row>
+              <el-row v-if="dialogStatus!='info'">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-success="handleSuccess"
+                  :http-request="uploadFile"
+                  :show-file-list="false"
+                  class="avatar-uploader"
+                  action="string"
+                  accept=".jpg,.jpeg,.png">
+                  <el-button type="primary">点击上传照片</el-button>
+                </el-upload>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+        <el-collapse-item title="工作经历" name="2">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('experience')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="workExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>-->
+                <span v-else><el-input v-model="scope.row.startdate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择开始日期" size="small"/></span>-->
+                <span v-else><el-input v-model="scope.row.enddate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enterprise }}</span>
+                <span v-else><el-input v-model="scope.row.enterprise" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="职务" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.duty }}</span>
+                <span v-else><el-input v-model="scope.row.duty" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="workExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="教育经历" name="3">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" type="primary" icon="el-icon-plus" plain @click="addLine('study')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="studyExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择结束日期" size="small"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="学校" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.school }}</span>
+                <span v-else><el-input v-model="scope.row.school" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="类别" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.major }}</span>
+                <span v-else><el-input v-model="scope.row.major" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="studyExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="社会关系" name="4">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('social')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="socialRelation" style="width: 100%" border>
+            <el-table-column label="关系" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.relation }}</span>
+                <span v-else><el-input v-model="scope.row.relation" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="姓名" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="出生年月" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.birth }}</span>
+                <span v-else><el-date-picker v-model="scope.row.birth" value-format="yyyy-MM" type="month" size="small" placeholder="选择出生年月"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="政治面貌">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.politicalStatus }}</span>
+                <span v-else><el-input v-model="scope.row.politicalStatus" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位及职务">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.work }}</span>
+                <span v-else><el-input v-model="scope.row.work" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="socialRelation.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="证书信息" name="5">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('certificate')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="certificateInfo" style="width: 100%" border>
+            <el-table-column label="证书名称">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证单位">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.unit }}</span>
+                <span v-else><el-input v-model="scope.row.unit" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证时间" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.date }}</span>
+                <span v-else><el-date-picker v-model="scope.row.date" type="month" value-format="yyyy-MM" size="small" placeholder="选择颁证时间"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="certificateInfo.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div v-if="dialogStatus!='info'" style="height: 120px;">
+      <el-row type="flex" justify="center">
+        <el-col :span="15" style="text-align:center">
+          <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { Uploadimg } from '@/api/common'
+import { addPerson, updatePerson, personInfo, getSexType, getNationType } from '@/api/system/person'
+import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+import { getPostList } from '@/api/system/post'
+
+export default {
+  name: 'AddPerson',
+  components: { DeptSelect },
+  data() {
+    const validateIDCard = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+          callback(new Error('请输入合法的身份证号'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('身份证号不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,info
+      isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
+      personType: '1', // 人员角色，1为员工，0为访客
+      canSave: true, // 是否可以点击保存，当点击后该值置为false，直到后台返回结果再置为true
+      isSave: false, // 当点击保存按钮后，并返回200结果，置为true，表示已经保存
+      personForm: {
+        id: '', // 人员id
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: ''// 住址
+        }
+      }, // 表单
+      workExperience: [{
+        enterprise: '',
+        duty: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 工作经历
+      studyExperience: [{
+        school: '',
+        major: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 教育经历
+      socialRelation: [{
+        name: '', // 姓名
+        relation: '', // 关系
+        birth: '', // 生日
+        work: '', // 工作单位及职务
+        politicalStatus: '' // 政治面貌
+      }], // 社会关系
+      certificateInfo: [{
+        name: '',
+        unit: '',
+        date: ''
+      }], // 证书信息
+      photo: '', // 图片路径
+      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      fileList: [],
+      imageList: [],
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      nationList: [], // 民族列表
+      rules: {
+        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
+        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
+        duty: [{ required: true, message: '岗位必选', trigger: 'change' }],
+        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+      },
+      dialogVisible: false,
+      labelPosition: 'right',
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true,
+      formLoading: false,
+      activeNames: ['1', '2', '3', '4', '5'] // 折叠面板展开index
+    }
+  },
+  watch: {
+    'personForm.idCardNo': function(val) {
+      this.personForm.birthday = getBirthdayByIdNO(val)
+      this.personForm.sex = getSexByIdNO(val)
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchNationType() // 获取民族列表
+    if (this.$route.query && this.$route.query.type) {
+      const type = this.$route.query.type
+      this.dialogStatus = type
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      if (type === 'create') {
+        this.isEditMode = false // 不是编辑页面
+      } else if (type === 'update') {
+        this.isEditMode = true // 是编辑页面
+        this.fetchData(this.$route.query.id)
+      } else if (type === 'info') {
+        this.isEditMode = false
+        this.fetchData(this.$route.query.id)
+      }
+    }
+  },
+  activated() {
+    if (this.$route.query && this.$route.query.type) {
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      const type = this.$route.query.type
+      if (type === 'create') {
+        this.isEditMode = false
+        this.canSave = true
+      } else if (type === 'update') {
+        this.isEditMode = true
+        this.canSave = true
+        this.fetchData(this.$route.query.id)
+      }
+    }
+    // if (this.$route.query.personType) {
+    //   this.personType = this.$route.query.personType
+    //   this.personForm.personType = this.$route.query.personType
+    // }
+  },
+  methods: {
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    fetchData(id) {
+      this.formLoading = true
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      personInfo(id).then(response => {
+        const personForm = response.data
+        this.personForm = {
+          id: personForm.id, // 人员id
+          personCode: personForm.personCode, // 人员编号
+          idCardNo: personForm.idCardNo, // 身份证号
+          name: personForm.name, // 姓名
+          deptid: personForm.deptid, // 单位/部门
+          remarks: personForm.remarks, // 备注
+          duty: personForm.duty, // 岗位
+          sex: personForm.sex, // 性别
+          personType: personForm.personType, // 人员类型
+          birthday: personForm.birthday, // 出生日期
+          nation: personForm.nation, // 民族
+          photo: personForm.photo,
+          ext: {
+            address: personForm.ext.address// 住址
+          }
+        }
+        // 解析教育、工作经历，社会关系，证书信息
+        this.workExperience = JSON.parse(personForm.ext.workExperience)
+        this.studyExperience = JSON.parse(personForm.ext.studyExperience)
+        this.socialRelation = JSON.parse(personForm.ext.socialRelation)
+        this.certificateInfo = JSON.parse(personForm.ext.certificateInfo)
+        // 解析照片
+        if (personForm.photo !== '') {
+          this.photo = base_url + personForm.photo
+        }
+        this.formLoading = false
+      })
+    },
+    // 点击新增行
+    addLine(type) {
+      if (type === 'experience') {
+        this.workExperience.push({
+          enterprise: '',
+          duty: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        })
+      } else if (type === 'study') {
+        this.studyExperience.push({
+          school: '',
+          major: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        }) // 教育经历
+      } else if (type === 'social') {
+        this.socialRelation.push({
+          name: '', // 姓名
+          relation: '', // 关系
+          birth: '', // 生日
+          work: '', // 工作单位及职务
+          politicalStatus: '' // 政治面貌
+        }) // 社会关系
+      } else if (type === 'certificate') {
+        this.certificateInfo.push({
+          name: '',
+          unit: '',
+          date: ''
+        })
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.personForm = {
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: '', // 住址
+          workExperience: '',
+          studyExperience: ''
+
+        }
+      }
+      this.workExperience = [{ enterprise: '', duty: '', startdate: '', enddate: '', notes: '' }]
+      this.studyExperience = [{ school: '', major: '', startdate: '', enddate: '', notes: '' }]
+      this.socialRelation = [{ name: '', relation: '', birth: '', work: '', politicalStatus: '' }]
+      this.certificateInfo = [{ name: '', unit: '', date: '' }] // 证书信息
+      this.photo = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.personForm.photo = this.photo.substring(index)
+        } else if (this.photo.startsWith('data:image')) { // 读卡器读的base64图片
+          this.personForm.photo = this.photo
+        }
+      }
+      // 遍历教育、工作经历，社会关系，证书信息
+      if (this.workExperience) {
+        // 过滤空的
+        this.workExperience = this.workExperience.filter(item => item.startdate !== '' && item.enterprice !== '')
+        this.personForm.ext.workExperience = JSON.stringify(this.workExperience)
+      }
+      if (this.studyExperience) {
+        // 过滤空的
+        this.studyExperience = this.studyExperience.filter(item => item.startdate !== '' && item.school !== '')
+        this.personForm.ext.studyExperience = JSON.stringify(this.studyExperience)
+      }
+      if (this.socialRelation) {
+        // 过滤空的
+        this.socialRelation = this.socialRelation.filter(item => item.name !== '' && item.relation !== '')
+        this.personForm.ext.socialRelation = JSON.stringify(this.socialRelation)
+      }
+      if (this.certificateInfo) {
+        // 过滤空的
+        this.certificateInfo = this.certificateInfo.filter(item => item.name !== '' && item.unit !== '')
+        this.personForm.ext.certificateInfo = JSON.stringify(this.certificateInfo)
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 如果新增页面未保存，则调用add
+          // 如果是新增页面已经保存，则调用update
+          // 其他情况均为修改页面
+          if (this.isSave === false && this.isEditMode === false) {
+            addPerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                // 保存用户id
+                this.personForm.id = response.data.id
+                this.personForm.personCode = response.data.code
+                this.isSave = true
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+              this.canSave = true
+            }).catch(() => {
+              this.canSave = true
+            })
+          } else {
+            updatePerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+            })
+          }
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = base_url + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 获取民族
+    fetchNationType() {
+      getNationType().then(response => {
+        this.nationList = response.data
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" >
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+  .main-form{
+    margin: 0px 0px;
+    padding: 30px;
+    overflow: auto;
+  }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width:100%;
+  }
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+  .line{
+    width: 50px;
+    margin-left: 5px;
+  }
+  .hide .el-upload-–picture-card{
+    display: none;
+  }
+  .imgBox{
+    width: 100%;
+    text-align: center;
+  }
+  .avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 238px;
+    line-height: 238px;
+    text-align: center;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .id-card-btn{
+    width:126px;
+    margin-left: 12px;
+    margin-top: 20px;
+   }
+</style>

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue
index f6a7328..172e32f 100644
--- a/src/views/system/post/listPost.vue
+++ b/src/views/system/post/listPost.vue
@@ -3,7 +3,16 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="岗位名称/编号" clearable/>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="岗位名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" size="small" placeholder="岗位类型" clearable>
+          <el-option
+            v-for="item in postTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -25,17 +34,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <edit-area v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
+    <edit-post v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
   </app-container>
 </template>
 
 <script>
-import { getAreaListPage, delArea } from '@/api/system/area'
-// import EditArea from './editArea'
+import { getPostType, getPostListPage, delPost } from '@/api/system/post'
+import EditPost from './editPost'
 
 export default {
   name: 'ListPost',
-  // components: { EditArea },
+  components: { EditPost },
   data() {
     return {
       listQuery: {
@@ -52,28 +61,18 @@
           align: 'center'
         },
         {
-          text: '岗位编码',
-          value: 'id',
+          text: '岗位类别',
+          value: 'typeName',
           align: 'center'
         },
         {
-          text: '岗位级别',
-          value: 'levelName',
-          align: 'center'
-        },
-        {
-          text: '所属区域',
-          value: 'pName',
-          align: 'center'
-        },
-        {
-          text: '区域排序',
-          value: 'num',
-          width: 80,
+          text: '岗位职责',
+          value: 'duty',
           align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
+      postTypeList: [], // 岗位类别里诶啊哦
       total: 0, // 数据总数
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -82,37 +81,32 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/area/update') || this.hasPerm('/area/delete')
+      return this.hasPerm('/post/update') || this.hasPerm('/post/delete')
     }
   },
   created() {
+    this.fetchPostType()
     this.fetchData()// 获取数据
   },
   activated() {
-    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    // 打开详情对话框
-    detail(row) {
-      this.$refs.detailwell.initDialog(true, row)
-    },
-
-    // 新增区域
+    // 新增岗位
     add() {
       this.dialogFormVisible = true
-      this.$refs.editarea.initDialog('create', this.dialogFormVisible)
+      this.$refs.editpost.initDialog('create', this.dialogFormVisible)
     },
-    // 编辑区域信息
+    // 编辑岗位信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.editarea.initDialog('update', this.dialogFormVisible, row)
+      this.$refs.editpost.initDialog('update', this.dialogFormVisible, row)
     },
-    // 删除区域
+    // 删除岗位
     del(row) {
       this.$confirm(
-        '确定要删除区域吗？',
+        '确定要删除岗位吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -120,7 +114,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delArea(row.id).then(response => {
+        delPost(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -132,13 +126,19 @@
     search() {
       this.fetchData(false)
     },
-    // 获取区域数据
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 获取岗位数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaListPage(this.listQuery).then(response => {
+      getPostListPage(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
           this.total = parseInt(response.data.total)
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 1d33eb2..ed9f253 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -63,7 +63,8 @@
       columns: [
         {
           text: '角色名称',
-          value: 'name'
+          value: 'name',
+          align: 'left'
         },
         {
           text: '所在组织机构',
diff --git a/src/views/system/staff/addPerson.vue b/src/views/system/staff/addPerson.vue
new file mode 100644
index 0000000..18868d1
--- /dev/null
+++ b/src/views/system/staff/addPerson.vue
@@ -0,0 +1,715 @@
+<template>
+  <app-container>
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" size="small" class="main-form" label-width="120px">
+      <el-collapse v-model="activeNames">
+        <el-collapse-item title="基本信息" name="1">
+          <el-row>
+            <el-col :span="16">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="员工编号" prop="personCode">
+                    <el-input v-model.trim="personForm.personCode" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="身份证号" prop="idCardNo">
+                    <el-input v-model.trim="personForm.idCardNo" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="姓名" prop="name">
+                    <el-input v-model.trim="personForm.name" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item :disabled="dialogStatus!='create'" label="出生日期" prop="birthday">
+                    <el-date-picker
+                      v-model="personForm.birthday"
+                      :disabled="dialogStatus!='create'"
+                      type="date"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择日期"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="性别" prop="sex">
+                    <el-select v-model="personForm.sex" :disabled="dialogStatus=='info'" placeholder="性别" clearable>
+                      <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="民族" prop="nation">
+                    <el-select v-model="personForm.nation" :disabled="dialogStatus=='info'" placeholder="民族" clearable>
+                      <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="personType=='1'" :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="组织机构" prop="deptid">
+                    <dept-select v-model="personForm.deptid" :disabled="dialogStatus=='info'" :need-top="false" placeholder="单位/部门"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="岗位" prop="duty">
+                    <el-select v-model="personForm.duty" :disabled="dialogStatus=='info'" placeholder="岗位" clearable>
+                      <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="住址" prop="address">
+                    <el-input v-model.trim="personForm.ext.address" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="备注" prop="remarks">
+                    <el-input v-model.trim="personForm.remarks" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="6" :offset="2">
+              <el-row>
+                <div class="avatar">
+                  <el-image
+                    :src="photo!==''?photo:defaultPhoto"
+                    fit="cover"
+                    style="width: 130px; height: 175px"/>
+                </div>
+              </el-row>
+              <el-row v-if="dialogStatus!='info'">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-success="handleSuccess"
+                  :http-request="uploadFile"
+                  :show-file-list="false"
+                  class="avatar-uploader"
+                  action="string"
+                  accept=".jpg,.jpeg,.png">
+                  <el-button type="primary">点击上传照片</el-button>
+                </el-upload>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+        <el-collapse-item title="工作经历" name="2">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('experience')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="workExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>-->
+                <span v-else><el-input v-model="scope.row.startdate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择开始日期" size="small"/></span>-->
+                <span v-else><el-input v-model="scope.row.enddate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enterprise }}</span>
+                <span v-else><el-input v-model="scope.row.enterprise" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="职务" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.duty }}</span>
+                <span v-else><el-input v-model="scope.row.duty" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="workExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="教育经历" name="3">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" type="primary" icon="el-icon-plus" plain @click="addLine('study')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="studyExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择结束日期" size="small"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="学校" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.school }}</span>
+                <span v-else><el-input v-model="scope.row.school" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="类别" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.major }}</span>
+                <span v-else><el-input v-model="scope.row.major" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="studyExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="社会关系" name="4">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('social')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="socialRelation" style="width: 100%" border>
+            <el-table-column label="关系" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.relation }}</span>
+                <span v-else><el-input v-model="scope.row.relation" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="姓名" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="出生年月" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.birth }}</span>
+                <span v-else><el-date-picker v-model="scope.row.birth" value-format="yyyy-MM" type="month" size="small" placeholder="选择出生年月"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="政治面貌">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.politicalStatus }}</span>
+                <span v-else><el-input v-model="scope.row.politicalStatus" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位及职务">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.work }}</span>
+                <span v-else><el-input v-model="scope.row.work" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="socialRelation.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="证书信息" name="5">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('certificate')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="certificateInfo" style="width: 100%" border>
+            <el-table-column label="证书名称">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证单位">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.unit }}</span>
+                <span v-else><el-input v-model="scope.row.unit" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证时间" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.date }}</span>
+                <span v-else><el-date-picker v-model="scope.row.date" type="month" value-format="yyyy-MM" size="small" placeholder="选择颁证时间"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="certificateInfo.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div v-if="dialogStatus!='info'" style="height: 120px;">
+      <el-row type="flex" justify="center">
+        <el-col :span="15" style="text-align:center">
+          <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { Uploadimg } from '@/api/common'
+import { addPerson, updatePerson, personInfo, getSexType, getNationType } from '@/api/system/person'
+import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+import { getPostList } from '@/api/system/post'
+
+export default {
+  name: 'AddPerson',
+  components: { DeptSelect },
+  data() {
+    const validateIDCard = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+          callback(new Error('请输入合法的身份证号'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('身份证号不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,info
+      isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
+      personType: '1', // 人员角色，1为员工，0为访客
+      canSave: true, // 是否可以点击保存，当点击后该值置为false，直到后台返回结果再置为true
+      isSave: false, // 当点击保存按钮后，并返回200结果，置为true，表示已经保存
+      personForm: {
+        id: '', // 人员id
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: ''// 住址
+        }
+      }, // 表单
+      workExperience: [{
+        enterprise: '',
+        duty: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 工作经历
+      studyExperience: [{
+        school: '',
+        major: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 教育经历
+      socialRelation: [{
+        name: '', // 姓名
+        relation: '', // 关系
+        birth: '', // 生日
+        work: '', // 工作单位及职务
+        politicalStatus: '' // 政治面貌
+      }], // 社会关系
+      certificateInfo: [{
+        name: '',
+        unit: '',
+        date: ''
+      }], // 证书信息
+      photo: '', // 图片路径
+      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      fileList: [],
+      imageList: [],
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      nationList: [], // 民族列表
+      rules: {
+        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
+        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
+        duty: [{ required: true, message: '岗位必选', trigger: 'change' }],
+        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+      },
+      dialogVisible: false,
+      labelPosition: 'right',
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true,
+      formLoading: false,
+      activeNames: ['1', '2', '3', '4', '5'] // 折叠面板展开index
+    }
+  },
+  watch: {
+    'personForm.idCardNo': function(val) {
+      this.personForm.birthday = getBirthdayByIdNO(val)
+      this.personForm.sex = getSexByIdNO(val)
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchNationType() // 获取民族列表
+    if (this.$route.query && this.$route.query.type) {
+      const type = this.$route.query.type
+      this.dialogStatus = type
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      if (type === 'create') {
+        this.isEditMode = false // 不是编辑页面
+      } else if (type === 'update') {
+        this.isEditMode = true // 是编辑页面
+        this.fetchData(this.$route.query.id)
+      } else if (type === 'info') {
+        this.isEditMode = false
+        this.fetchData(this.$route.query.id)
+      }
+    }
+  },
+  activated() {
+    if (this.$route.query && this.$route.query.type) {
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      const type = this.$route.query.type
+      if (type === 'create') {
+        this.isEditMode = false
+        this.canSave = true
+      } else if (type === 'update') {
+        this.isEditMode = true
+        this.canSave = true
+        this.fetchData(this.$route.query.id)
+      }
+    }
+    // if (this.$route.query.personType) {
+    //   this.personType = this.$route.query.personType
+    //   this.personForm.personType = this.$route.query.personType
+    // }
+  },
+  methods: {
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    fetchData(id) {
+      this.formLoading = true
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      personInfo(id).then(response => {
+        const personForm = response.data
+        this.personForm = {
+          id: personForm.id, // 人员id
+          personCode: personForm.personCode, // 人员编号
+          idCardNo: personForm.idCardNo, // 身份证号
+          name: personForm.name, // 姓名
+          deptid: personForm.deptid, // 单位/部门
+          remarks: personForm.remarks, // 备注
+          duty: personForm.duty, // 岗位
+          sex: personForm.sex, // 性别
+          personType: personForm.personType, // 人员类型
+          birthday: personForm.birthday, // 出生日期
+          nation: personForm.nation, // 民族
+          photo: personForm.photo,
+          ext: {
+            address: personForm.ext.address// 住址
+          }
+        }
+        // 解析教育、工作经历，社会关系，证书信息
+        this.workExperience = JSON.parse(personForm.ext.workExperience)
+        this.studyExperience = JSON.parse(personForm.ext.studyExperience)
+        this.socialRelation = JSON.parse(personForm.ext.socialRelation)
+        this.certificateInfo = JSON.parse(personForm.ext.certificateInfo)
+        // 解析照片
+        if (personForm.photo !== '') {
+          this.photo = base_url + personForm.photo
+        }
+        this.formLoading = false
+      })
+    },
+    // 点击新增行
+    addLine(type) {
+      if (type === 'experience') {
+        this.workExperience.push({
+          enterprise: '',
+          duty: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        })
+      } else if (type === 'study') {
+        this.studyExperience.push({
+          school: '',
+          major: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        }) // 教育经历
+      } else if (type === 'social') {
+        this.socialRelation.push({
+          name: '', // 姓名
+          relation: '', // 关系
+          birth: '', // 生日
+          work: '', // 工作单位及职务
+          politicalStatus: '' // 政治面貌
+        }) // 社会关系
+      } else if (type === 'certificate') {
+        this.certificateInfo.push({
+          name: '',
+          unit: '',
+          date: ''
+        })
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.personForm = {
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: '', // 住址
+          workExperience: '',
+          studyExperience: ''
+
+        }
+      }
+      this.workExperience = [{ enterprise: '', duty: '', startdate: '', enddate: '', notes: '' }]
+      this.studyExperience = [{ school: '', major: '', startdate: '', enddate: '', notes: '' }]
+      this.socialRelation = [{ name: '', relation: '', birth: '', work: '', politicalStatus: '' }]
+      this.certificateInfo = [{ name: '', unit: '', date: '' }] // 证书信息
+      this.photo = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.personForm.photo = this.photo.substring(index)
+        } else if (this.photo.startsWith('data:image')) { // 读卡器读的base64图片
+          this.personForm.photo = this.photo
+        }
+      }
+      // 遍历教育、工作经历，社会关系，证书信息
+      if (this.workExperience) {
+        // 过滤空的
+        this.workExperience = this.workExperience.filter(item => item.startdate !== '' && item.enterprice !== '')
+        this.personForm.ext.workExperience = JSON.stringify(this.workExperience)
+      }
+      if (this.studyExperience) {
+        // 过滤空的
+        this.studyExperience = this.studyExperience.filter(item => item.startdate !== '' && item.school !== '')
+        this.personForm.ext.studyExperience = JSON.stringify(this.studyExperience)
+      }
+      if (this.socialRelation) {
+        // 过滤空的
+        this.socialRelation = this.socialRelation.filter(item => item.name !== '' && item.relation !== '')
+        this.personForm.ext.socialRelation = JSON.stringify(this.socialRelation)
+      }
+      if (this.certificateInfo) {
+        // 过滤空的
+        this.certificateInfo = this.certificateInfo.filter(item => item.name !== '' && item.unit !== '')
+        this.personForm.ext.certificateInfo = JSON.stringify(this.certificateInfo)
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 如果新增页面未保存，则调用add
+          // 如果是新增页面已经保存，则调用update
+          // 其他情况均为修改页面
+          if (this.isSave === false && this.isEditMode === false) {
+            addPerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                // 保存用户id
+                this.personForm.id = response.data.id
+                this.personForm.personCode = response.data.code
+                this.isSave = true
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+              this.canSave = true
+            }).catch(() => {
+              this.canSave = true
+            })
+          } else {
+            updatePerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+            })
+          }
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = base_url + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 获取民族
+    fetchNationType() {
+      getNationType().then(response => {
+        this.nationList = response.data
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" >
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+  .main-form{
+    margin: 0px 0px;
+    padding: 30px;
+    overflow: auto;
+  }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width:100%;
+  }
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+  .line{
+    width: 50px;
+    margin-left: 5px;
+  }
+  .hide .el-upload-–picture-card{
+    display: none;
+  }
+  .imgBox{
+    width: 100%;
+    text-align: center;
+  }
+  .avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 238px;
+    line-height: 238px;
+    text-align: center;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .id-card-btn{
+    width:126px;
+    margin-left: 12px;
+    margin-top: 20px;
+   }
+</style>
diff --git a/src/views/system/staff/listStaff.vue b/src/views/system/staff/listStaff.vue
new file mode 100644
index 0000000..cedea7d
--- /dev/null
+++ b/src/views/system/staff/listStaff.vue
@@ -0,0 +1,269 @@
+<!--员工管理-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="姓名/身份证号" clearable/>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="false" size="small" placeholder="组织机构"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.sex" placeholder="性别" size="small" clearable>
+          <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.duty" placeholder="岗位" size="small" clearable>
+          <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage" @selectionChange="handleSelectionChange">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button v-if="hasPerm('/person/batchDelete')" class="edit_btn" size="small" @click="del">删除</el-button>
+        <el-button v-if="hasPerm('/person/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+      </template>
+      <template slot="preColumns">
+        <el-table-column v-if="hasPerm('/person/batchDelete')" align="center" type="selection" width="55"/>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/person/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/person/info')" type="text" @click="info(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { getPersonList, getSexType, delPerson, batchExportPerson } from '@/api/system/person'
+import { getPostList } from '@/api/system/post'
+export default {
+  name: 'ListStaff',
+  components: { DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（姓名/身份证号)
+        deptid: '', // 部门
+        sex: '', // 性别
+        duty: '', // 岗位
+        personType: '1', // 人员类型
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '员工编号',
+          value: 'personCode',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '性别',
+          value: 'sexName',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCardNo',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '组织机构',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '岗位',
+          value: 'duty',
+          align: 'center'
+        },
+        {
+          text: '备注',
+          value: 'remarks',
+          width: 140,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增员工
+    add() {
+      this.$router.push({ path: '/addStaff', query: { type: 'create' }})
+    },
+    // 编辑员工信息
+    edit(row) {
+      this.$router.push({ path: '/updateStaff', query: { type: 'update', id: row.id }})
+    },
+    // 详情
+    info(row) {
+      this.$router.push({ path: '/staffInfo', query: { type: 'info', id: row.id }})
+    },
+    // 删除人员
+    del() {
+      if (this.checkSelection()) {
+        const staffIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          staffIds.push(value.id)
+        })
+        this.$confirm(
+          '确定要删除所选员工吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delPerson(staffIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPerson(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `员工列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getPersonList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      console.log('selectionChange')
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue
index f6a7328..172e32f 100644
--- a/src/views/system/post/listPost.vue
+++ b/src/views/system/post/listPost.vue
@@ -3,7 +3,16 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="岗位名称/编号" clearable/>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="岗位名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" size="small" placeholder="岗位类型" clearable>
+          <el-option
+            v-for="item in postTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -25,17 +34,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <edit-area v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
+    <edit-post v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
   </app-container>
 </template>
 
 <script>
-import { getAreaListPage, delArea } from '@/api/system/area'
-// import EditArea from './editArea'
+import { getPostType, getPostListPage, delPost } from '@/api/system/post'
+import EditPost from './editPost'
 
 export default {
   name: 'ListPost',
-  // components: { EditArea },
+  components: { EditPost },
   data() {
     return {
       listQuery: {
@@ -52,28 +61,18 @@
           align: 'center'
         },
         {
-          text: '岗位编码',
-          value: 'id',
+          text: '岗位类别',
+          value: 'typeName',
           align: 'center'
         },
         {
-          text: '岗位级别',
-          value: 'levelName',
-          align: 'center'
-        },
-        {
-          text: '所属区域',
-          value: 'pName',
-          align: 'center'
-        },
-        {
-          text: '区域排序',
-          value: 'num',
-          width: 80,
+          text: '岗位职责',
+          value: 'duty',
           align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
+      postTypeList: [], // 岗位类别里诶啊哦
       total: 0, // 数据总数
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -82,37 +81,32 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/area/update') || this.hasPerm('/area/delete')
+      return this.hasPerm('/post/update') || this.hasPerm('/post/delete')
     }
   },
   created() {
+    this.fetchPostType()
     this.fetchData()// 获取数据
   },
   activated() {
-    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    // 打开详情对话框
-    detail(row) {
-      this.$refs.detailwell.initDialog(true, row)
-    },
-
-    // 新增区域
+    // 新增岗位
     add() {
       this.dialogFormVisible = true
-      this.$refs.editarea.initDialog('create', this.dialogFormVisible)
+      this.$refs.editpost.initDialog('create', this.dialogFormVisible)
     },
-    // 编辑区域信息
+    // 编辑岗位信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.editarea.initDialog('update', this.dialogFormVisible, row)
+      this.$refs.editpost.initDialog('update', this.dialogFormVisible, row)
     },
-    // 删除区域
+    // 删除岗位
     del(row) {
       this.$confirm(
-        '确定要删除区域吗？',
+        '确定要删除岗位吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -120,7 +114,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delArea(row.id).then(response => {
+        delPost(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -132,13 +126,19 @@
     search() {
       this.fetchData(false)
     },
-    // 获取区域数据
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 获取岗位数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaListPage(this.listQuery).then(response => {
+      getPostListPage(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
           this.total = parseInt(response.data.total)
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 1d33eb2..ed9f253 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -63,7 +63,8 @@
       columns: [
         {
           text: '角色名称',
-          value: 'name'
+          value: 'name',
+          align: 'left'
         },
         {
           text: '所在组织机构',
diff --git a/src/views/system/staff/addPerson.vue b/src/views/system/staff/addPerson.vue
new file mode 100644
index 0000000..18868d1
--- /dev/null
+++ b/src/views/system/staff/addPerson.vue
@@ -0,0 +1,715 @@
+<template>
+  <app-container>
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" size="small" class="main-form" label-width="120px">
+      <el-collapse v-model="activeNames">
+        <el-collapse-item title="基本信息" name="1">
+          <el-row>
+            <el-col :span="16">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="员工编号" prop="personCode">
+                    <el-input v-model.trim="personForm.personCode" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="身份证号" prop="idCardNo">
+                    <el-input v-model.trim="personForm.idCardNo" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="姓名" prop="name">
+                    <el-input v-model.trim="personForm.name" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item :disabled="dialogStatus!='create'" label="出生日期" prop="birthday">
+                    <el-date-picker
+                      v-model="personForm.birthday"
+                      :disabled="dialogStatus!='create'"
+                      type="date"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择日期"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="性别" prop="sex">
+                    <el-select v-model="personForm.sex" :disabled="dialogStatus=='info'" placeholder="性别" clearable>
+                      <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="民族" prop="nation">
+                    <el-select v-model="personForm.nation" :disabled="dialogStatus=='info'" placeholder="民族" clearable>
+                      <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="personType=='1'" :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="组织机构" prop="deptid">
+                    <dept-select v-model="personForm.deptid" :disabled="dialogStatus=='info'" :need-top="false" placeholder="单位/部门"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="岗位" prop="duty">
+                    <el-select v-model="personForm.duty" :disabled="dialogStatus=='info'" placeholder="岗位" clearable>
+                      <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="住址" prop="address">
+                    <el-input v-model.trim="personForm.ext.address" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="备注" prop="remarks">
+                    <el-input v-model.trim="personForm.remarks" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="6" :offset="2">
+              <el-row>
+                <div class="avatar">
+                  <el-image
+                    :src="photo!==''?photo:defaultPhoto"
+                    fit="cover"
+                    style="width: 130px; height: 175px"/>
+                </div>
+              </el-row>
+              <el-row v-if="dialogStatus!='info'">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-success="handleSuccess"
+                  :http-request="uploadFile"
+                  :show-file-list="false"
+                  class="avatar-uploader"
+                  action="string"
+                  accept=".jpg,.jpeg,.png">
+                  <el-button type="primary">点击上传照片</el-button>
+                </el-upload>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+        <el-collapse-item title="工作经历" name="2">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('experience')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="workExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>-->
+                <span v-else><el-input v-model="scope.row.startdate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择开始日期" size="small"/></span>-->
+                <span v-else><el-input v-model="scope.row.enddate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enterprise }}</span>
+                <span v-else><el-input v-model="scope.row.enterprise" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="职务" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.duty }}</span>
+                <span v-else><el-input v-model="scope.row.duty" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="workExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="教育经历" name="3">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" type="primary" icon="el-icon-plus" plain @click="addLine('study')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="studyExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择结束日期" size="small"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="学校" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.school }}</span>
+                <span v-else><el-input v-model="scope.row.school" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="类别" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.major }}</span>
+                <span v-else><el-input v-model="scope.row.major" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="studyExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="社会关系" name="4">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('social')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="socialRelation" style="width: 100%" border>
+            <el-table-column label="关系" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.relation }}</span>
+                <span v-else><el-input v-model="scope.row.relation" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="姓名" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="出生年月" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.birth }}</span>
+                <span v-else><el-date-picker v-model="scope.row.birth" value-format="yyyy-MM" type="month" size="small" placeholder="选择出生年月"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="政治面貌">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.politicalStatus }}</span>
+                <span v-else><el-input v-model="scope.row.politicalStatus" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位及职务">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.work }}</span>
+                <span v-else><el-input v-model="scope.row.work" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="socialRelation.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="证书信息" name="5">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('certificate')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="certificateInfo" style="width: 100%" border>
+            <el-table-column label="证书名称">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证单位">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.unit }}</span>
+                <span v-else><el-input v-model="scope.row.unit" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证时间" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.date }}</span>
+                <span v-else><el-date-picker v-model="scope.row.date" type="month" value-format="yyyy-MM" size="small" placeholder="选择颁证时间"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="certificateInfo.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div v-if="dialogStatus!='info'" style="height: 120px;">
+      <el-row type="flex" justify="center">
+        <el-col :span="15" style="text-align:center">
+          <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { Uploadimg } from '@/api/common'
+import { addPerson, updatePerson, personInfo, getSexType, getNationType } from '@/api/system/person'
+import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+import { getPostList } from '@/api/system/post'
+
+export default {
+  name: 'AddPerson',
+  components: { DeptSelect },
+  data() {
+    const validateIDCard = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+          callback(new Error('请输入合法的身份证号'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('身份证号不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,info
+      isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
+      personType: '1', // 人员角色，1为员工，0为访客
+      canSave: true, // 是否可以点击保存，当点击后该值置为false，直到后台返回结果再置为true
+      isSave: false, // 当点击保存按钮后，并返回200结果，置为true，表示已经保存
+      personForm: {
+        id: '', // 人员id
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: ''// 住址
+        }
+      }, // 表单
+      workExperience: [{
+        enterprise: '',
+        duty: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 工作经历
+      studyExperience: [{
+        school: '',
+        major: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 教育经历
+      socialRelation: [{
+        name: '', // 姓名
+        relation: '', // 关系
+        birth: '', // 生日
+        work: '', // 工作单位及职务
+        politicalStatus: '' // 政治面貌
+      }], // 社会关系
+      certificateInfo: [{
+        name: '',
+        unit: '',
+        date: ''
+      }], // 证书信息
+      photo: '', // 图片路径
+      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      fileList: [],
+      imageList: [],
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      nationList: [], // 民族列表
+      rules: {
+        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
+        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
+        duty: [{ required: true, message: '岗位必选', trigger: 'change' }],
+        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+      },
+      dialogVisible: false,
+      labelPosition: 'right',
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true,
+      formLoading: false,
+      activeNames: ['1', '2', '3', '4', '5'] // 折叠面板展开index
+    }
+  },
+  watch: {
+    'personForm.idCardNo': function(val) {
+      this.personForm.birthday = getBirthdayByIdNO(val)
+      this.personForm.sex = getSexByIdNO(val)
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchNationType() // 获取民族列表
+    if (this.$route.query && this.$route.query.type) {
+      const type = this.$route.query.type
+      this.dialogStatus = type
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      if (type === 'create') {
+        this.isEditMode = false // 不是编辑页面
+      } else if (type === 'update') {
+        this.isEditMode = true // 是编辑页面
+        this.fetchData(this.$route.query.id)
+      } else if (type === 'info') {
+        this.isEditMode = false
+        this.fetchData(this.$route.query.id)
+      }
+    }
+  },
+  activated() {
+    if (this.$route.query && this.$route.query.type) {
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      const type = this.$route.query.type
+      if (type === 'create') {
+        this.isEditMode = false
+        this.canSave = true
+      } else if (type === 'update') {
+        this.isEditMode = true
+        this.canSave = true
+        this.fetchData(this.$route.query.id)
+      }
+    }
+    // if (this.$route.query.personType) {
+    //   this.personType = this.$route.query.personType
+    //   this.personForm.personType = this.$route.query.personType
+    // }
+  },
+  methods: {
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    fetchData(id) {
+      this.formLoading = true
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      personInfo(id).then(response => {
+        const personForm = response.data
+        this.personForm = {
+          id: personForm.id, // 人员id
+          personCode: personForm.personCode, // 人员编号
+          idCardNo: personForm.idCardNo, // 身份证号
+          name: personForm.name, // 姓名
+          deptid: personForm.deptid, // 单位/部门
+          remarks: personForm.remarks, // 备注
+          duty: personForm.duty, // 岗位
+          sex: personForm.sex, // 性别
+          personType: personForm.personType, // 人员类型
+          birthday: personForm.birthday, // 出生日期
+          nation: personForm.nation, // 民族
+          photo: personForm.photo,
+          ext: {
+            address: personForm.ext.address// 住址
+          }
+        }
+        // 解析教育、工作经历，社会关系，证书信息
+        this.workExperience = JSON.parse(personForm.ext.workExperience)
+        this.studyExperience = JSON.parse(personForm.ext.studyExperience)
+        this.socialRelation = JSON.parse(personForm.ext.socialRelation)
+        this.certificateInfo = JSON.parse(personForm.ext.certificateInfo)
+        // 解析照片
+        if (personForm.photo !== '') {
+          this.photo = base_url + personForm.photo
+        }
+        this.formLoading = false
+      })
+    },
+    // 点击新增行
+    addLine(type) {
+      if (type === 'experience') {
+        this.workExperience.push({
+          enterprise: '',
+          duty: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        })
+      } else if (type === 'study') {
+        this.studyExperience.push({
+          school: '',
+          major: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        }) // 教育经历
+      } else if (type === 'social') {
+        this.socialRelation.push({
+          name: '', // 姓名
+          relation: '', // 关系
+          birth: '', // 生日
+          work: '', // 工作单位及职务
+          politicalStatus: '' // 政治面貌
+        }) // 社会关系
+      } else if (type === 'certificate') {
+        this.certificateInfo.push({
+          name: '',
+          unit: '',
+          date: ''
+        })
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.personForm = {
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: '', // 住址
+          workExperience: '',
+          studyExperience: ''
+
+        }
+      }
+      this.workExperience = [{ enterprise: '', duty: '', startdate: '', enddate: '', notes: '' }]
+      this.studyExperience = [{ school: '', major: '', startdate: '', enddate: '', notes: '' }]
+      this.socialRelation = [{ name: '', relation: '', birth: '', work: '', politicalStatus: '' }]
+      this.certificateInfo = [{ name: '', unit: '', date: '' }] // 证书信息
+      this.photo = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.personForm.photo = this.photo.substring(index)
+        } else if (this.photo.startsWith('data:image')) { // 读卡器读的base64图片
+          this.personForm.photo = this.photo
+        }
+      }
+      // 遍历教育、工作经历，社会关系，证书信息
+      if (this.workExperience) {
+        // 过滤空的
+        this.workExperience = this.workExperience.filter(item => item.startdate !== '' && item.enterprice !== '')
+        this.personForm.ext.workExperience = JSON.stringify(this.workExperience)
+      }
+      if (this.studyExperience) {
+        // 过滤空的
+        this.studyExperience = this.studyExperience.filter(item => item.startdate !== '' && item.school !== '')
+        this.personForm.ext.studyExperience = JSON.stringify(this.studyExperience)
+      }
+      if (this.socialRelation) {
+        // 过滤空的
+        this.socialRelation = this.socialRelation.filter(item => item.name !== '' && item.relation !== '')
+        this.personForm.ext.socialRelation = JSON.stringify(this.socialRelation)
+      }
+      if (this.certificateInfo) {
+        // 过滤空的
+        this.certificateInfo = this.certificateInfo.filter(item => item.name !== '' && item.unit !== '')
+        this.personForm.ext.certificateInfo = JSON.stringify(this.certificateInfo)
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 如果新增页面未保存，则调用add
+          // 如果是新增页面已经保存，则调用update
+          // 其他情况均为修改页面
+          if (this.isSave === false && this.isEditMode === false) {
+            addPerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                // 保存用户id
+                this.personForm.id = response.data.id
+                this.personForm.personCode = response.data.code
+                this.isSave = true
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+              this.canSave = true
+            }).catch(() => {
+              this.canSave = true
+            })
+          } else {
+            updatePerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+            })
+          }
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = base_url + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 获取民族
+    fetchNationType() {
+      getNationType().then(response => {
+        this.nationList = response.data
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" >
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+  .main-form{
+    margin: 0px 0px;
+    padding: 30px;
+    overflow: auto;
+  }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width:100%;
+  }
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+  .line{
+    width: 50px;
+    margin-left: 5px;
+  }
+  .hide .el-upload-–picture-card{
+    display: none;
+  }
+  .imgBox{
+    width: 100%;
+    text-align: center;
+  }
+  .avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 238px;
+    line-height: 238px;
+    text-align: center;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .id-card-btn{
+    width:126px;
+    margin-left: 12px;
+    margin-top: 20px;
+   }
+</style>
diff --git a/src/views/system/staff/listStaff.vue b/src/views/system/staff/listStaff.vue
new file mode 100644
index 0000000..cedea7d
--- /dev/null
+++ b/src/views/system/staff/listStaff.vue
@@ -0,0 +1,269 @@
+<!--员工管理-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="姓名/身份证号" clearable/>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="false" size="small" placeholder="组织机构"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.sex" placeholder="性别" size="small" clearable>
+          <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.duty" placeholder="岗位" size="small" clearable>
+          <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage" @selectionChange="handleSelectionChange">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button v-if="hasPerm('/person/batchDelete')" class="edit_btn" size="small" @click="del">删除</el-button>
+        <el-button v-if="hasPerm('/person/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+      </template>
+      <template slot="preColumns">
+        <el-table-column v-if="hasPerm('/person/batchDelete')" align="center" type="selection" width="55"/>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/person/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/person/info')" type="text" @click="info(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { getPersonList, getSexType, delPerson, batchExportPerson } from '@/api/system/person'
+import { getPostList } from '@/api/system/post'
+export default {
+  name: 'ListStaff',
+  components: { DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（姓名/身份证号)
+        deptid: '', // 部门
+        sex: '', // 性别
+        duty: '', // 岗位
+        personType: '1', // 人员类型
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '员工编号',
+          value: 'personCode',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '性别',
+          value: 'sexName',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCardNo',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '组织机构',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '岗位',
+          value: 'duty',
+          align: 'center'
+        },
+        {
+          text: '备注',
+          value: 'remarks',
+          width: 140,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增员工
+    add() {
+      this.$router.push({ path: '/addStaff', query: { type: 'create' }})
+    },
+    // 编辑员工信息
+    edit(row) {
+      this.$router.push({ path: '/updateStaff', query: { type: 'update', id: row.id }})
+    },
+    // 详情
+    info(row) {
+      this.$router.push({ path: '/staffInfo', query: { type: 'info', id: row.id }})
+    },
+    // 删除人员
+    del() {
+      if (this.checkSelection()) {
+        const staffIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          staffIds.push(value.id)
+        })
+        this.$confirm(
+          '确定要删除所选员工吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delPerson(staffIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPerson(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `员工列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getPersonList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      console.log('selectionChange')
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index c5df2f1..8cfb01c 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -62,13 +62,6 @@
             </el-table-column>
           </template>
           <template slot="columns">
-            <!-- 人脸是否注册 -->
-<!--            <el-table-column label="人脸" width="80" align="center" >-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-tag v-show="scope.row.attr1" size="medium">{{ faceReged[scope.row.attr1] }}</el-tag>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-            <!--冻结状态-->
             <el-table-column label="状态" width="80" align="center" >
               <template slot-scope="scope">
                 <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
@@ -132,7 +125,6 @@
       },
       faceStatus: {
         '1': true,
-        '0': false,
         '0': false
       },
       tagNames: {

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..483a004 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -2,6 +2,7 @@
  * 组织机构接口
  */
 import request from '@/utils/request'
+import qs from 'qs'
 // 组织查询
 export function getDeptList(params) {
   return request({
@@ -66,3 +67,14 @@
     }
   })
 }
+
+export function mergeDept(params) {
+  return request({
+    url: 'dept/merge',
+    method: 'get',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/person.js b/src/api/system/person.js
new file mode 100644
index 0000000..ebd4c07
--- /dev/null
+++ b/src/api/system/person.js
@@ -0,0 +1,103 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 查询员工列表
+export function getPersonListAll(params) {
+  return request({
+    url: '/person/list',
+    method: 'get',
+    params
+  })
+}
+
+// 查询员工列表
+export function getPersonList(params) {
+  return request({
+    url: '/person/listPage',
+    method: 'get',
+    params
+  })
+}
+// 查询访客列表
+export function getVisitorList(params) {
+  return request({
+    url: '/person/visitorListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 性别
+export function getSexType(params) {
+  return request({
+    url: '/dict/code/sysSex',
+    method: 'get',
+    params
+  })
+}
+// 业务类型
+export function getDutyType(params) {
+  return request({
+    url: '/dict/code/dutyType',
+    method: 'get',
+    params
+  })
+}
+// 民族
+export function getNationType(params) {
+  return request({
+    url: '/dict/code/nationType',
+    method: 'get',
+    params
+  })
+}
+
+// 添加人员
+export function addPerson(data) {
+  return request({
+    url: 'person/add',
+    method: 'post',
+    data
+  })
+}
+// 人员详情
+export function personInfo(id) {
+  return request({
+    url: '/person/detail/' + id,
+    method: 'get'
+  })
+}
+// 修改人员
+export function updatePerson(data) {
+  return request({
+    url: 'person/update',
+    method: 'post',
+    data
+  })
+}
+// 删除人员
+export function delPerson(ids) {
+  return request({
+    url: 'person/batchDelete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function batchExportPerson(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/post.js b/src/api/system/post.js
new file mode 100644
index 0000000..1dc4e77
--- /dev/null
+++ b/src/api/system/post.js
@@ -0,0 +1,55 @@
+/**
+ * 岗位管理接口
+ */
+import request from '@/utils/request'
+// 岗位查询
+export function getPostListPage(params) {
+  return request({
+    url: 'post/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 岗位查询
+export function getPostList(params) {
+  return request({
+    url: 'post/list',
+    method: 'get',
+    params
+  })
+}
+// 岗位类型查询
+export function getPostType() {
+  return request({
+    url: 'dict/code/postType',
+    method: 'get'
+  })
+}
+
+// 添加岗位
+export function addPost(params) {
+  return request({
+    url: 'post/add',
+    method: 'post',
+    params
+  })
+}
+// 修改岗位机构
+export function updatePost(params) {
+  return request({
+    url: 'post/update',
+    method: 'post',
+    params
+  })
+}
+// 删除岗位机构
+export function delPost(id) {
+  return request({
+    url: 'post/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 6147dd7..86a5881 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearble>
+    <select-tree v-if="multiData" v-model="selected" :disabled="disabled" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder"/>
+    <el-select v-else :size="size" v-model="selected" :disabled="disabled" :placeholder="placeholder" clearble>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -21,11 +21,19 @@
     SelectTree
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 数据绑定
     value: {
       type: [Number, String],
       default: ''
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     placeholder: {
       type: String,
       default: '请选择父级'
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 7cc7b49..15fb190 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -22,6 +22,7 @@
       slot="reference"
       ref="input"
       v-model="labelModel"
+      :size="size"
       :style="`width: ${width}px`"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
@@ -40,6 +41,10 @@
     event: 'selected'
   },
   props: {
+    size: {
+      type: String,
+      default: ''
+    },
     // 接收绑定参数
     value: {
       type: String,
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 425ddbb..33df287 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -26,6 +26,39 @@
     },
     children: [
       {
+        path: '/staff',
+        name: 'Staff',
+        component: () => import('@/views/system/staff/listStaff'),
+        meta: { title: '员工管理', icon: '', permission: ['/person/list'] }
+      },
+      {
+        path: '/addStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '新增员工', icon: '', permission: ['/person/add'] }
+      },
+      {
+        path: '/updateStaff',
+        name: 'AddStaff',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '修改员工', icon: '', permission: ['/person/update'] }
+      },
+      {
+        path: '/staffInfo',
+        name: 'StaffInfo',
+        hidden: true,
+        component: () => import('@/views/system/staff/addPerson'),
+        meta: { title: '员工详情', icon: '', permission: ['/person/info'] }
+      },
+      {
+        path: '/post',
+        name: 'Post',
+        component: () => import('@/views/system/post/listPost'),
+        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
+      },
+      {
         path: '/resource',
         name: 'Resource',
         component: () => import('@/views/system/resource/listResource'),
@@ -44,12 +77,6 @@
         meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
       },
       {
-        path: '/post',
-        name: 'Post',
-        component: () => import('@/views/system/post/listPost'),
-        meta: { title: '岗位管理', icon: 'function', permission: ['/post'] }
-      },
-      {
         path: '/dept',
         name: 'Dept',
         component: () => import('@/views/system/dept/listDept'),
diff --git a/src/utils/dataAnalysis.js b/src/utils/dataAnalysis.js
new file mode 100644
index 0000000..aca96d1
--- /dev/null
+++ b/src/utils/dataAnalysis.js
@@ -0,0 +1,24 @@
+// 数据处理功能
+// 从身份证号提取生日
+export function getBirthdayByIdNO(IdNO) {
+  let birthday = ''
+  if (IdNO.length === 18) {
+    birthday = IdNO.substr(6, 8)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else if (IdNO.length === 15) {
+    birthday = '19' + IdNO.substr(6, 6)
+    return birthday.replace(/(.{4})(.{2})/, '$1-$2-')
+  } else {
+    return ''
+  }
+}
+// 从身份证号提取性别,1表示男，2表示女
+export function getSexByIdNO(IdNO) {
+  if (IdNO.length === 18) {
+    return IdNO.charAt(16) % 2 === 0 ? '2' : '1'
+  } else if (IdNO.length === 15) {
+    return IdNO.charAt(14) % 2 === 0 ? '2' : '1'
+  } else {
+    return ''
+  }
+}
diff --git a/src/views/maps/weatherTopic.vue b/src/views/maps/weatherTopic.vue
index 9471a8b..dafc0c6 100644
--- a/src/views/maps/weatherTopic.vue
+++ b/src/views/maps/weatherTopic.vue
@@ -81,7 +81,8 @@
         '小雨': 'static/images/map/weather/weather-xiaoyu.png',
         '雨': 'static/images/map/weather/weather-dayu.png',
         '小雪': 'static/images/map/weather/weather-xiaoxue.png',
-        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png'
+        '雨夹雪': 'static/images/map/weather/weather-yujiaxue.png',
+        '扬沙': 'static/images/map/weather/weather-yangsha.png'
       }, // 天气与图片地址
       weatherLayer: null, // 天气图层
       disasterLayer: null, // 气象灾害图层
@@ -131,7 +132,7 @@
             name: '天气',
             position: [item.lng, item.lat, 5000],
             style: {
-              image: this.weathers[item.tqxx12],
+              image: this.weathers[item.tqxx24],
               pixelOffsetX: -15,
               pixelOffsetY: -15,
               scale: 1,
@@ -152,7 +153,7 @@
             }
           })
           var html = ` <div class="popup-win"><span class="title">${item.name}</span><br/>
-                        <div style="color:#FFB861">天气：${item.tqxx12}</div>
+                        <div style="color:#FFB861">天气：${item.tqxx24}</div>
                         <div style="color:#63AEFF">温度：${item.wd}~${item.wg}℃</div>
                         </div>`
           graphic.bindTooltip(html, { anchor: [0, -20] }).openTooltip()
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 8c20b81..1e3884a 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -10,6 +10,7 @@
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
         <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button v-if="hasPerm('/dept/merge')" size="small" icon="el-icon-copy-document" @click="merge">合并部门</el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
@@ -23,6 +24,7 @@
 
     <!--编辑资源的对话框-->
     <edit-dept v-show="dialogFormVisible" ref="editdept" @watchChild="fetchData"/>
+    <merge-dept ref="mergedept" @watchChild="fetchData"/>
   </app-container>
 </template>
 
@@ -32,10 +34,12 @@
 import editDept from '@/views/system/dept/editdept'
 import { getDeptList, delDept } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import MergeDept from './mergeDept'
 
 export default {
   name: 'ListDept',
   components: {
+    MergeDept,
     treeTable,
     editDept
   },
@@ -47,7 +51,8 @@
       columns: [
         {
           text: '组织机构简称',
-          value: 'simplename'
+          value: 'simplename',
+          align: 'left'
         },
         {
           text: '组织机构全称',
@@ -108,6 +113,10 @@
         })
       })
     },
+    // 打开合并部门弹窗
+    merge() {
+      this.$refs.mergedept.initDialog()
+    },
     search() {
       this.fetchData()
     },
diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue
new file mode 100644
index 0000000..917b259
--- /dev/null
+++ b/src/views/system/dept/mergeDept.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="合并部门" width="60%" append-to-body>
+    <div>
+      <el-row>
+        <el-col :span="12">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并的部门:</div>
+            <el-input :value="oldDeptNames" size="small" placeholder="至少选择1个,最多5个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree1"
+              :data="deptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="filter-tree"
+              @check-change="oldDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="11">
+          <div style="margin-bottom:20px;">
+            <div style="margin-bottom:20px; font-size: 16px">请选择要合并到的部门:</div>
+            <el-input :value="newDept?newDept.name:''" size="small" placeholder="只能选择1个"/>
+          </div>
+          <el-scrollbar class="deptScroll">
+            <el-tree
+              v-loading = "treeLoading"
+              ref="tree2"
+              :data="newDeptTree"
+              :props="defaultProps"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              node-key="id"
+              show-checkbox
+              class="single-tree"
+              @check-change="newDeptCheckChange"
+            />
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">合并部门</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList, mergeDept } from '@/api/system/dept'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'MergeDept',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: true, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      deptForm: {
+        oldDeptIds: [],
+        newDeptId: ''
+      }, // 表单
+      oldDepts: [],
+      newDept: null,
+      deptTree: null,
+      newDeptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLoading: false,
+      btnLoading: false // 保存按钮的加载中状态
+    }
+  },
+  computed: {
+    oldDeptNames() {
+      const list = this.oldDepts.map(item => item.name)
+      return list.join(', ')
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function() {
+      this.dialogFormVisible = true
+      this.fetchDeptTree()
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        const deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = deptTree
+        this.newDeptTree = JSON.parse(JSON.stringify(deptTree)) // 复制出一棵树
+        this.deptTree[0].disabled = true
+        this.treeLoading = false
+      })
+    },
+    oldDeptCheckChange(data, checked) {
+      if (checked) {
+        this.oldDepts.push(data)
+      } else {
+        const index = this.oldDepts.findIndex(item => item.id === data.id)
+        this.oldDepts.splice(index, 1)
+      }
+    },
+    newDeptCheckChange(data, checked) {
+      if (checked) {
+        var labvalojb = data // 暂存选中节点
+        this.newDept = data
+        this.$refs.tree2.setCheckedKeys([]) // 删除所有选中节点
+        this.$refs.tree2.setCheckedNodes([labvalojb]) // 选中已选中节点
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deptForm = {
+        oldDeptIds: [],
+        newDeptId: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      // 先校验
+      if (this.validate()) {
+        this.deptForm = {
+          oldDeptIds: this.oldDepts.map(item => item.id),
+          newDeptId: this.newDept.id
+        }
+        this.$confirm('合并部门后可能会影响到角色权限，部分需要重新配置，是否确认合并？', '确认信息', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '合并',
+          cancelButtonText: '放弃'
+        })
+          .then(() => {
+            mergeDept(this.deptForm).then(response => {
+              if (response.code === 200) {
+                this.$confirm('新增成功，是否继续新增?', '提示', {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'info'
+                }).then(() => {
+                  this.btnLoading = false
+                  this.resetForm()
+                  this.$nextTick(() => {
+                    this.$refs['dataForm'].clearValidate()
+                  })
+                }).catch(() => {
+                  this.$emit('watchChild')
+                  this.dialogFormVisible = false
+                })
+              }
+            }).catch(_ => { // 异常情况，loading置为false
+              this.btnLoading = false
+            })
+          })
+          .catch(action => {
+          })
+      }
+    },
+    validate() {
+      if (this.oldDepts.length === 0) {
+        this.$message.warning('请选择待合并部门')
+        return false
+      }
+      if (this.oldDepts.length > 5) {
+        this.$message.warning('一次合并部门不能超过5个')
+        return false
+      }
+      if (this.newDept === null) {
+        this.$message.warning('请选择要合并到的部门')
+        return false
+      }
+      const index = this.oldDepts.findIndex(item => item.id === this.newDept.id)
+      if (index > -1) {
+        this.$message.warning('两边部门不能重复')
+        return false
+      }
+      return true
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-scrollbar{
+    height: 330px;
+  }
+  .el-select{
+    width: 100%;
+  }
+  .single-tree{
+    el-checkbox__inner{
+      border-radius: 10px;
+    }
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
+</style>
diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue
new file mode 100644
index 0000000..9a07109
--- /dev/null
+++ b/src/views/system/post/editPost.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="postForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="岗位名称" prop="name">
+            <el-input v-model.trim="postForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位类别" prop="type">
+            <el-select v-model="postForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in postTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="岗位职责" prop="duty">
+            <el-input v-model.trim="postForm.duty" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getPostType, addPost, updatePost } from '@/api/system/post'
+
+export default {
+  name: 'EditPost',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isEditMode: true,
+      postForm: {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }, // 表单
+      postTypeList: [], // 岗位树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      btnLoading: false, // 保存按钮的加载中状态
+      rules: {
+        name: [{ required: true, message: '岗位名称不能为空', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '岗位类别不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPostType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.btnLoading = false
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.postForm = {
+          id: row.id, // id
+          name: row.name, // 岗位名称
+          type: row.type, // 岗位类别
+          duty: row.duty // 岗位职责
+        }
+        this.isEditMode = true
+      }
+    },
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.postForm = {
+        id: '', // id
+        name: '', // 岗位名称
+        type: '', // 岗位类别
+        duty: '' // 岗位职责
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.postForm)
+        if (valid) {
+          this.btnLoading = true
+          addPost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => { // 选是
+                this.resetForm()
+                this.btnLoading = false
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => { // 选否,关闭窗口，并刷新页面
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          updatePost(this.postForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$refs['dataForm'].clearValidate()
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          }).catch(_ => { // 异常情况，loading置为false
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue
index f6a7328..172e32f 100644
--- a/src/views/system/post/listPost.vue
+++ b/src/views/system/post/listPost.vue
@@ -3,7 +3,16 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="岗位名称/编号" clearable/>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="岗位名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" size="small" placeholder="岗位类型" clearable>
+          <el-option
+            v-for="item in postTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -25,17 +34,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <edit-area v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
+    <edit-post v-show="dialogFormVisible" ref="editpost" @watchChild="fetchData"/>
   </app-container>
 </template>
 
 <script>
-import { getAreaListPage, delArea } from '@/api/system/area'
-// import EditArea from './editArea'
+import { getPostType, getPostListPage, delPost } from '@/api/system/post'
+import EditPost from './editPost'
 
 export default {
   name: 'ListPost',
-  // components: { EditArea },
+  components: { EditPost },
   data() {
     return {
       listQuery: {
@@ -52,28 +61,18 @@
           align: 'center'
         },
         {
-          text: '岗位编码',
-          value: 'id',
+          text: '岗位类别',
+          value: 'typeName',
           align: 'center'
         },
         {
-          text: '岗位级别',
-          value: 'levelName',
-          align: 'center'
-        },
-        {
-          text: '所属区域',
-          value: 'pName',
-          align: 'center'
-        },
-        {
-          text: '区域排序',
-          value: 'num',
-          width: 80,
+          text: '岗位职责',
+          value: 'duty',
           align: 'center'
         }
       ], // 显示列
       list: [], // 列表数据
+      postTypeList: [], // 岗位类别里诶啊哦
       total: 0, // 数据总数
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -82,37 +81,32 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/area/update') || this.hasPerm('/area/delete')
+      return this.hasPerm('/post/update') || this.hasPerm('/post/delete')
     }
   },
   created() {
+    this.fetchPostType()
     this.fetchData()// 获取数据
   },
   activated() {
-    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    // 打开详情对话框
-    detail(row) {
-      this.$refs.detailwell.initDialog(true, row)
-    },
-
-    // 新增区域
+    // 新增岗位
     add() {
       this.dialogFormVisible = true
-      this.$refs.editarea.initDialog('create', this.dialogFormVisible)
+      this.$refs.editpost.initDialog('create', this.dialogFormVisible)
     },
-    // 编辑区域信息
+    // 编辑岗位信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.editarea.initDialog('update', this.dialogFormVisible, row)
+      this.$refs.editpost.initDialog('update', this.dialogFormVisible, row)
     },
-    // 删除区域
+    // 删除岗位
     del(row) {
       this.$confirm(
-        '确定要删除区域吗？',
+        '确定要删除岗位吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -120,7 +114,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delArea(row.id).then(response => {
+        delPost(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
@@ -132,13 +126,19 @@
     search() {
       this.fetchData(false)
     },
-    // 获取区域数据
+    // 获取岗位类型
+    fetchPostType() {
+      getPostType().then(response => {
+        this.postTypeList = response.data
+      })
+    },
+    // 获取岗位数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaListPage(this.listQuery).then(response => {
+      getPostListPage(this.listQuery).then(response => {
         if (response.code === 200) {
           this.list = response.data.rows
           this.total = parseInt(response.data.total)
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 1d33eb2..ed9f253 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -63,7 +63,8 @@
       columns: [
         {
           text: '角色名称',
-          value: 'name'
+          value: 'name',
+          align: 'left'
         },
         {
           text: '所在组织机构',
diff --git a/src/views/system/staff/addPerson.vue b/src/views/system/staff/addPerson.vue
new file mode 100644
index 0000000..18868d1
--- /dev/null
+++ b/src/views/system/staff/addPerson.vue
@@ -0,0 +1,715 @@
+<template>
+  <app-container>
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" size="small" class="main-form" label-width="120px">
+      <el-collapse v-model="activeNames">
+        <el-collapse-item title="基本信息" name="1">
+          <el-row>
+            <el-col :span="16">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="员工编号" prop="personCode">
+                    <el-input v-model.trim="personForm.personCode" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="身份证号" prop="idCardNo">
+                    <el-input v-model.trim="personForm.idCardNo" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="姓名" prop="name">
+                    <el-input v-model.trim="personForm.name" :disabled="dialogStatus!='create'" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item :disabled="dialogStatus!='create'" label="出生日期" prop="birthday">
+                    <el-date-picker
+                      v-model="personForm.birthday"
+                      :disabled="dialogStatus!='create'"
+                      type="date"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择日期"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="性别" prop="sex">
+                    <el-select v-model="personForm.sex" :disabled="dialogStatus=='info'" placeholder="性别" clearable>
+                      <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="民族" prop="nation">
+                    <el-select v-model="personForm.nation" :disabled="dialogStatus=='info'" placeholder="民族" clearable>
+                      <el-option v-for="item in nationList" :key="item.value" :label="item.name" :value="item.value"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="personType=='1'" :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="组织机构" prop="deptid">
+                    <dept-select v-model="personForm.deptid" :disabled="dialogStatus=='info'" :need-top="false" placeholder="单位/部门"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="岗位" prop="duty">
+                    <el-select v-model="personForm.duty" :disabled="dialogStatus=='info'" placeholder="岗位" clearable>
+                      <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="住址" prop="address">
+                    <el-input v-model.trim="personForm.ext.address" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-form-item label="备注" prop="remarks">
+                    <el-input v-model.trim="personForm.remarks" :disabled="dialogStatus=='info'" type="text" placeholder=""/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+            <el-col :span="6" :offset="2">
+              <el-row>
+                <div class="avatar">
+                  <el-image
+                    :src="photo!==''?photo:defaultPhoto"
+                    fit="cover"
+                    style="width: 130px; height: 175px"/>
+                </div>
+              </el-row>
+              <el-row v-if="dialogStatus!='info'">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-success="handleSuccess"
+                  :http-request="uploadFile"
+                  :show-file-list="false"
+                  class="avatar-uploader"
+                  action="string"
+                  accept=".jpg,.jpeg,.png">
+                  <el-button type="primary">点击上传照片</el-button>
+                </el-upload>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+        <el-collapse-item title="工作经历" name="2">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('experience')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="workExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>-->
+                <span v-else><el-input v-model="scope.row.startdate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <!--<span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择开始日期" size="small"/></span>-->
+                <span v-else><el-input v-model="scope.row.enddate" size="small" placeholder="时间格式: yyyy-MM-dd"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enterprise }}</span>
+                <span v-else><el-input v-model="scope.row.enterprise" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="职务" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.duty }}</span>
+                <span v-else><el-input v-model="scope.row.duty" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="workExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="教育经历" name="3">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" type="primary" icon="el-icon-plus" plain @click="addLine('study')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="studyExperience" style="width: 100%" border>
+            <el-table-column label="开始时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.startdate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.startdate" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择开始日期"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" width="200">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.enddate }}</span>
+                <span v-else><el-date-picker v-model="scope.row.enddate" value-format="yyyy-MM-dd" type="date" placeholder="选择结束日期" size="small"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="学校" width="280">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.school }}</span>
+                <span v-else><el-input v-model="scope.row.school" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="类别" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.major }}</span>
+                <span v-else><el-input v-model="scope.row.major" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.notes }}</span>
+                <span v-else><el-input v-model="scope.row.notes" size="small" placeholder="非必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="studyExperience.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="社会关系" name="4">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('social')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="socialRelation" style="width: 100%" border>
+            <el-table-column label="关系" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.relation }}</span>
+                <span v-else><el-input v-model="scope.row.relation" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="姓名" width="180">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="出生年月" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.birth }}</span>
+                <span v-else><el-date-picker v-model="scope.row.birth" value-format="yyyy-MM" type="month" size="small" placeholder="选择出生年月"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="政治面貌">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.politicalStatus }}</span>
+                <span v-else><el-input v-model="scope.row.politicalStatus" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工作单位及职务">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.work }}</span>
+                <span v-else><el-input v-model="scope.row.work" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="socialRelation.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item title="证书信息" name="5">
+          <el-row v-if="dialogStatus!='info'" style="margin-bottom: 10px">
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="addLine('certificate')">新增一行</el-button>
+            </el-col>
+          </el-row>
+          <el-table :data="certificateInfo" style="width: 100%" border>
+            <el-table-column label="证书名称">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.name }}</span>
+                <span v-else><el-input v-model="scope.row.name" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证单位">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.unit }}</span>
+                <span v-else><el-input v-model="scope.row.unit" size="small" placeholder="必填"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颁证时间" width="190">
+              <template slot-scope="scope">
+                <span v-if="dialogStatus=='info'">{{ scope.row.date }}</span>
+                <span v-else><el-date-picker v-model="scope.row.date" type="month" value-format="yyyy-MM" size="small" placeholder="选择颁证时间"/></span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="dialogStatus!='info'" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button icon="el-icon-delete" size="small" type="danger" plain @click="certificateInfo.splice(scope.$index,1)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div v-if="dialogStatus!='info'" style="height: 120px;">
+      <el-row type="flex" justify="center">
+        <el-col :span="15" style="text-align:center">
+          <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { Uploadimg } from '@/api/common'
+import { addPerson, updatePerson, personInfo, getSexType, getNationType } from '@/api/system/person'
+import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
+import { getPostList } from '@/api/system/post'
+
+export default {
+  name: 'AddPerson',
+  components: { DeptSelect },
+  data() {
+    const validateIDCard = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+          callback(new Error('请输入合法的身份证号'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('身份证号不能为空'))
+      }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,info
+      isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
+      personType: '1', // 人员角色，1为员工，0为访客
+      canSave: true, // 是否可以点击保存，当点击后该值置为false，直到后台返回结果再置为true
+      isSave: false, // 当点击保存按钮后，并返回200结果，置为true，表示已经保存
+      personForm: {
+        id: '', // 人员id
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: ''// 住址
+        }
+      }, // 表单
+      workExperience: [{
+        enterprise: '',
+        duty: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 工作经历
+      studyExperience: [{
+        school: '',
+        major: '',
+        startdate: '',
+        enddate: '',
+        notes: ''
+      }], // 教育经历
+      socialRelation: [{
+        name: '', // 姓名
+        relation: '', // 关系
+        birth: '', // 生日
+        work: '', // 工作单位及职务
+        politicalStatus: '' // 政治面貌
+      }], // 社会关系
+      certificateInfo: [{
+        name: '',
+        unit: '',
+        date: ''
+      }], // 证书信息
+      photo: '', // 图片路径
+      defaultPhoto: require('@/assets/global_images/photo.png'), // 默认图片路径
+      fileList: [],
+      imageList: [],
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      nationList: [], // 民族列表
+      rules: {
+        personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
+        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
+        duty: [{ required: true, message: '岗位必选', trigger: 'change' }],
+        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+      },
+      dialogVisible: false,
+      labelPosition: 'right',
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true,
+      formLoading: false,
+      activeNames: ['1', '2', '3', '4', '5'] // 折叠面板展开index
+    }
+  },
+  watch: {
+    'personForm.idCardNo': function(val) {
+      this.personForm.birthday = getBirthdayByIdNO(val)
+      this.personForm.sex = getSexByIdNO(val)
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchNationType() // 获取民族列表
+    if (this.$route.query && this.$route.query.type) {
+      const type = this.$route.query.type
+      this.dialogStatus = type
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      if (type === 'create') {
+        this.isEditMode = false // 不是编辑页面
+      } else if (type === 'update') {
+        this.isEditMode = true // 是编辑页面
+        this.fetchData(this.$route.query.id)
+      } else if (type === 'info') {
+        this.isEditMode = false
+        this.fetchData(this.$route.query.id)
+      }
+    }
+  },
+  activated() {
+    if (this.$route.query && this.$route.query.type) {
+      this.isSave = false // isSave置为false,表示没有点击过保存按钮
+      const type = this.$route.query.type
+      if (type === 'create') {
+        this.isEditMode = false
+        this.canSave = true
+      } else if (type === 'update') {
+        this.isEditMode = true
+        this.canSave = true
+        this.fetchData(this.$route.query.id)
+      }
+    }
+    // if (this.$route.query.personType) {
+    //   this.personType = this.$route.query.personType
+    //   this.personForm.personType = this.$route.query.personType
+    // }
+  },
+  methods: {
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    fetchData(id) {
+      this.formLoading = true
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      personInfo(id).then(response => {
+        const personForm = response.data
+        this.personForm = {
+          id: personForm.id, // 人员id
+          personCode: personForm.personCode, // 人员编号
+          idCardNo: personForm.idCardNo, // 身份证号
+          name: personForm.name, // 姓名
+          deptid: personForm.deptid, // 单位/部门
+          remarks: personForm.remarks, // 备注
+          duty: personForm.duty, // 岗位
+          sex: personForm.sex, // 性别
+          personType: personForm.personType, // 人员类型
+          birthday: personForm.birthday, // 出生日期
+          nation: personForm.nation, // 民族
+          photo: personForm.photo,
+          ext: {
+            address: personForm.ext.address// 住址
+          }
+        }
+        // 解析教育、工作经历，社会关系，证书信息
+        this.workExperience = JSON.parse(personForm.ext.workExperience)
+        this.studyExperience = JSON.parse(personForm.ext.studyExperience)
+        this.socialRelation = JSON.parse(personForm.ext.socialRelation)
+        this.certificateInfo = JSON.parse(personForm.ext.certificateInfo)
+        // 解析照片
+        if (personForm.photo !== '') {
+          this.photo = base_url + personForm.photo
+        }
+        this.formLoading = false
+      })
+    },
+    // 点击新增行
+    addLine(type) {
+      if (type === 'experience') {
+        this.workExperience.push({
+          enterprise: '',
+          duty: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        })
+      } else if (type === 'study') {
+        this.studyExperience.push({
+          school: '',
+          major: '',
+          startdate: '',
+          enddate: '',
+          notes: ''
+        }) // 教育经历
+      } else if (type === 'social') {
+        this.socialRelation.push({
+          name: '', // 姓名
+          relation: '', // 关系
+          birth: '', // 生日
+          work: '', // 工作单位及职务
+          politicalStatus: '' // 政治面貌
+        }) // 社会关系
+      } else if (type === 'certificate') {
+        this.certificateInfo.push({
+          name: '',
+          unit: '',
+          date: ''
+        })
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.personForm = {
+        idCardNo: '', // 身份证号
+        name: '', // 姓名
+        deptid: '', // 单位/部门
+        remarks: '', // 备注
+        duty: '', // 岗位
+        sex: '', // 性别
+        personType: '1', // 人员类型
+        birthday: '', // 出生日期
+        nation: '', // 民族
+        photo: '',
+        ext: {
+          address: '', // 住址
+          workExperience: '',
+          studyExperience: ''
+
+        }
+      }
+      this.workExperience = [{ enterprise: '', duty: '', startdate: '', enddate: '', notes: '' }]
+      this.studyExperience = [{ school: '', major: '', startdate: '', enddate: '', notes: '' }]
+      this.socialRelation = [{ name: '', relation: '', birth: '', work: '', politicalStatus: '' }]
+      this.certificateInfo = [{ name: '', unit: '', date: '' }] // 证书信息
+      this.photo = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.personForm.photo = this.photo.substring(index)
+        } else if (this.photo.startsWith('data:image')) { // 读卡器读的base64图片
+          this.personForm.photo = this.photo
+        }
+      }
+      // 遍历教育、工作经历，社会关系，证书信息
+      if (this.workExperience) {
+        // 过滤空的
+        this.workExperience = this.workExperience.filter(item => item.startdate !== '' && item.enterprice !== '')
+        this.personForm.ext.workExperience = JSON.stringify(this.workExperience)
+      }
+      if (this.studyExperience) {
+        // 过滤空的
+        this.studyExperience = this.studyExperience.filter(item => item.startdate !== '' && item.school !== '')
+        this.personForm.ext.studyExperience = JSON.stringify(this.studyExperience)
+      }
+      if (this.socialRelation) {
+        // 过滤空的
+        this.socialRelation = this.socialRelation.filter(item => item.name !== '' && item.relation !== '')
+        this.personForm.ext.socialRelation = JSON.stringify(this.socialRelation)
+      }
+      if (this.certificateInfo) {
+        // 过滤空的
+        this.certificateInfo = this.certificateInfo.filter(item => item.name !== '' && item.unit !== '')
+        this.personForm.ext.certificateInfo = JSON.stringify(this.certificateInfo)
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 如果新增页面未保存，则调用add
+          // 如果是新增页面已经保存，则调用update
+          // 其他情况均为修改页面
+          if (this.isSave === false && this.isEditMode === false) {
+            addPerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                // 保存用户id
+                this.personForm.id = response.data.id
+                this.personForm.personCode = response.data.code
+                this.isSave = true
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+              this.canSave = true
+            }).catch(() => {
+              this.canSave = true
+            })
+          } else {
+            updatePerson(this.personForm).then(response => {
+              if (response.code === 200) {
+                this.$message.success('保存成功!')
+                this.$store.state.tagsView.visitedViews.splice(this.$store.state.tagsView.visitedViews.findIndex(item => item.path === this.$route.path), 1)
+                this.$router.go(-1)
+              }
+            })
+          }
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = base_url + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      const base_url = this.baseConfig.baseUrl + 'static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 获取民族
+    fetchNationType() {
+      getNationType().then(response => {
+        this.nationList = response.data
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" >
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+  .main-form{
+    margin: 0px 0px;
+    padding: 30px;
+    overflow: auto;
+  }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width:100%;
+  }
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+  .line{
+    width: 50px;
+    margin-left: 5px;
+  }
+  .hide .el-upload-–picture-card{
+    display: none;
+  }
+  .imgBox{
+    width: 100%;
+    text-align: center;
+  }
+  .avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 238px;
+    line-height: 238px;
+    text-align: center;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  .id-card-btn{
+    width:126px;
+    margin-left: 12px;
+    margin-top: 20px;
+   }
+</style>
diff --git a/src/views/system/staff/listStaff.vue b/src/views/system/staff/listStaff.vue
new file mode 100644
index 0000000..cedea7d
--- /dev/null
+++ b/src/views/system/staff/listStaff.vue
@@ -0,0 +1,269 @@
+<!--员工管理-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="姓名/身份证号" clearable/>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" :need-top="false" size="small" placeholder="组织机构"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.sex" placeholder="性别" size="small" clearable>
+          <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.duty" placeholder="岗位" size="small" clearable>
+          <el-option v-for="item in dutyList" :key="item.id" :label="item.name" :value="item.name"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage" @selectionChange="handleSelectionChange">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/records/exportStaff')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button v-if="hasPerm('/person/batchDelete')" class="edit_btn" size="small" @click="del">删除</el-button>
+        <el-button v-if="hasPerm('/person/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+      </template>
+      <template slot="preColumns">
+        <el-table-column v-if="hasPerm('/person/batchDelete')" align="center" type="selection" width="55"/>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/person/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/person/info')" type="text" @click="info(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { getPersonList, getSexType, delPerson, batchExportPerson } from '@/api/system/person'
+import { getPostList } from '@/api/system/post'
+export default {
+  name: 'ListStaff',
+  components: { DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（姓名/身份证号)
+        deptid: '', // 部门
+        sex: '', // 性别
+        duty: '', // 岗位
+        personType: '1', // 人员类型
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '员工编号',
+          value: 'personCode',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '性别',
+          value: 'sexName',
+          align: 'center'
+        },
+        {
+          text: '身份证号',
+          value: 'idCardNo',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '组织机构',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '岗位',
+          value: 'duty',
+          align: 'center'
+        },
+        {
+          text: '备注',
+          value: 'remarks',
+          width: 140,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      sexList: [], // 性别列表
+      dutyList: [], // 岗位列表
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  mounted() {
+    this.fetchSexType()// 获取性别列表
+    this.fetchDutyType() // 获取岗位列表
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增员工
+    add() {
+      this.$router.push({ path: '/addStaff', query: { type: 'create' }})
+    },
+    // 编辑员工信息
+    edit(row) {
+      this.$router.push({ path: '/updateStaff', query: { type: 'update', id: row.id }})
+    },
+    // 详情
+    info(row) {
+      this.$router.push({ path: '/staffInfo', query: { type: 'info', id: row.id }})
+    },
+    // 删除人员
+    del() {
+      if (this.checkSelection()) {
+        const staffIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          staffIds.push(value.id)
+        })
+        this.$confirm(
+          '确定要删除所选员工吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delPerson(staffIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPerson(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `员工列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getPersonList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取性别
+    fetchSexType() {
+      getSexType().then(response => {
+        this.sexList = response.data
+      })
+    },
+    // 获取岗位
+    fetchDutyType() {
+      getPostList().then(response => {
+        this.dutyList = response.data
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      console.log('selectionChange')
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index c5df2f1..8cfb01c 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -62,13 +62,6 @@
             </el-table-column>
           </template>
           <template slot="columns">
-            <!-- 人脸是否注册 -->
-<!--            <el-table-column label="人脸" width="80" align="center" >-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-tag v-show="scope.row.attr1" size="medium">{{ faceReged[scope.row.attr1] }}</el-tag>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-            <!--冻结状态-->
             <el-table-column label="状态" width="80" align="center" >
               <template slot-scope="scope">
                 <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
@@ -132,7 +125,6 @@
       },
       faceStatus: {
         '1': true,
-        '0': false,
         '0': false
       },
       tagNames: {
diff --git a/static/images/map/weather/weather-yangsha.png b/static/images/map/weather/weather-yangsha.png
new file mode 100644
index 0000000..5bd989c
--- /dev/null
+++ b/static/images/map/weather/weather-yangsha.png
Binary files differ