diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/attendance/regular.vue b/src/views/attendance/regular.vue
new file mode 100644
index 0000000..0fac7f8
--- /dev/null
+++ b/src/views/attendance/regular.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="regularForm" label-width="180px">
+      <el-divider content-position="left">工作日设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;margin-bottom: 5px">
+          <el-form-item prop="workDayArr">
+            <el-checkbox-group v-model="regularForm.workDayArr" size="medium">
+              <el-checkbox-button v-for="week in weeks" :label="week.value" :key="week.value" :value="week.value">{{ week.label }}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left" >考勤时间设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;">
+          <el-col :span="6">
+            <el-form-item label="上班时间" prop="workTimeBegin">
+              <el-time-picker
+                v-model="regularForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) ? (regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="regularForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) ? (regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="下班时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="2" style="margin-bottom: 5px">
+          <el-col :span="6">
+            <el-form-item label="休息开始时间" prop="breakTimeBegin">
+              <el-time-picker
+                v-model="regularForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${regularForm.workTimeBegin ? regularForm.workTimeBegin+':00' : '00:00:00'} -${regularForm.breakTimeEnd ? regularForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="regularForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${regularForm.breakTimeBegin ? regularForm.breakTimeBegin+':00' : '00:00:00'} -${regularForm.workTimeEnd ? regularForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息结束时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left">迟到规则设置</el-divider>
+      <el-row>
+        <el-col :span="6" :offset="2" style="margin-top: 5px;">
+          <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
+            <el-input v-model.number.trim="regularForm.delayBegin1" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 30px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="2">
+          <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
+            <el-input v-model.number.trim="regularForm.delayBegin2" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 30px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="8" style="margin-top: 20px;">
+          <el-button type="primary" size="medium" @click="cancel">放弃修改</el-button>
+          <el-button type="primary" size="medium" @click="save">保存</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getRegular, updateRegular } from '@/api/attendance'
+
+export default {
+  name: 'Regular',
+  data() {
+    return {
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      regularForm: {
+        workDayArr: [],
+        workDay: '',
+        workTimeBegin: '',
+        workTimeEnd: '',
+        breakTimeBegin: '',
+        breakTimeEnd: '',
+        delayBegin1: '',
+        delayBegin2: ''
+      },
+      rules: {
+        workDayArr: [{ required: true, type: 'array', min: 1, message: '请选择工作日', trigger: ['blur', 'change'] }],
+        workTimeBegin: [{ type: 'string', required: true, message: '上班时间必填', trigger: ['blur', 'change'] }],
+        workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
+        breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
+        breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
+        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
+        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.regularForm.workDay = this.regularForm.workDayArr.join(',')
+          updateRegular(this.regularForm).then(response => {
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getRegular().then(response => {
+        // 处理工作日数据，转换为数组
+        this.regularForm.workDayArr = response.data.workDay.split(',')
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/attendance/regular.vue b/src/views/attendance/regular.vue
new file mode 100644
index 0000000..0fac7f8
--- /dev/null
+++ b/src/views/attendance/regular.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="regularForm" label-width="180px">
+      <el-divider content-position="left">工作日设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;margin-bottom: 5px">
+          <el-form-item prop="workDayArr">
+            <el-checkbox-group v-model="regularForm.workDayArr" size="medium">
+              <el-checkbox-button v-for="week in weeks" :label="week.value" :key="week.value" :value="week.value">{{ week.label }}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left" >考勤时间设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;">
+          <el-col :span="6">
+            <el-form-item label="上班时间" prop="workTimeBegin">
+              <el-time-picker
+                v-model="regularForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) ? (regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="regularForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) ? (regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="下班时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="2" style="margin-bottom: 5px">
+          <el-col :span="6">
+            <el-form-item label="休息开始时间" prop="breakTimeBegin">
+              <el-time-picker
+                v-model="regularForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${regularForm.workTimeBegin ? regularForm.workTimeBegin+':00' : '00:00:00'} -${regularForm.breakTimeEnd ? regularForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="regularForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${regularForm.breakTimeBegin ? regularForm.breakTimeBegin+':00' : '00:00:00'} -${regularForm.workTimeEnd ? regularForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息结束时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left">迟到规则设置</el-divider>
+      <el-row>
+        <el-col :span="6" :offset="2" style="margin-top: 5px;">
+          <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
+            <el-input v-model.number.trim="regularForm.delayBegin1" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 30px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="2">
+          <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
+            <el-input v-model.number.trim="regularForm.delayBegin2" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 30px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="8" style="margin-top: 20px;">
+          <el-button type="primary" size="medium" @click="cancel">放弃修改</el-button>
+          <el-button type="primary" size="medium" @click="save">保存</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getRegular, updateRegular } from '@/api/attendance'
+
+export default {
+  name: 'Regular',
+  data() {
+    return {
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      regularForm: {
+        workDayArr: [],
+        workDay: '',
+        workTimeBegin: '',
+        workTimeEnd: '',
+        breakTimeBegin: '',
+        breakTimeEnd: '',
+        delayBegin1: '',
+        delayBegin2: ''
+      },
+      rules: {
+        workDayArr: [{ required: true, type: 'array', min: 1, message: '请选择工作日', trigger: ['blur', 'change'] }],
+        workTimeBegin: [{ type: 'string', required: true, message: '上班时间必填', trigger: ['blur', 'change'] }],
+        workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
+        breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
+        breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
+        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
+        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.regularForm.workDay = this.regularForm.workDayArr.join(',')
+          updateRegular(this.regularForm).then(response => {
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getRegular().then(response => {
+        // 处理工作日数据，转换为数组
+        this.regularForm.workDayArr = response.data.workDay.split(',')
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/specialDay.vue b/src/views/attendance/specialDay.vue
new file mode 100644
index 0000000..5ab4934
--- /dev/null
+++ b/src/views/attendance/specialDay.vue
@@ -0,0 +1,260 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="名称" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--批量导入-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button class="edit_btn" size="small" @click="downloadTemplate">模板下载</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border>
+        <!--批量选择勾选框列-->
+        <el-table-column align="center" type="selection" width="55"/>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-special-day ref="editSpecialDay" @watchChild="fetchData"/>
+  </div>
+</template>
+<script>
+
+import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+
+export default {
+  name: 'SpecialDay',
+  components: { EditSpecialDay },
+  data() {
+    return {
+      listQuery: {
+        name: '', // 节假日名称
+        offset: 1,
+        limit: 20,
+        sort: 'beginDate',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '开始日期',
+          value: 'beginDate',
+          align: 'center'
+        },
+        {
+          text: '结束日期',
+          value: 'endDate',
+          align: 'center'
+        },
+        {
+          text: '是否需要考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      total: 0, // 数据总数
+      fileList: [], // 上传文件列表
+      listLoading: false // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑特殊考勤日
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('create', this.dialogFormVisible)
+    },
+    // 删除
+    del(row) {
+      const params = {
+        irId: row.irId
+      }
+      this.$confirm(
+        '确定要删除该特殊考勤日条目？',
+        '确认操作',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delSpecialDay(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      // this.listLoading = false
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getSpecialDayList(this.listQuery).then(response => {
+      //   if (response.code === 200) {
+      //     this.list = response.data.rows
+      //     this.total = parseInt(response.data.total)
+      //   } else {
+      //     this.$message.error(response.message)
+      //   }
+      //   this.listLoading = false
+      // })
+    },
+    downloadTemplate() {
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportSpecialDay(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+      this.fileList = []
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/attendance/regular.vue b/src/views/attendance/regular.vue
new file mode 100644
index 0000000..0fac7f8
--- /dev/null
+++ b/src/views/attendance/regular.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="regularForm" label-width="180px">
+      <el-divider content-position="left">工作日设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;margin-bottom: 5px">
+          <el-form-item prop="workDayArr">
+            <el-checkbox-group v-model="regularForm.workDayArr" size="medium">
+              <el-checkbox-button v-for="week in weeks" :label="week.value" :key="week.value" :value="week.value">{{ week.label }}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left" >考勤时间设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;">
+          <el-col :span="6">
+            <el-form-item label="上班时间" prop="workTimeBegin">
+              <el-time-picker
+                v-model="regularForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) ? (regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="regularForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) ? (regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="下班时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="2" style="margin-bottom: 5px">
+          <el-col :span="6">
+            <el-form-item label="休息开始时间" prop="breakTimeBegin">
+              <el-time-picker
+                v-model="regularForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${regularForm.workTimeBegin ? regularForm.workTimeBegin+':00' : '00:00:00'} -${regularForm.breakTimeEnd ? regularForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="regularForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${regularForm.breakTimeBegin ? regularForm.breakTimeBegin+':00' : '00:00:00'} -${regularForm.workTimeEnd ? regularForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息结束时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left">迟到规则设置</el-divider>
+      <el-row>
+        <el-col :span="6" :offset="2" style="margin-top: 5px;">
+          <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
+            <el-input v-model.number.trim="regularForm.delayBegin1" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 30px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="2">
+          <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
+            <el-input v-model.number.trim="regularForm.delayBegin2" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 30px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="8" style="margin-top: 20px;">
+          <el-button type="primary" size="medium" @click="cancel">放弃修改</el-button>
+          <el-button type="primary" size="medium" @click="save">保存</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getRegular, updateRegular } from '@/api/attendance'
+
+export default {
+  name: 'Regular',
+  data() {
+    return {
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      regularForm: {
+        workDayArr: [],
+        workDay: '',
+        workTimeBegin: '',
+        workTimeEnd: '',
+        breakTimeBegin: '',
+        breakTimeEnd: '',
+        delayBegin1: '',
+        delayBegin2: ''
+      },
+      rules: {
+        workDayArr: [{ required: true, type: 'array', min: 1, message: '请选择工作日', trigger: ['blur', 'change'] }],
+        workTimeBegin: [{ type: 'string', required: true, message: '上班时间必填', trigger: ['blur', 'change'] }],
+        workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
+        breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
+        breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
+        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
+        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.regularForm.workDay = this.regularForm.workDayArr.join(',')
+          updateRegular(this.regularForm).then(response => {
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getRegular().then(response => {
+        // 处理工作日数据，转换为数组
+        this.regularForm.workDayArr = response.data.workDay.split(',')
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/specialDay.vue b/src/views/attendance/specialDay.vue
new file mode 100644
index 0000000..5ab4934
--- /dev/null
+++ b/src/views/attendance/specialDay.vue
@@ -0,0 +1,260 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="名称" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--批量导入-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button class="edit_btn" size="small" @click="downloadTemplate">模板下载</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border>
+        <!--批量选择勾选框列-->
+        <el-table-column align="center" type="selection" width="55"/>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-special-day ref="editSpecialDay" @watchChild="fetchData"/>
+  </div>
+</template>
+<script>
+
+import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+
+export default {
+  name: 'SpecialDay',
+  components: { EditSpecialDay },
+  data() {
+    return {
+      listQuery: {
+        name: '', // 节假日名称
+        offset: 1,
+        limit: 20,
+        sort: 'beginDate',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '开始日期',
+          value: 'beginDate',
+          align: 'center'
+        },
+        {
+          text: '结束日期',
+          value: 'endDate',
+          align: 'center'
+        },
+        {
+          text: '是否需要考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      total: 0, // 数据总数
+      fileList: [], // 上传文件列表
+      listLoading: false // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑特殊考勤日
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('create', this.dialogFormVisible)
+    },
+    // 删除
+    del(row) {
+      const params = {
+        irId: row.irId
+      }
+      this.$confirm(
+        '确定要删除该特殊考勤日条目？',
+        '确认操作',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delSpecialDay(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      // this.listLoading = false
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getSpecialDayList(this.listQuery).then(response => {
+      //   if (response.code === 200) {
+      //     this.list = response.data.rows
+      //     this.total = parseInt(response.data.total)
+      //   } else {
+      //     this.$message.error(response.message)
+      //   }
+      //   this.listLoading = false
+      // })
+    },
+    downloadTemplate() {
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportSpecialDay(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+      this.fileList = []
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index da6fca2..deb53a9 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
       <el-row>
         <el-col :span="16">
           <el-row :gutter="20">
@@ -65,6 +65,56 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <div v-if="attendanceEnable">
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="专务" prop="ext.isZhuanwu">
+                  <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="正职领导" prop="ext.isLeader">
+                  <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="考勤" prop="ext.isKaoqin">
+                  <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="统计加班" prop="ext.isOt">
+                  <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11" >
+                <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                  <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                  <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
@@ -137,6 +187,7 @@
 import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPerson',
@@ -153,7 +204,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -174,7 +291,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -191,7 +314,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -209,6 +338,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     this.fetchSexType()// 获取性别列表
     this.fetchDutyType() // 获取职务列表
     this.fetchNationType() // 获取民族列表
@@ -275,7 +407,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -325,7 +463,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/attendance/regular.vue b/src/views/attendance/regular.vue
new file mode 100644
index 0000000..0fac7f8
--- /dev/null
+++ b/src/views/attendance/regular.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="regularForm" label-width="180px">
+      <el-divider content-position="left">工作日设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;margin-bottom: 5px">
+          <el-form-item prop="workDayArr">
+            <el-checkbox-group v-model="regularForm.workDayArr" size="medium">
+              <el-checkbox-button v-for="week in weeks" :label="week.value" :key="week.value" :value="week.value">{{ week.label }}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left" >考勤时间设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;">
+          <el-col :span="6">
+            <el-form-item label="上班时间" prop="workTimeBegin">
+              <el-time-picker
+                v-model="regularForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) ? (regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="regularForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) ? (regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="下班时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="2" style="margin-bottom: 5px">
+          <el-col :span="6">
+            <el-form-item label="休息开始时间" prop="breakTimeBegin">
+              <el-time-picker
+                v-model="regularForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${regularForm.workTimeBegin ? regularForm.workTimeBegin+':00' : '00:00:00'} -${regularForm.breakTimeEnd ? regularForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="regularForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${regularForm.breakTimeBegin ? regularForm.breakTimeBegin+':00' : '00:00:00'} -${regularForm.workTimeEnd ? regularForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息结束时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left">迟到规则设置</el-divider>
+      <el-row>
+        <el-col :span="6" :offset="2" style="margin-top: 5px;">
+          <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
+            <el-input v-model.number.trim="regularForm.delayBegin1" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 30px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="2">
+          <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
+            <el-input v-model.number.trim="regularForm.delayBegin2" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 30px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="8" style="margin-top: 20px;">
+          <el-button type="primary" size="medium" @click="cancel">放弃修改</el-button>
+          <el-button type="primary" size="medium" @click="save">保存</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getRegular, updateRegular } from '@/api/attendance'
+
+export default {
+  name: 'Regular',
+  data() {
+    return {
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      regularForm: {
+        workDayArr: [],
+        workDay: '',
+        workTimeBegin: '',
+        workTimeEnd: '',
+        breakTimeBegin: '',
+        breakTimeEnd: '',
+        delayBegin1: '',
+        delayBegin2: ''
+      },
+      rules: {
+        workDayArr: [{ required: true, type: 'array', min: 1, message: '请选择工作日', trigger: ['blur', 'change'] }],
+        workTimeBegin: [{ type: 'string', required: true, message: '上班时间必填', trigger: ['blur', 'change'] }],
+        workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
+        breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
+        breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
+        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
+        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.regularForm.workDay = this.regularForm.workDayArr.join(',')
+          updateRegular(this.regularForm).then(response => {
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getRegular().then(response => {
+        // 处理工作日数据，转换为数组
+        this.regularForm.workDayArr = response.data.workDay.split(',')
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/specialDay.vue b/src/views/attendance/specialDay.vue
new file mode 100644
index 0000000..5ab4934
--- /dev/null
+++ b/src/views/attendance/specialDay.vue
@@ -0,0 +1,260 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="名称" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--批量导入-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button class="edit_btn" size="small" @click="downloadTemplate">模板下载</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border>
+        <!--批量选择勾选框列-->
+        <el-table-column align="center" type="selection" width="55"/>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-special-day ref="editSpecialDay" @watchChild="fetchData"/>
+  </div>
+</template>
+<script>
+
+import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+
+export default {
+  name: 'SpecialDay',
+  components: { EditSpecialDay },
+  data() {
+    return {
+      listQuery: {
+        name: '', // 节假日名称
+        offset: 1,
+        limit: 20,
+        sort: 'beginDate',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '开始日期',
+          value: 'beginDate',
+          align: 'center'
+        },
+        {
+          text: '结束日期',
+          value: 'endDate',
+          align: 'center'
+        },
+        {
+          text: '是否需要考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      total: 0, // 数据总数
+      fileList: [], // 上传文件列表
+      listLoading: false // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑特殊考勤日
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('create', this.dialogFormVisible)
+    },
+    // 删除
+    del(row) {
+      const params = {
+        irId: row.irId
+      }
+      this.$confirm(
+        '确定要删除该特殊考勤日条目？',
+        '确认操作',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delSpecialDay(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      // this.listLoading = false
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getSpecialDayList(this.listQuery).then(response => {
+      //   if (response.code === 200) {
+      //     this.list = response.data.rows
+      //     this.total = parseInt(response.data.total)
+      //   } else {
+      //     this.$message.error(response.message)
+      //   }
+      //   this.listLoading = false
+      // })
+    },
+    downloadTemplate() {
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportSpecialDay(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+      this.fileList = []
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index da6fca2..deb53a9 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
       <el-row>
         <el-col :span="16">
           <el-row :gutter="20">
@@ -65,6 +65,56 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <div v-if="attendanceEnable">
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="专务" prop="ext.isZhuanwu">
+                  <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="正职领导" prop="ext.isLeader">
+                  <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="考勤" prop="ext.isKaoqin">
+                  <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="统计加班" prop="ext.isOt">
+                  <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11" >
+                <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                  <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                  <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
@@ -137,6 +187,7 @@
 import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPerson',
@@ -153,7 +204,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -174,7 +291,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -191,7 +314,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -209,6 +338,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     this.fetchSexType()// 获取性别列表
     this.fetchDutyType() // 获取职务列表
     this.fetchNationType() // 获取民族列表
@@ -275,7 +407,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -325,7 +463,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index cef176f..2d2eae5 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 添加人员 -->
     <div v-if="step==='1'">
-      <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+      <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
         <el-row>
           <el-col :span="16">
             <el-row :gutter="20">
@@ -67,6 +67,56 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <div v-if="attendanceEnable">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="专务" prop="ext.isZhuanwu">
+                    <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="正职领导" prop="ext.isLeader">
+                    <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="考勤" prop="ext.isKaoqin">
+                    <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="统计加班" prop="ext.isOt">
+                    <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11" >
+                  <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                    <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                    <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
@@ -154,6 +204,7 @@
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPersonIris',
@@ -170,7 +221,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable, // 读取全局变量，是否启用考勤功能配置
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -191,7 +308,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -208,7 +331,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -240,6 +369,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     // 接收iframe的传值
     window['vueDefined'] = (receiveParams) => {
       this.receiveParamsFromHtml(receiveParams)
@@ -318,7 +450,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -368,7 +506,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/attendance/regular.vue b/src/views/attendance/regular.vue
new file mode 100644
index 0000000..0fac7f8
--- /dev/null
+++ b/src/views/attendance/regular.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="regularForm" label-width="180px">
+      <el-divider content-position="left">工作日设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;margin-bottom: 5px">
+          <el-form-item prop="workDayArr">
+            <el-checkbox-group v-model="regularForm.workDayArr" size="medium">
+              <el-checkbox-button v-for="week in weeks" :label="week.value" :key="week.value" :value="week.value">{{ week.label }}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left" >考勤时间设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;">
+          <el-col :span="6">
+            <el-form-item label="上班时间" prop="workTimeBegin">
+              <el-time-picker
+                v-model="regularForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) ? (regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="regularForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) ? (regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="下班时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="2" style="margin-bottom: 5px">
+          <el-col :span="6">
+            <el-form-item label="休息开始时间" prop="breakTimeBegin">
+              <el-time-picker
+                v-model="regularForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${regularForm.workTimeBegin ? regularForm.workTimeBegin+':00' : '00:00:00'} -${regularForm.breakTimeEnd ? regularForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="regularForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${regularForm.breakTimeBegin ? regularForm.breakTimeBegin+':00' : '00:00:00'} -${regularForm.workTimeEnd ? regularForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息结束时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left">迟到规则设置</el-divider>
+      <el-row>
+        <el-col :span="6" :offset="2" style="margin-top: 5px;">
+          <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
+            <el-input v-model.number.trim="regularForm.delayBegin1" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 30px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="2">
+          <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
+            <el-input v-model.number.trim="regularForm.delayBegin2" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 30px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="8" style="margin-top: 20px;">
+          <el-button type="primary" size="medium" @click="cancel">放弃修改</el-button>
+          <el-button type="primary" size="medium" @click="save">保存</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getRegular, updateRegular } from '@/api/attendance'
+
+export default {
+  name: 'Regular',
+  data() {
+    return {
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      regularForm: {
+        workDayArr: [],
+        workDay: '',
+        workTimeBegin: '',
+        workTimeEnd: '',
+        breakTimeBegin: '',
+        breakTimeEnd: '',
+        delayBegin1: '',
+        delayBegin2: ''
+      },
+      rules: {
+        workDayArr: [{ required: true, type: 'array', min: 1, message: '请选择工作日', trigger: ['blur', 'change'] }],
+        workTimeBegin: [{ type: 'string', required: true, message: '上班时间必填', trigger: ['blur', 'change'] }],
+        workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
+        breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
+        breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
+        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
+        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.regularForm.workDay = this.regularForm.workDayArr.join(',')
+          updateRegular(this.regularForm).then(response => {
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getRegular().then(response => {
+        // 处理工作日数据，转换为数组
+        this.regularForm.workDayArr = response.data.workDay.split(',')
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/specialDay.vue b/src/views/attendance/specialDay.vue
new file mode 100644
index 0000000..5ab4934
--- /dev/null
+++ b/src/views/attendance/specialDay.vue
@@ -0,0 +1,260 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="名称" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--批量导入-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button class="edit_btn" size="small" @click="downloadTemplate">模板下载</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border>
+        <!--批量选择勾选框列-->
+        <el-table-column align="center" type="selection" width="55"/>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-special-day ref="editSpecialDay" @watchChild="fetchData"/>
+  </div>
+</template>
+<script>
+
+import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+
+export default {
+  name: 'SpecialDay',
+  components: { EditSpecialDay },
+  data() {
+    return {
+      listQuery: {
+        name: '', // 节假日名称
+        offset: 1,
+        limit: 20,
+        sort: 'beginDate',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '开始日期',
+          value: 'beginDate',
+          align: 'center'
+        },
+        {
+          text: '结束日期',
+          value: 'endDate',
+          align: 'center'
+        },
+        {
+          text: '是否需要考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      total: 0, // 数据总数
+      fileList: [], // 上传文件列表
+      listLoading: false // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑特殊考勤日
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('create', this.dialogFormVisible)
+    },
+    // 删除
+    del(row) {
+      const params = {
+        irId: row.irId
+      }
+      this.$confirm(
+        '确定要删除该特殊考勤日条目？',
+        '确认操作',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delSpecialDay(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      // this.listLoading = false
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getSpecialDayList(this.listQuery).then(response => {
+      //   if (response.code === 200) {
+      //     this.list = response.data.rows
+      //     this.total = parseInt(response.data.total)
+      //   } else {
+      //     this.$message.error(response.message)
+      //   }
+      //   this.listLoading = false
+      // })
+    },
+    downloadTemplate() {
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportSpecialDay(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+      this.fileList = []
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index da6fca2..deb53a9 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
       <el-row>
         <el-col :span="16">
           <el-row :gutter="20">
@@ -65,6 +65,56 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <div v-if="attendanceEnable">
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="专务" prop="ext.isZhuanwu">
+                  <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="正职领导" prop="ext.isLeader">
+                  <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="考勤" prop="ext.isKaoqin">
+                  <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="统计加班" prop="ext.isOt">
+                  <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11" >
+                <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                  <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                  <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
@@ -137,6 +187,7 @@
 import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPerson',
@@ -153,7 +204,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -174,7 +291,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -191,7 +314,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -209,6 +338,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     this.fetchSexType()// 获取性别列表
     this.fetchDutyType() // 获取职务列表
     this.fetchNationType() // 获取民族列表
@@ -275,7 +407,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -325,7 +463,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index cef176f..2d2eae5 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 添加人员 -->
     <div v-if="step==='1'">
-      <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+      <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
         <el-row>
           <el-col :span="16">
             <el-row :gutter="20">
@@ -67,6 +67,56 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <div v-if="attendanceEnable">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="专务" prop="ext.isZhuanwu">
+                    <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="正职领导" prop="ext.isLeader">
+                    <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="考勤" prop="ext.isKaoqin">
+                    <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="统计加班" prop="ext.isOt">
+                    <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11" >
+                  <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                    <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                    <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
@@ -154,6 +204,7 @@
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPersonIris',
@@ -170,7 +221,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable, // 读取全局变量，是否启用考勤功能配置
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -191,7 +308,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -208,7 +331,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -240,6 +369,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     // 接收iframe的传值
     window['vueDefined'] = (receiveParams) => {
       this.receiveParamsFromHtml(receiveParams)
@@ -318,7 +450,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -368,7 +506,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9216c82..9450c45 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -72,10 +72,11 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson } from '@/api/person'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { getProject } from '@/utils/baseConfig'
-import { isIE } from '@/utils/browser'
+// import { getToken } from '@/utils/auth' // getToken from cookie
+// import { getProject } from '@/utils/baseConfig'
+// import { isIE } from '@/utils/browser'
 import { downloadFile } from '@/utils/downloadUtils'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'ListStaff',
@@ -93,55 +94,95 @@
         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: 'dutyName',
-          align: 'center'
-        },
-        {
-          text: '备注',
-          value: 'remarks',
-          width: 140,
-          align: 'center'
-        }
-      ], // 显示列
+      columns: [], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       sexList: [], // 性别列表
       dutyList: [], // 职务列表
-      listLoading: true, // 加载动画
+      listLoading: false, // 加载动画
       fullscreenLoading: false // 全屏加载动画
     }
   },
   mounted() {
+    debugger
+    this.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: 'dutyName',
+        align: 'center'
+      },
+      {
+        text: '备注',
+        value: 'remarks',
+        width: 140,
+        align: 'center'
+      }
+    ]
+    if (attendanceEnable === true) {
+      this.columns.push(
+        {
+          text: '考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '统计加班',
+          value: 'isOt',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '专务',
+          value: 'isZhuanwu',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '部门正职领导',
+          value: 'idLeader',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '年假（天）',
+          value: 'initAnnualLeave',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '剩余年假（天）',
+          value: 'annualLeave',
+          align: 'center'
+        })
+    }
     this.fetchSexType()// 获取性别列表
     this.fetchDutyType() // 获取职务列表
     this.fetchData()// 获取数据
@@ -235,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = true
+      this.listLoading = false
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }

diff --git a/config/dev.env.js b/config/dev.env.js
index c21f267..bc033b0 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://139.198.16.38:20005"'
-  BASE_API: '"http://192.168.0.225:8093"'
+  BASE_API: '"http://139.198.16.38:20005"'
+  // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/api/attendance.js b/src/api/attendance.js
new file mode 100644
index 0000000..c7e9922
--- /dev/null
+++ b/src/api/attendance.js
@@ -0,0 +1,123 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function makeReport() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 获取考勤规则
+export function getRegular() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 保存考勤规则
+export function updateRegular(params) {
+  return request({
+    url: 'device/listAll',
+    method: 'post',
+    params
+  })
+}
+// 批量导入特殊考勤日
+export function batchImportSpecialDay(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'irisCollect/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
+// 模板下载
+export function downloadTemplate(deviceType) {
+  return request({
+    url: 'device/model',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 添加特殊考勤日
+export function addSpecialDay(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+// 修改特殊考勤日
+export function updateSpecialDay(params) {
+  return request({
+    url: 'device/update',
+    method: 'post',
+    params
+  })
+}
+// 删除特殊考勤日
+export function delSpecialDay(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function getSpecialDayList() {
+  return request({
+    url: 'device/list',
+    method: 'get'
+  })
+}
+// 批量导出
+export function batchExportDevice(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+// 添加考勤备注
+export function addRemarks(params) {
+  return request({
+    url: 'device/add',
+    method: 'post',
+    params
+  })
+}
+
+// 获取已备注列表
+export function getRemarksList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取可备注的类型
+export function getRemarksTypeList(params) {
+  return request({
+    url: 'remarks/list',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/query.js b/src/api/query.js
index 2fdedee..5117a9c 100644
--- a/src/api/query.js
+++ b/src/api/query.js
@@ -99,4 +99,4 @@
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
-}
\ No newline at end of file
+}
diff --git a/src/main.js b/src/main.js
index 3e00bc4..c9354d4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,9 @@
 import VCharts from 'v-charts'
 Vue.use(VCharts)
 
+// 配置是否启用考勤功能
+export const attendanceEnable = true
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index fcd1ef5..733af54 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,7 @@
 import { baseRoutes } from './modules/base'
 import { systemRouters } from './modules/system'
 import { accessRouters } from './modules/access'
+import { attendanceRouters } from './modules/attendance'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -73,6 +74,7 @@
 export const asyncRouterMap = [
   ...accessRouters,
   ...baseRoutes,
+  ...attendanceRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
new file mode 100644
index 0000000..f7cf021
--- /dev/null
+++ b/src/router/modules/attendance.js
@@ -0,0 +1,55 @@
+/* Layout */
+import Layout from '../../views/layout/Layout'
+
+export const attendanceRouters = [
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/atd',
+    name: 'Atd',
+    meta: {
+      title: '考勤统计',
+      icon: 'task', // 图标
+      permission: ['/attendance']// 权限名称
+    },
+    children: [
+      {
+        path: '/listReport',
+        name: 'ListReport',
+        component: () => import('@/views/attendance/listReport'),
+        meta: { title: '查询报表数据', icon: 'function', permission: ['/listReport'] }
+      },
+      {
+        path: '/makeReport',
+        name: 'MakeReport',
+        component: () => import('@/views/attendance/makeReport'),
+        meta: { title: '生成考勤报表', icon: 'function', permission: ['/makeReport'] }
+      }
+    ]
+  },
+  {
+    path: '/atdSetting',
+    component: Layout,
+    redirect: '/atdSetting',
+    name: 'AtdSetting',
+    meta: {
+      title: '考勤设置',
+      icon: 'task', // 图标
+      permission: ['/atdSetting']// 权限名称
+    },
+    children: [
+      {
+        path: '/regular',
+        name: 'Regular',
+        component: () => import('@/views/attendance/regular'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+      },
+      {
+        path: '/specialDay',
+        name: 'SpecialDay',
+        component: () => import('@/views/attendance/specialDay'),
+        meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      }
+    ]
+  }
+]
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
new file mode 100644
index 0000000..58aa8f3
--- /dev/null
+++ b/src/views/attendance/editRemarks.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+      <!--查询结果Table显示-->
+      <div style="margin-bottom: 30px">
+        <el-row class="table-title">
+          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button class="edit_btn" size="small" @click="add">添加备注</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="listLoading" :data="list" class="table" border>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+              <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注操作" align="center" width="160">
+            <template slot-scope="scope">
+              <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-show="addShow" >
+        <el-form ref="dataForm" :rules="rules" :model="remarksForm" label-well-code="right" label-width="100px">
+          <el-row type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="备注类型" prop="remarksType">
+                <el-select v-model="remarksForm.remarksType" placeholder="必填" clearable @change="selectRemarksType">
+                  <el-option v-for="item in remarksTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注信息" prop="remarksInfo">
+                <el-select v-model="remarksForm.remarksInfo" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksInfoList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="beginDate">
+                <el-date-picker
+                  v-model="remarksForm.beginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker
+                  v-model="remarksForm.endDate"
+                  :picker-options="endDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="开始日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+            <el-col :span="12">
+              <el-form-item label="哺乳假一小时用于" prop="breastfeedType" label-width="140px">
+                <el-select v-model="remarksForm.breastfeedType" :disabled="breastfeedTypeDisabled" placeholder="哺乳假一小时用于" clearable>
+                  <el-option v-for="item in breastfeedTypeList" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始日期" prop="breastfeedBeginDate">
+                <el-date-picker
+                  v-model="remarksForm.breastfeedBeginDate"
+                  :picker-options="beginDateOptions"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  placeholder="系统自动计算截止日期为一年后"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" label="其他原因" prop="other">
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+          </el-form-item>
+          <el-form-item v-if="remarksForm.remarksInfo=='12'" prop="onBusiness">
+            <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
+            <el-radio v-model="remarksForm.onBusiness" label="0">因私</el-radio>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+
+export default {
+  name: 'EditRemarks',
+  data() {
+    const validateOtherReason = (rule, value, callback) => {
+      const reg = /[:;：；]/im
+      if (value !== '' && value.length > 0) {
+        if (reg.test(value)) {
+          callback(new Error('不能含有冒号或分号'))
+        } else {
+          if (value.indexOf('哺乳假') !== -1 || value.indexOf('年假') !== -1 || value.indexOf('事假') !== -1 || value.indexOf('病假') !== -1 ||
+            value.indexOf('婚假') !== -1 || value.indexOf('丧假') !== -1 || value.indexOf('工伤') !== -1 || value.indexOf('探亲假') !== -1 ||
+            value.indexOf('生育假') !== -1) {
+            callback(new Error('请在“备注信息”下拉框里选择请假类型'))
+          } else {
+            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
+              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
+            } else {
+              callback()
+            }
+          }
+        }
+      } else {
+        callback(new Error('请输入其他原因'))
+      }
+    }
+    return {
+      curDate: '',
+      beginDateOptions: {
+        disabledDate: this.disabledBeginDate
+      },
+      endDateOptions: {
+        disabledDate: this.disabledEndDate
+      },
+      addShow: false,
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      remarksForm: {
+        personId: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }, // 表单
+      title: '', // 表头显示标题
+      rules: {
+        remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
+        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
+        breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
+        breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
+        other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }],
+        onBusiness: [{ required: true, message: '请选择“因公”或“因私”', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false,
+      columns: [
+        {
+          text: '备注类型',
+          value: 'remarksType',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarksInfo',
+          align: 'center'
+        }
+      ], // 显示列
+      remarksTypeList: [
+        { name: '迟到', value: '1' },
+        { name: '早退', value: '2' },
+        { name: '上午旷工', value: '3' },
+        { name: '下午旷工', value: '4' },
+        { name: '旷工一天', value: '5' }],
+      remarksInfoList: [
+        { name: '出差', value: '1' },
+        { name: '请假-年假', value: '2' },
+        { name: '请假-事假', value: '3' },
+        { name: '请假-病假', value: '4' },
+        { name: '请假-婚假', value: '5' },
+        { name: '请假-丧假', value: '6' },
+        { name: '请假-工伤', value: '7' },
+        { name: '请假-探亲假', value: '8' },
+        { name: '请假-生育假', value: '9' },
+        { name: '请假-哺乳假', value: '10' },
+        { name: '值班调休', value: '11' },
+        { name: '其他原因', value: '12' }],
+      breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
+      list: [],
+      listLoading: false,
+      breastfeedTypeDisabled: false
+    }
+  },
+  watch: { },
+  mounted() {
+    this.fetchRemarksType()
+    this.fetchData()
+  },
+  methods: {
+    disabledBeginDate(time) {
+      return time.getTime() > new Date(this.curDate)
+    },
+    disabledEndDate(time) {
+      return time.getTime() < new Date(this.curDate)
+    },
+    // 初始化对话框
+    initDialog: function(title = null, dialogFormVisible, row) {
+      this.addShow = false
+      this.title = '编辑备注 - ' + row.name + ' - ' + row.date
+      this.curDate = row.date
+      this.remarksForm.personId = row.id
+      this.dialogFormVisible = dialogFormVisible
+    },
+    // 重置表单
+    resetForm() {
+      this.remarksForm = {
+        id: '',
+        remarksType: '',
+        remarksInfo: '',
+        beginDate: '',
+        endDate: '',
+        breastfeedType: '',
+        breastfeedBeginDate: '',
+        other: '',
+        onBusiness: ''
+      }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectRemarksType() {
+      if (this.remarksForm.remarksType === '1' || this.remarksForm.remarksType === '3') {
+        this.remarksForm.breastfeedType = '1'
+        this.breastfeedTypeDisabled = true
+      } else if (this.remarksForm.remarksType === '2' || this.remarksForm.remarksType === '4') {
+        this.remarksForm.breastfeedType = '2'
+        this.breastfeedTypeDisabled = true
+      } else {
+        this.breastfeedTypeDisabled = false
+      }
+    },
+    add() {
+      this.resetForm()
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
+      this.addShow = true
+    },
+    // 保存数据
+    saveData: function() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$message.success('通过校验！')
+          addRemarks(this.remarksForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.fetchData()
+          //     this.addShow = false
+          //     this.$message.success('添加成功！')
+          //   }
+          // }).catch(err => {
+          //   console.log(err)
+          })
+        }
+      })
+    },
+    // 获取备注列表
+    fetchData() {
+      getRemarksList().then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+        }
+      })
+    },
+    fetchRemarksType() {
+      getRemarksTypeList().then(response => {
+        if (response.code === 200) {
+          this.remarksTypeList = response.data
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .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
+    }
+  }
+  .dialog-footer{
+    text-align: right;
+    margin-top: 10px;
+  }
+</style>
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
new file mode 100644
index 0000000..b416ddc
--- /dev/null
+++ b/src/views/attendance/editSpecialDay.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="specialDayForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="specialDayForm.name" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="开始日期" prop="beginDate">
+            <el-date-picker
+              v-model="specialDayForm.beginDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="结束日期" prop="endDate">
+            <el-date-picker
+              v-model="specialDayForm.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              placeholder="开始日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="18">
+          <el-form-item label="是否考勤" prop="isKaoqin">
+            <el-radio v-model="specialDayForm.isKaoqin" label="1">是</el-radio>
+            <el-radio v-model="specialDayForm.isKaoqin" label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addSpecialDay, updateSpecialDay } from '@/api/attendance'
+
+export default {
+  name: 'EditSpecialDay',
+  data() {
+    return {
+      checkList: [],
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      specialDayForm: {
+        id: '',
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur', 'change'] }],
+        endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur', 'change'] }],
+        isKaoqin: [{ required: true, message: '请选择是否考勤', trigger: ['blur'] }]
+      }, // 前端校验规则
+      isEditMode: false
+    }
+  },
+  watch: { },
+  mounted() {
+    // this.fetchBusinessType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.checkList = []
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.specialDayForm = {
+          name: row.name,
+          beginDate: row.beginDate,
+          endDate: row.endDate,
+          isKaoqin: row.isKaoqin,
+          id: row.id
+        }
+        this.isEditMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.specialDayForm = {
+        name: '',
+        beginDate: '',
+        endDate: '',
+        isKaoqin: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          addSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      const that = this
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          that.deviceForm.devType = ''
+          that.checkList.forEach(function(value, index) {
+            that.deviceForm.devType += value + ','
+          })
+          that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1)
+          console.log(that.deviceForm)
+          updateSpecialDay(that.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
new file mode 100644
index 0000000..92a5c6a
--- /dev/null
+++ b/src/views/attendance/listReport.vue
@@ -0,0 +1,305 @@
+<!--访客管理-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" >
+            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="month">
+            <el-date-picker
+              v-model="listQuery.month"
+              type="month"
+              format="yyyy-MM"
+              style="width: 160px"
+              placeholder="考勤月"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="date">
+            <el-date-picker
+              v-model="listQuery.date"
+              type="date"
+              format="yyyy-MM-dd"
+              style="width: 160px"
+              placeholder="日期"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isMark">
+            <el-checkbox v-model="listQuery.isMark" style="width: 160px" border>仅显示无备注</el-checkbox>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="isAbnormal">
+            <el-checkbox v-model="listQuery.isAbnormal" style="width: 160px" border>仅显示异常</el-checkbox>
+          </el-form-item>
+          <!--<el-form-item class="selectForm-container-item" />-->
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" size="small" @click="syn">重新同步识别记录</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button :disabled="!hasPerm('/remarks/add')" type="text" @click="edit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import EditRemarks from './editRemarks'
+// import { downloadFile } from '@/utils/downloadUtils'
+
+export default {
+  name: 'ListReport',
+  components: { EditRemarks, DeptSelect },
+  data() {
+    return {
+      listQuery: {
+        deptid: '', // 部门
+        name: '', // 姓名
+        month: '', // 考勤月
+        date: '', // 日期
+        isMark: '', // 是否有备注
+        isAbnormal: '', // 是否异常
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '部门',
+          value: 'department',
+          align: 'center'
+        },
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '日期',
+          value: 'date',
+          align: 'center'
+        },
+        {
+          text: '原始识别记录',
+          value: 'time',
+          align: 'center',
+          width: 180
+        },
+        {
+          text: '迟到(m)',
+          value: 'late',
+          width: 140,
+          align: 'center'
+        },
+        {
+          text: '早退(m)',
+          value: 'early',
+          width: 110,
+          align: 'center'
+        },
+        {
+          text: '上午旷工(h)',
+          value: 'absentAm',
+          width: 100,
+          align: 'center'
+        },
+        {
+          text: '下午旷工(h)',
+          value: 'absentPm',
+          align: 'center'
+        },
+        {
+          text: '旷工一天',
+          value: 'absentOneDay',
+          align: 'center'
+        },
+        {
+          text: '备注信息',
+          value: 'remarks',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      total: 0, // 数据总数
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: ''
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  activated() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
+    },
+    // 编辑备注
+    edit(row) {
+      this.dialogFormVisible = true
+      // this.editShow = true
+      this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
+    },
+    syn() {
+    },
+    // 删除人员
+    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() // 关闭加载动画
+      //   downloadFile(res.data, '访客列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getVisitorList(this.listQuery).then(response => {
+      //   this.list = response.data.rows
+      //   this.total = parseInt(response.data.total)
+      //   this.listLoading = false
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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
+    }
+  }
+  .selectForm-container-item{
+    width: 160px;
+  }
+</style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
new file mode 100644
index 0000000..7e4da1b
--- /dev/null
+++ b/src/views/attendance/makeReport.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+        <el-row style="margin-top: 60px">
+          <el-col :span="8">
+            <el-form-item label="考勤月" prop="month">
+              <el-date-picker
+                v-model="form.month"
+                type="month"
+                format="yyyy-MM"
+                placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { makeReport } from '@/api/attendance'
+
+export default {
+  name: 'MakeReport',
+  data() {
+    return {
+      form: {
+        month: ''
+      },
+      rules: {
+        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    makeReport() {
+      // 表单校验
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          makeReport(this.month).then(response => {
+
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .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/attendance/regular.vue b/src/views/attendance/regular.vue
new file mode 100644
index 0000000..0fac7f8
--- /dev/null
+++ b/src/views/attendance/regular.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="regularForm" label-width="180px">
+      <el-divider content-position="left">工作日设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;margin-bottom: 5px">
+          <el-form-item prop="workDayArr">
+            <el-checkbox-group v-model="regularForm.workDayArr" size="medium">
+              <el-checkbox-button v-for="week in weeks" :label="week.value" :key="week.value" :value="week.value">{{ week.label }}</el-checkbox-button>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left" >考勤时间设置</el-divider>
+      <el-row>
+        <el-col :offset="2" style="margin-top: 5px;">
+          <el-col :span="6">
+            <el-form-item label="上班时间" prop="workTimeBegin">
+              <el-time-picker
+                v-model="regularForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) ? (regularForm.breakTimeBegin ? regularForm.breakTimeBegin : regularForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="regularForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) ? (regularForm.breakTimeEnd ? regularForm.breakTimeEnd : regularForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="下班时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="2" style="margin-bottom: 5px">
+          <el-col :span="6">
+            <el-form-item label="休息开始时间" prop="breakTimeBegin">
+              <el-time-picker
+                v-model="regularForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${regularForm.workTimeBegin ? regularForm.workTimeBegin+':00' : '00:00:00'} -${regularForm.breakTimeEnd ? regularForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="regularForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${regularForm.breakTimeBegin ? regularForm.breakTimeBegin+':00' : '00:00:00'} -${regularForm.workTimeEnd ? regularForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="休息结束时间"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left">迟到规则设置</el-divider>
+      <el-row>
+        <el-col :span="6" :offset="2" style="margin-top: 5px;">
+          <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
+            <el-input v-model.number.trim="regularForm.delayBegin1" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 30px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="2">
+          <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
+            <el-input v-model.number.trim="regularForm.delayBegin2" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 30px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="8" style="margin-top: 20px;">
+          <el-button type="primary" size="medium" @click="cancel">放弃修改</el-button>
+          <el-button type="primary" size="medium" @click="save">保存</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getRegular, updateRegular } from '@/api/attendance'
+
+export default {
+  name: 'Regular',
+  data() {
+    return {
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      regularForm: {
+        workDayArr: [],
+        workDay: '',
+        workTimeBegin: '',
+        workTimeEnd: '',
+        breakTimeBegin: '',
+        breakTimeEnd: '',
+        delayBegin1: '',
+        delayBegin2: ''
+      },
+      rules: {
+        workDayArr: [{ required: true, type: 'array', min: 1, message: '请选择工作日', trigger: ['blur', 'change'] }],
+        workTimeBegin: [{ type: 'string', required: true, message: '上班时间必填', trigger: ['blur', 'change'] }],
+        workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
+        breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
+        breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
+        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
+        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.regularForm.workDay = this.regularForm.workDayArr.join(',')
+          updateRegular(this.regularForm).then(response => {
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getRegular().then(response => {
+        // 处理工作日数据，转换为数组
+        this.regularForm.workDayArr = response.data.workDay.split(',')
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/specialDay.vue b/src/views/attendance/specialDay.vue
new file mode 100644
index 0000000..5ab4934
--- /dev/null
+++ b/src/views/attendance/specialDay.vue
@@ -0,0 +1,260 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.name" placeholder="名称" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--批量导入-->
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+            style="margin-top: 0">
+            <el-button slot="trigger" class="edit_btn" size="small">批量导入</el-button>
+          </el-upload>
+          <el-button class="edit_btn" size="small" @click="downloadTemplate">模板下载</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border>
+        <!--批量选择勾选框列-->
+        <el-table-column align="center" type="selection" width="55"/>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <edit-special-day ref="editSpecialDay" @watchChild="fetchData"/>
+  </div>
+</template>
+<script>
+
+import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+
+export default {
+  name: 'SpecialDay',
+  components: { EditSpecialDay },
+  data() {
+    return {
+      listQuery: {
+        name: '', // 节假日名称
+        offset: 1,
+        limit: 20,
+        sort: 'beginDate',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '开始日期',
+          value: 'beginDate',
+          align: 'center'
+        },
+        {
+          text: '结束日期',
+          value: 'endDate',
+          align: 'center'
+        },
+        {
+          text: '是否需要考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      total: 0, // 数据总数
+      fileList: [], // 上传文件列表
+      listLoading: false // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑特殊考勤日
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editSpecialDay.initDialog('create', this.dialogFormVisible)
+    },
+    // 删除
+    del(row) {
+      const params = {
+        irId: row.irId
+      }
+      this.$confirm(
+        '确定要删除该特殊考勤日条目？',
+        '确认操作',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delSpecialDay(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      // this.listLoading = false
+      // if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+      //   this.listQuery.offset = 1
+      // }
+      // getSpecialDayList(this.listQuery).then(response => {
+      //   if (response.code === 200) {
+      //     this.list = response.data.rows
+      //     this.total = parseInt(response.data.total)
+      //   } else {
+      //     this.$message.error(response.message)
+      //   }
+      //   this.listLoading = false
+      // })
+    },
+    downloadTemplate() {
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportSpecialDay(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+      this.fileList = []
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</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/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index da6fca2..deb53a9 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+    <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
       <el-row>
         <el-col :span="16">
           <el-row :gutter="20">
@@ -65,6 +65,56 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <div v-if="attendanceEnable">
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="专务" prop="ext.isZhuanwu">
+                  <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="正职领导" prop="ext.isLeader">
+                  <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-form-item label="考勤" prop="ext.isKaoqin">
+                  <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="统计加班" prop="ext.isOt">
+                  <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                    <el-option key="1" label="是" value="1"/>
+                    <el-option key="0" label="否" value="0"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="11" >
+                <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                  <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11" >
+                <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                  <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
@@ -137,6 +187,7 @@
 import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPerson',
@@ -153,7 +204,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable,
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -174,7 +291,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -191,7 +314,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -209,6 +338,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     this.fetchSexType()// 获取性别列表
     this.fetchDutyType() // 获取职务列表
     this.fetchNationType() // 获取民族列表
@@ -275,7 +407,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -325,7 +463,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index cef176f..2d2eae5 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 添加人员 -->
     <div v-if="step==='1'">
-      <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" class="main-form" label-width="120px">
+      <el-form v-loading="formLoading" ref="dataForm" :label-position="labelPosition" :rules="rules" :model="personForm" :size="formSize" class="main-form" label-width="120px">
         <el-row>
           <el-col :span="16">
             <el-row :gutter="20">
@@ -67,6 +67,56 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <div v-if="attendanceEnable">
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="专务" prop="ext.isZhuanwu">
+                    <el-select v-model="personForm.ext.isZhuanwu" placeholder="是否专务" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="正职领导" prop="ext.isLeader">
+                    <el-select v-model="personForm.ext.isLeader" placeholder="是否正职领导" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11">
+                  <el-form-item label="考勤" prop="ext.isKaoqin">
+                    <el-select v-model="personForm.ext.isKaoqin" placeholder="是否考勤" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="统计加班" prop="ext.isOt">
+                    <el-select v-model="personForm.ext.isOt" placeholder="是否统计加班" clearable>
+                      <el-option key="1" label="是" value="1"/>
+                      <el-option key="0" label="否" value="0"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="11" >
+                  <el-form-item label="年假/天" prop="ext.initAnnualLeave">
+                    <el-input v-model.trim="personForm.ext.initAnnualLeave" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" >
+                  <el-form-item label="剩余年假/天" prop="ext.annualLeave">
+                    <el-input v-model.trim="personForm.ext.annualLeave" type="text" placeholder="必填"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
@@ -154,6 +204,7 @@
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 // import { isIE } from '@/utils/browser'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'AddPersonIris',
@@ -170,7 +221,73 @@
         callback(new Error('身份证号不能为空'))
       }
     }
+    // 校验年假
+    const validateInitAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入0-20之间的数字'))
+          } else {
+            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+              callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('年假不能为空'))
+      }
+    }
+    // 校验剩余年假
+    const validateAnnualLeave = (rule, value, callback) => {
+      if (value !== '') {
+        if (value !== '0') {
+          if (!Number(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+              callback(new Error('请输入0-20之间且不大于年假天数的值'))
+            } else {
+              if (value.indexOf('.') !== -1) {
+                if (value.split('.')[1].length > 1) {
+                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                } else {
+                  if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
+                    callback(new Error('只能是整数或整数加减0.5的值'))
+                  } else {
+                    callback()
+                  }
+                }
+              } else {
+                callback()
+              }
+            }
+          }
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('剩余年假不能为空'))
+      }
+    }
     return {
+      formSize: 'large', // 如果启动了考勤功能，条目太多，size设置为small，否则为large
+      attendanceEnable: attendanceEnable, // 读取全局变量，是否启用考勤功能配置
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       isEditMode: false, // 是否为编辑模式，编辑模式部分字段不允许修改，且没有重置和虹膜注册功能
@@ -191,7 +308,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }, // 表单
       photo: '', // 图片路径
@@ -208,7 +331,13 @@
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         duty: [{ required: true, message: '职务必选', trigger: 'change' }],
         sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }]
+        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
+        'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
+        'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
+        'ext.isLeader': [{ required: true, message: '是否正职领导必选', trigger: ['change'] }],
+        'ext.initAnnualLeave': [{ validator: validateInitAnnualLeave, required: true, trigger: ['blur'] }],
+        'ext.annualLeave': [{ validator: validateAnnualLeave, required: true, trigger: ['blur'] }]
       },
       dialogVisible: false,
       labelPosition: 'right',
@@ -240,6 +369,9 @@
     }
   },
   mounted() {
+    if (attendanceEnable === true) {
+      this.formSize = 'small'
+    }
     // 接收iframe的传值
     window['vueDefined'] = (receiveParams) => {
       this.receiveParamsFromHtml(receiveParams)
@@ -318,7 +450,13 @@
           photo: personForm.photo,
           ext: {
             certificationUnit: personForm.ext.certificationUnit, // 颁发证件单位，
-            address: personForm.ext.address// 住址
+            address: personForm.ext.address, // 住址
+            isKaoqin: personForm.ext.isKaoqin,
+            isOt: personForm.ext.isOt,
+            isZhuanwu: personForm.ext.isZhuanwu,
+            isLeader: personForm.ext.isLeader,
+            initAnnualLeave: personForm.ext.initAnnualLeave,
+            annualLeave: personForm.ext.annualLeave
           }
         }
         if (personForm.photo !== '') {
@@ -368,7 +506,13 @@
         photo: '',
         ext: {
           certificationUnit: '', // 颁发证件单位，
-          address: ''// 住址
+          address: '', // 住址
+          isKaoqin: '',
+          isOt: '',
+          isZhuanwu: '',
+          isLeader: '',
+          initAnnualLeave: '',
+          annualLeave: ''
         }
       }
       this.photo = ''
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 9216c82..9450c45 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -72,10 +72,11 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson } from '@/api/person'
-import { getToken } from '@/utils/auth' // getToken from cookie
-import { getProject } from '@/utils/baseConfig'
-import { isIE } from '@/utils/browser'
+// import { getToken } from '@/utils/auth' // getToken from cookie
+// import { getProject } from '@/utils/baseConfig'
+// import { isIE } from '@/utils/browser'
 import { downloadFile } from '@/utils/downloadUtils'
+import { attendanceEnable } from '@/main.js'
 
 export default {
   name: 'ListStaff',
@@ -93,55 +94,95 @@
         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: 'dutyName',
-          align: 'center'
-        },
-        {
-          text: '备注',
-          value: 'remarks',
-          width: 140,
-          align: 'center'
-        }
-      ], // 显示列
+      columns: [], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       sexList: [], // 性别列表
       dutyList: [], // 职务列表
-      listLoading: true, // 加载动画
+      listLoading: false, // 加载动画
       fullscreenLoading: false // 全屏加载动画
     }
   },
   mounted() {
+    debugger
+    this.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: 'dutyName',
+        align: 'center'
+      },
+      {
+        text: '备注',
+        value: 'remarks',
+        width: 140,
+        align: 'center'
+      }
+    ]
+    if (attendanceEnable === true) {
+      this.columns.push(
+        {
+          text: '考勤',
+          value: 'isKaoqinName',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '统计加班',
+          value: 'isOt',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '专务',
+          value: 'isZhuanwu',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '部门正职领导',
+          value: 'idLeader',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '年假（天）',
+          value: 'initAnnualLeave',
+          align: 'center'
+        })
+      this.columns.push(
+        {
+          text: '剩余年假（天）',
+          value: 'annualLeave',
+          align: 'center'
+        })
+    }
     this.fetchSexType()// 获取性别列表
     this.fetchDutyType() // 获取职务列表
     this.fetchData()// 获取数据
@@ -235,7 +276,7 @@
     },
     // 获取集中器数据
     fetchData(isNowPage = true) {
-      this.listLoading = true
+      this.listLoading = false
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index b60eaff..c0318db 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -10,13 +10,13 @@
             <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in doorList"-->
-                <!--:key="item.id"-->
-                <!--:label="item.doorName"-->
-                <!--:value="item.doorCode"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in doorList"-->
+          <!--:key="item.id"-->
+          <!--:label="item.doorName"-->
+          <!--:value="item.doorCode"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">