diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    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 bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })
diff --git a/src/views/attendance/regular.vue b/src/views/attendance/regular.vue
deleted file mode 100644
index 0fac7f8..0000000
--- a/src/views/attendance/regular.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<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 bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })
diff --git a/src/views/attendance/regular.vue b/src/views/attendance/regular.vue
deleted file mode 100644
index 0fac7f8..0000000
--- a/src/views/attendance/regular.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<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
index 5ab4934..8f7a301 100644
--- a/src/views/attendance/specialDay.vue
+++ b/src/views/attendance/specialDay.vue
@@ -18,7 +18,6 @@
       <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"
@@ -31,10 +30,13 @@
             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>
+          <download-template ref="downloadTemplate" :filename="filename" />
+          <el-button class="edit_btn" size="small" @click="del">删除</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--<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 v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border @selection-change="handleSelectionChange">
         <!--批量选择勾选框列-->
         <el-table-column align="center" type="selection" width="55"/>
         <!--序号列-->
@@ -50,7 +52,6 @@
         <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>
@@ -73,12 +74,13 @@
 </template>
 <script>
 
-import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import { getSpecialDayList, delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
 import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 
 export default {
   name: 'SpecialDay',
-  components: { EditSpecialDay },
+  components: { EditSpecialDay, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -110,10 +112,12 @@
           align: 'center'
         }
       ], // 显示列
-      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       fileList: [], // 上传文件列表
-      listLoading: false // 列表加载动画
+      listLoading: true, // 列表加载动画
+      multipleSelection: [], // 多选选中项
+      filename: 'specialDayTemp.xlsx'
     }
   },
   watch: {},
@@ -124,6 +128,14 @@
     this.fetchData(false)
   },
   methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 编辑特殊考勤日
     edit(row) {
       this.dialogFormVisible = true
@@ -137,26 +149,33 @@
       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()
-          }
+    del() {
+      if (this.checkSelection()) {
+        const ids = []
+        this.multipleSelection.forEach(function(value, index) {
+          ids.push(value.id)
+          console.log(value.id)
         })
-      })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选特殊考勤日吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delSpecialDay(ids).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
     },
     // 查询数据
     search() {
@@ -164,21 +183,19 @@
     },
     // 获取列表
     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() {
+      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
+      })
     },
     // 批量导入
     uploadFile(param) {
@@ -222,6 +239,10 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     }
   }
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })
diff --git a/src/views/attendance/regular.vue b/src/views/attendance/regular.vue
deleted file mode 100644
index 0fac7f8..0000000
--- a/src/views/attendance/regular.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<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
index 5ab4934..8f7a301 100644
--- a/src/views/attendance/specialDay.vue
+++ b/src/views/attendance/specialDay.vue
@@ -18,7 +18,6 @@
       <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"
@@ -31,10 +30,13 @@
             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>
+          <download-template ref="downloadTemplate" :filename="filename" />
+          <el-button class="edit_btn" size="small" @click="del">删除</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--<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 v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border @selection-change="handleSelectionChange">
         <!--批量选择勾选框列-->
         <el-table-column align="center" type="selection" width="55"/>
         <!--序号列-->
@@ -50,7 +52,6 @@
         <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>
@@ -73,12 +74,13 @@
 </template>
 <script>
 
-import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import { getSpecialDayList, delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
 import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 
 export default {
   name: 'SpecialDay',
-  components: { EditSpecialDay },
+  components: { EditSpecialDay, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -110,10 +112,12 @@
           align: 'center'
         }
       ], // 显示列
-      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       fileList: [], // 上传文件列表
-      listLoading: false // 列表加载动画
+      listLoading: true, // 列表加载动画
+      multipleSelection: [], // 多选选中项
+      filename: 'specialDayTemp.xlsx'
     }
   },
   watch: {},
@@ -124,6 +128,14 @@
     this.fetchData(false)
   },
   methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 编辑特殊考勤日
     edit(row) {
       this.dialogFormVisible = true
@@ -137,26 +149,33 @@
       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()
-          }
+    del() {
+      if (this.checkSelection()) {
+        const ids = []
+        this.multipleSelection.forEach(function(value, index) {
+          ids.push(value.id)
+          console.log(value.id)
         })
-      })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选特殊考勤日吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delSpecialDay(ids).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
     },
     // 查询数据
     search() {
@@ -164,21 +183,19 @@
     },
     // 获取列表
     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() {
+      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
+      })
     },
     // 批量导入
     uploadFile(param) {
@@ -222,6 +239,10 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <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 { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })
diff --git a/src/views/attendance/regular.vue b/src/views/attendance/regular.vue
deleted file mode 100644
index 0fac7f8..0000000
--- a/src/views/attendance/regular.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<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
index 5ab4934..8f7a301 100644
--- a/src/views/attendance/specialDay.vue
+++ b/src/views/attendance/specialDay.vue
@@ -18,7 +18,6 @@
       <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"
@@ -31,10 +30,13 @@
             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>
+          <download-template ref="downloadTemplate" :filename="filename" />
+          <el-button class="edit_btn" size="small" @click="del">删除</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--<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 v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border @selection-change="handleSelectionChange">
         <!--批量选择勾选框列-->
         <el-table-column align="center" type="selection" width="55"/>
         <!--序号列-->
@@ -50,7 +52,6 @@
         <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>
@@ -73,12 +74,13 @@
 </template>
 <script>
 
-import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import { getSpecialDayList, delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
 import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 
 export default {
   name: 'SpecialDay',
-  components: { EditSpecialDay },
+  components: { EditSpecialDay, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -110,10 +112,12 @@
           align: 'center'
         }
       ], // 显示列
-      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       fileList: [], // 上传文件列表
-      listLoading: false // 列表加载动画
+      listLoading: true, // 列表加载动画
+      multipleSelection: [], // 多选选中项
+      filename: 'specialDayTemp.xlsx'
     }
   },
   watch: {},
@@ -124,6 +128,14 @@
     this.fetchData(false)
   },
   methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 编辑特殊考勤日
     edit(row) {
       this.dialogFormVisible = true
@@ -137,26 +149,33 @@
       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()
-          }
+    del() {
+      if (this.checkSelection()) {
+        const ids = []
+        this.multipleSelection.forEach(function(value, index) {
+          ids.push(value.id)
+          console.log(value.id)
         })
-      })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选特殊考勤日吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delSpecialDay(ids).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
     },
     // 查询数据
     search() {
@@ -164,21 +183,19 @@
     },
     // 获取列表
     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() {
+      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
+      })
     },
     // 批量导入
     uploadFile(param) {
@@ -222,6 +239,10 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <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 { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 159e1cf..875f90e 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -118,21 +118,21 @@
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
-                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="备注" prop="remarks">
-                <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -211,12 +211,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(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'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -243,12 +244,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })
diff --git a/src/views/attendance/regular.vue b/src/views/attendance/regular.vue
deleted file mode 100644
index 0fac7f8..0000000
--- a/src/views/attendance/regular.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<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
index 5ab4934..8f7a301 100644
--- a/src/views/attendance/specialDay.vue
+++ b/src/views/attendance/specialDay.vue
@@ -18,7 +18,6 @@
       <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"
@@ -31,10 +30,13 @@
             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>
+          <download-template ref="downloadTemplate" :filename="filename" />
+          <el-button class="edit_btn" size="small" @click="del">删除</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--<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 v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border @selection-change="handleSelectionChange">
         <!--批量选择勾选框列-->
         <el-table-column align="center" type="selection" width="55"/>
         <!--序号列-->
@@ -50,7 +52,6 @@
         <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>
@@ -73,12 +74,13 @@
 </template>
 <script>
 
-import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import { getSpecialDayList, delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
 import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 
 export default {
   name: 'SpecialDay',
-  components: { EditSpecialDay },
+  components: { EditSpecialDay, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -110,10 +112,12 @@
           align: 'center'
         }
       ], // 显示列
-      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       fileList: [], // 上传文件列表
-      listLoading: false // 列表加载动画
+      listLoading: true, // 列表加载动画
+      multipleSelection: [], // 多选选中项
+      filename: 'specialDayTemp.xlsx'
     }
   },
   watch: {},
@@ -124,6 +128,14 @@
     this.fetchData(false)
   },
   methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 编辑特殊考勤日
     edit(row) {
       this.dialogFormVisible = true
@@ -137,26 +149,33 @@
       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()
-          }
+    del() {
+      if (this.checkSelection()) {
+        const ids = []
+        this.multipleSelection.forEach(function(value, index) {
+          ids.push(value.id)
+          console.log(value.id)
         })
-      })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选特殊考勤日吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delSpecialDay(ids).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
     },
     // 查询数据
     search() {
@@ -164,21 +183,19 @@
     },
     // 获取列表
     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() {
+      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
+      })
     },
     // 批量导入
     uploadFile(param) {
@@ -222,6 +239,10 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <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 { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 159e1cf..875f90e 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -118,21 +118,21 @@
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
-                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="备注" prop="remarks">
-                <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -211,12 +211,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(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'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -243,12 +244,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1228fed..e78b02b 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -120,21 +120,21 @@
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
-                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="住址" prop="address">
-                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="备注" prop="remarks">
-                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -228,12 +228,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(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'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -260,12 +261,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))

diff --git a/config/dev.env.js b/config/dev.env.js
index bc033b0..3d7e78f 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://localhost:8093"'
   // BASE_API: '"http://192.168.0.18:8093"'
 })
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..d716c90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,3 +9,8 @@
   name: 'App'
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+</style>
diff --git a/src/api/attendance.js b/src/api/attendance.js
index c7e9922..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -4,23 +4,43 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-export function makeReport() {
+export function makeReport(params) {
   return request({
-    url: 'device/list',
+    url: 'makeReport/make',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 获取报表数据查询页的部门列表数据
+export function getDeptList() {
+  return request({
+    url: 'report/deptList',
     method: 'get'
   })
 }
-// 获取考勤规则
-export function getRegular() {
+
+// 获取报表数据列表
+export function getReportList(params) {
   return request({
-    url: 'device/list',
+    url: 'report/list',
+    method: 'get',
+    params
+  })
+}
+// 获取考勤规则
+export function getAtdRules() {
+  return request({
+    url: 'AtdRules/list',
     method: 'get'
   })
 }
 // 保存考勤规则
-export function updateRegular(params) {
+export function updateAtdRules(params) {
   return request({
-    url: 'device/listAll',
+    url: 'AtdRules/update',
     method: 'post',
     params
   })
@@ -30,28 +50,26 @@
   const param = new FormData()
   param.append('file', fileobj)
   return request({
-    url: 'irisCollect/batchImport',
+    url: 'specialDay/batchImport',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
   })
 }
 
-// 模板下载
-export function downloadTemplate(deviceType) {
+// 获取特殊考勤日
+export function getSpecialDayList(params) {
   return request({
-    url: 'device/model',
+    url: 'specialDay/list',
     method: 'get',
-    params: {
-      deviceType: deviceType
-    }
+    params
   })
 }
 
 // 添加特殊考勤日
 export function addSpecialDay(params) {
   return request({
-    url: 'device/add',
+    url: 'specialDay/add',
     method: 'post',
     params
   })
@@ -59,7 +77,7 @@
 // 修改特殊考勤日
 export function updateSpecialDay(params) {
   return request({
-    url: 'device/update',
+    url: 'specialDay/update',
     method: 'post',
     params
   })
@@ -67,7 +85,7 @@
 // 删除特殊考勤日
 export function delSpecialDay(ids) {
   return request({
-    url: 'device/delete',
+    url: 'specialDay/delete',
     method: 'post',
     params: {
       ids: ids
@@ -78,16 +96,10 @@
   })
 }
 
-export function getSpecialDayList() {
-  return request({
-    url: 'device/list',
-    method: 'get'
-  })
-}
 // 批量导出
-export function batchExportDevice(params) {
+export function batchExportReport(params) {
   return request({
-    url: 'device/batchExport',
+    url: 'report/batchExport',
     method: 'get',
     timeout: 120000,
     params,
@@ -97,7 +109,7 @@
 // 添加考勤备注
 export function addRemarks(params) {
   return request({
-    url: 'device/add',
+    url: 'remarks/add',
     method: 'post',
     params
   })
@@ -113,11 +125,38 @@
 }
 
 // 获取可备注的类型
-export function getRemarksTypeList(params) {
+export function getEnabledTypeList(params) {
   return request({
-    url: 'remarks/list',
+    url: 'remarks/enabledTypeList',
     method: 'get',
     params
   })
 }
 
+// 删除备注
+export function delRemarks(params) {
+  return request({
+    url: 'remarks/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/person.js b/src/api/person.js
index 7e250ba..4143c81 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -112,6 +112,17 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 批量导入
+export function batchImportPerson(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'person/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
 
 export function saveIris(params) {
   const formData = new FormData()
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index f7cf021..b444af2 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -39,10 +39,10 @@
     },
     children: [
       {
-        path: '/regular',
-        name: 'Regular',
-        component: () => import('@/views/attendance/regular'),
-        meta: { title: '考勤规则', icon: 'function', permission: ['/regular'] }
+        path: '/atdRules',
+        name: 'AtdRules',
+        component: () => import('@/views/attendance/atdRules'),
+        meta: { title: '考勤规则', icon: 'function', permission: ['/atdRules'] }
       },
       {
         path: '/specialDay',
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
new file mode 100644
index 0000000..3965d01
--- /dev/null
+++ b/src/views/attendance/atdRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <div v-if="showPage" class="app-container">
+    <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" 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="atdRulesForm.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="atdRulesForm.workTimeBegin"
+                :default-value = "atdRulesForm.workTimeBegin"
+                :picker-options="{selectableRange:`00:00:00 - ${(atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) ? (atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin : atdRulesForm.workTimeEnd) + ':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="上班时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="下班时间" prop="workTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.workTimeEnd"
+                :default-value = "atdRulesForm.workTimeEnd"
+                :picker-options="{selectableRange: `${(atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) ? (atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd : atdRulesForm.workTimeBegin) +':00' : '00:00:00'}-23:59:00`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.breakTimeBegin"
+                :default-value = "atdRulesForm.breakTimeBegin"
+                :picker-options="{selectableRange:`${atdRulesForm.workTimeBegin ? atdRulesForm.workTimeBegin+':00' : '00:00:00'} -${atdRulesForm.breakTimeEnd ? atdRulesForm.breakTimeEnd+':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                placeholder="休息开始时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="margin-left: 15px">
+            <el-form-item label="休息结束时间" prop="breakTimeEnd">
+              <el-time-picker
+                v-model="atdRulesForm.breakTimeEnd"
+                :default-value = "atdRulesForm.breakTimeEnd"
+                :picker-options="{selectableRange:`${atdRulesForm.breakTimeBegin ? atdRulesForm.breakTimeBegin+':00' : '00:00:00'} -${atdRulesForm.workTimeEnd ? atdRulesForm.workTimeEnd +':00' : '23:59:00'}`}"
+                format="HH:mm"
+                value-format="HH:mm:ss"
+                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="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</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="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</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 { getAtdRules, updateAtdRules } from '@/api/attendance'
+
+export default {
+  name: 'AtdRules',
+  data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
+    return {
+      showPage: false,
+      weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
+      // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
+      atdRulesForm: {
+        id: '',
+        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: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 处理工作日数据，转换为字符串
+          this.atdRulesForm.workDay = this.atdRulesForm.workDayArr.join(',')
+          console.log(this.atdRulesForm.workTimeBegin)
+          updateAtdRules(this.atdRulesForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+            }
+          })
+        }
+      })
+    },
+    // 获取数据
+    fetchData() {
+      getAtdRules().then(response => {
+        if (response.code === 200) {
+          this.atdRulesForm.id = response.data.id
+          this.atdRulesForm.workDayArr = response.data.workDay.split(',') // 处理工作日数据，转换为数组
+          this.atdRulesForm.workTimeBegin = response.data.workTimeBegin
+          this.atdRulesForm.workTimeEnd = response.data.workTimeEnd
+          this.atdRulesForm.breakTimeBegin = response.data.breakTimeBegin
+          this.atdRulesForm.breakTimeEnd = response.data.breakTimeEnd
+          this.atdRulesForm.delayBegin1 = response.data.delayBegin1
+          this.atdRulesForm.delayBegin2 = response.data.delayBegin2
+        }
+        this.showPage = true
+      })
+    },
+    // 放弃修改
+    cancel() {
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 58aa8f3..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="closeDialog">
       <!--查询结果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-button :disabled="remarksTypeList.length === 0 || listLoading" 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">
@@ -29,26 +28,26 @@
             <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-option v-for="item in remarksTypeList" :key="item.id" :label="item.name" :value="item.id"/>
                 </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-form-item label="备注信息" prop="remarks">
+                <el-select v-model="remarksForm.remarks" placeholder="必填" clearable>
+                  <el-option v-for="item in remarksList" :key="item.value" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksType=='5' && remarksForm.remarksInfo!='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarksType === '5' && remarksForm.remarks!='请假-哺乳假'" 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"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -58,15 +57,15 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="remarksForm.remarksInfo=='10'" type="flex" justify="center">
+          <el-row v-if="remarksForm.remarks === '请假-哺乳假'" 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-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>
@@ -77,21 +76,21 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="系统自动计算截止日期为一年后"/>
+                  value-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 v-if="remarksForm.remarks === '其他原因'" 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-form-item v-if="remarksForm.remarks === '其他原因'" 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 :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -100,7 +99,7 @@
 </template>
 
 <script>
-import { addRemarks, getRemarksList, getRemarksTypeList } from '@/api/attendance'
+import { addRemarks, getRemarksList, getEnabledTypeList, delRemarks } from '@/api/attendance'
 
 export default {
   name: 'EditRemarks',
@@ -116,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -139,9 +137,11 @@
       checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       remarksForm: {
+        id: '',
+        reportId: '',
         personId: '',
         remarksType: '',
-        remarksInfo: '',
+        remarks: '',
         beginDate: '',
         endDate: '',
         breastfeedType: '',
@@ -152,7 +152,7 @@
       title: '', // 表头显示标题
       rules: {
         remarksType: [{ required: true, message: '备注类型不能为空', trigger: ['change'] }],
-        remarksInfo: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
+        remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }],
         beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }],
         breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }],
         breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }],
@@ -164,22 +164,17 @@
       columns: [
         {
           text: '备注类型',
-          value: 'remarksType',
+          value: 'remarksTypeName',
           align: 'center'
         },
         {
           text: '备注信息',
-          value: 'remarksInfo',
+          value: 'remarks',
           align: 'center'
         }
       ], // 显示列
-      remarksTypeList: [
-        { name: '迟到', value: '1' },
-        { name: '早退', value: '2' },
-        { name: '上午旷工', value: '3' },
-        { name: '下午旷工', value: '4' },
-        { name: '旷工一天', value: '5' }],
-      remarksInfoList: [
+      remarksTypeList: [],
+      remarksList: [
         { name: '出差', value: '1' },
         { name: '请假-年假', value: '2' },
         { name: '请假-事假', value: '3' },
@@ -194,43 +189,51 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
   watch: { },
-  mounted() {
-    this.fetchRemarksType()
-    this.fetchData()
-  },
+  mounted() { },
   methods: {
+    closeDialog() {
+      this.list = []
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
+    },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     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.remarksForm.reportId = row.id
+      this.remarksForm.personId = row.personId
       this.dialogFormVisible = dialogFormVisible
+      this.fetchRemarksType()
+      this.fetchData()
     },
     // 重置表单
     resetForm() {
-      this.remarksForm = {
-        id: '',
-        remarksType: '',
-        remarksInfo: '',
-        beginDate: '',
-        endDate: '',
-        breastfeedType: '',
-        breastfeedBeginDate: '',
-        other: '',
-        onBusiness: ''
-      }
+      this.remarksForm.id = ''
+      this.remarksForm.remarksType = ''
+      this.remarksForm.remarks = ''
+      this.remarksForm.beginDate = ''
+      this.remarksForm.endDate = ''
+      this.remarksForm.breastfeedType = ''
+      this.remarksForm.breastfeedBeginDate = ''
+      this.remarksForm.other = ''
+      this.remarksForm.onBusiness = ''
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -248,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,29 +258,78 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$message.success('通过校验！')
+          debugger
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.fetchData()
-          //     this.addShow = false
-          //     this.$message.success('添加成功！')
-          //   }
-          // }).catch(err => {
-          //   console.log(err)
+            if (response.code === 200) {
+              this.fetchData()
+              this.fetchRemarksType()
+              this.addShow = false
+              this.$message.success('添加成功！')
+              this.edited = true
+            }
+            this.saveBtnDisabeld = false
+          }).catch(err => {
+            console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
     },
-    // 获取备注列表
-    fetchData() {
-      getRemarksList().then(response => {
-        if (response.code === 200) {
-          this.list = response.data.rows
+    // 删除备注
+    del(row) {
+      this.$confirm(
+        '确定要删除该条备注信息吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
+      ).then(() => {
+        var params = {}
+        params.reportId = this.remarksForm.reportId
+        params.remarksId = row.id
+        delRemarks(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+            this.fetchRemarksType()
+            this.edited = true
+          }
+        })
       })
     },
+    // 获取已添加的备注信息列表
+    fetchData() {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      getRemarksList(params).then(response => {
+        if (response.code === 200) {
+          this.list = response.data
+        }
+        this.listLoading = false
+      })
+    },
+    // 获取可添加的备注类型列表
     fetchRemarksType() {
-      getRemarksTypeList().then(response => {
+      var params = {}
+      params.personId = this.remarksForm.personId
+      params.date = this.curDate
+      params.reportId = this.remarksForm.reportId
+      getEnabledTypeList(params).then(response => {
         if (response.code === 200) {
           this.remarksTypeList = response.data
         }
diff --git a/src/views/attendance/editSpecialDay.vue b/src/views/attendance/editSpecialDay.vue
index b416ddc..2365864 100644
--- a/src/views/attendance/editSpecialDay.vue
+++ b/src/views/attendance/editSpecialDay.vue
@@ -14,7 +14,7 @@
             <el-date-picker
               v-model="specialDayForm.beginDate"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="开始日期"/>
           </el-form-item>
         </el-col>
@@ -25,8 +25,8 @@
             <el-date-picker
               v-model="specialDayForm.endDate"
               type="date"
-              format="yyyy-MM-dd"
-              placeholder="开始日期"/>
+              value-format="yyyy-MM-dd"
+              placeholder="结束日期"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -53,7 +53,6 @@
   name: 'EditSpecialDay',
   data() {
     return {
-      checkList: [],
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       specialDayForm: {
@@ -84,7 +83,6 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.checkList = []
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       this.$nextTick(() => {
@@ -115,6 +113,7 @@
     },
     // 保存数据
     saveData: function() {
+      console.log(this.dialogStatus)
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -123,15 +122,10 @@
     },
     // 新增数据
     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 => {
+          debugger
+          addSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
@@ -153,20 +147,16 @@
     },
     // 修改数据
     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 => {
+          console.log(this.specialDayForm.beginDate)
+          updateSpecialDay(this.specialDayForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.message)
             }
           })
         }
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index 92a5c6a..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -6,7 +6,14 @@
       <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="部门"/>
+            <!--<dept-select v-model="listQuery.deptid" :need-top="false" placeholder="部门"/>-->
+            <el-select :disabled="deptDisabled" v-model="listQuery.deptid" placeholder="部门" clearable value="">
+              <el-option
+                v-for="item in deptList"
+                :key="item.id"
+                :label="item.simplename"
+                :value="item.id"/>
+            </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
@@ -15,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -23,19 +30,19 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-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-checkbox v-model="listQuery.isMark" style="width: 160px; height: 30px" 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-checkbox v-model="listQuery.isAbnormal" style="width: 160px; height: 30px" border checked>仅显示异常</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-button class="filter-item" type="primary" size="small" @click="syn">重新获取识别记录</el-button>
         </el-row>
       </el-form>
     </div>
@@ -44,10 +51,10 @@
       <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-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" ref="table" :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">
@@ -57,7 +64,7 @@
         </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>
+            <el-button :disabled="scope.row.canEdit === '0'" type="text" @click="edit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import DeptSelect from '@/components/DeptSelect'
 import EditRemarks from './editRemarks'
-// import { downloadFile } from '@/utils/downloadUtils'
+import SyncAndGenerate from './syncAndGenerate'
+import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks, DeptSelect },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -104,7 +113,7 @@
       columns: [
         {
           text: '部门',
-          value: 'department',
+          value: 'deptName',
           align: 'center'
         },
         {
@@ -118,21 +127,21 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
-          align: 'center',
-          width: 180
+          width: 180,
+          align: 'center'
         },
         {
           text: '迟到(m)',
           value: 'late',
-          width: 140,
+          width: 80,
           align: 'center'
         },
         {
           text: '早退(m)',
           value: 'early',
-          width: 110,
+          width: 80,
           align: 'center'
         },
         {
@@ -144,33 +153,37 @@
         {
           text: '下午旷工(h)',
           value: 'absentPm',
+          width: 100,
           align: 'center'
         },
         {
           text: '旷工一天',
           value: 'absentOneDay',
+          width: 90,
           align: 'center'
         },
         {
           text: '备注信息',
           value: 'remarks',
+          width: 220,
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
-      list: [{ department: '人力', name: '张三', date: '2020-10-01', time: '2020-10-07', late: '1', early: '2', absentAm: '1', absentPm: '3', absentOneDay: '-', remarks: '' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      dialogFormVisible: ''
+      dialogFormVisible: '',
+      deptList: [],
+      deptDisabled: false
     }
   },
   watch: {},
   mounted() {
-    this.fetchData()// 获取数据
+    this.getDeptSource()
   },
   activated() {
-    this.fetchData(false)
   },
   methods: {
     // 检查选择情况
@@ -181,60 +194,31 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.$router.push({ path: '/addVisitor', query: { type: 'create', personType: '0' }})
-    },
     // 编辑备注
     edit(row) {
       this.dialogFormVisible = true
-      // this.editShow = 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('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     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()
-      // })
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportReport(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '考勤报表数据')
+      }).catch((res) => {
+        loading.close()
+      })
     },
     // 查询数据
     search() {
@@ -242,15 +226,16 @@
     },
     // 获取数据
     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
-      // })
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      console.log(this.listQuery.date)
+      getReportList(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
@@ -264,6 +249,17 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 获取部门列表
+    getDeptSource() {
+      getDeptList().then(response => {
+        this.deptList = response.data
+        if (this.deptList.length === 1) {
+          this.deptDisabled = true
+          this.listQuery.deptid = this.deptList[0].id
+        }
+        this.fetchData(false)// 获取数据
+      })
     }
   }
 }
@@ -302,4 +298,10 @@
   .selectForm-container-item{
     width: 160px;
   }
+  body .el-table th.gutter{
+    display: table-cell!important;
+  }
+  /*.filter-item{*/
+    /*height: 30px;*/
+  /*}*/
 </style>
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7e4da1b..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,8 +9,10 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
+                value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
           </el-col>
@@ -25,6 +27,7 @@
 
 <script>
 import { makeReport } from '@/api/attendance'
+import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'MakeReport',
@@ -35,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
@@ -44,8 +53,18 @@
       // 表单校验
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          makeReport(this.month).then(response => {
-
+          // 全屏加载动画
+          const loading = this.$loading({
+            lock: true,
+            text: '数据处理中,请稍后...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          makeReport(this.form).then(response => {
+            loading.close()
+            downloadFile(response.data, '考勤报表')
+          }).catch((res) => {
+            loading.close()
           })
         }
       })
diff --git a/src/views/attendance/regular.vue b/src/views/attendance/regular.vue
deleted file mode 100644
index 0fac7f8..0000000
--- a/src/views/attendance/regular.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<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
index 5ab4934..8f7a301 100644
--- a/src/views/attendance/specialDay.vue
+++ b/src/views/attendance/specialDay.vue
@@ -18,7 +18,6 @@
       <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"
@@ -31,10 +30,13 @@
             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>
+          <download-template ref="downloadTemplate" :filename="filename" />
+          <el-button class="edit_btn" size="small" @click="del">删除</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+          <!--<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 v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border @selection-change="handleSelectionChange">
         <!--批量选择勾选框列-->
         <el-table-column align="center" type="selection" width="55"/>
         <!--序号列-->
@@ -50,7 +52,6 @@
         <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>
@@ -73,12 +74,13 @@
 </template>
 <script>
 
-import { delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
+import { getSpecialDayList, delSpecialDay, batchImportSpecialDay } from '@/api/attendance'
 import EditSpecialDay from './editSpecialDay' // getRegular, updateRegular, downloadTemplate, getSpecialDayList  ,
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 
 export default {
   name: 'SpecialDay',
-  components: { EditSpecialDay },
+  components: { EditSpecialDay, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -110,10 +112,12 @@
           align: 'center'
         }
       ], // 显示列
-      list: [{ name: '国庆节', beginDate: '2010-10-01', endDate: '2020-10-07', isKaoqin: '1', isKaoqinName: '是' }], // 列表数据
+      list: [], // 列表数据
       total: 0, // 数据总数
       fileList: [], // 上传文件列表
-      listLoading: false // 列表加载动画
+      listLoading: true, // 列表加载动画
+      multipleSelection: [], // 多选选中项
+      filename: 'specialDayTemp.xlsx'
     }
   },
   watch: {},
@@ -124,6 +128,14 @@
     this.fetchData(false)
   },
   methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
     // 编辑特殊考勤日
     edit(row) {
       this.dialogFormVisible = true
@@ -137,26 +149,33 @@
       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()
-          }
+    del() {
+      if (this.checkSelection()) {
+        const ids = []
+        this.multipleSelection.forEach(function(value, index) {
+          ids.push(value.id)
+          console.log(value.id)
         })
-      })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选特殊考勤日吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delSpecialDay(ids).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
     },
     // 查询数据
     search() {
@@ -164,21 +183,19 @@
     },
     // 获取列表
     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() {
+      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
+      })
     },
     // 批量导入
     uploadFile(param) {
@@ -222,6 +239,10 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <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 { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 159e1cf..875f90e 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -118,21 +118,21 @@
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
-                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="备注" prop="remarks">
-                <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -211,12 +211,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(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'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -243,12 +244,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1228fed..e78b02b 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -120,21 +120,21 @@
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
-                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="住址" prop="address">
-                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="备注" prop="remarks">
-                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -228,12 +228,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(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'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -260,12 +261,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 62809ed..65cfd72 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,6 +31,20 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="attendanceEnable" class="edit_btn" size="small" @click="initAnnualLeave">初始化剩余年假</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>
+          <download-template ref="downloadTemplate" :filename="filename" />
           <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
@@ -42,10 +56,10 @@
         <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>
+            <span>{{ scope.row.ext[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center" width="140">
           <template slot-scope="scope">
             <el-button v-if="hasPerm('/staff/update')" type="text" @click="edit(scope.row)">编辑</el-button>
             <el-button v-if="hasPerm('/iris')&& scope.row['isRegist']=='0'" type="text" @click="registerIris(scope.row)">注册虹膜</el-button>
@@ -71,16 +85,18 @@
 </template>
 <script>
 import DeptSelect from '@/components/DeptSelect'
-import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson } from '@/api/person'
+import { getPersonList, getSexType, getDutyType, delPerson, batchExportPerson, batchImportPerson } from '@/api/person'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 // 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'
+import { initAnnualLeave } from '@/api/attendance'
 
 export default {
   name: 'ListStaff',
-  components: { DeptSelect },
+  components: { DeptSelect, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -101,11 +117,13 @@
       sexList: [], // 性别列表
       dutyList: [], // 职务列表
       listLoading: false, // 加载动画
-      fullscreenLoading: false // 全屏加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      filename: 'personAtdTemp.xlsx',
+      attendanceEnable: attendanceEnable,
+      fileList: []
     }
   },
   mounted() {
-    debugger
     this.columns = [
       {
         text: '员工编号',
@@ -137,13 +155,14 @@
         text: '职务',
         value: 'dutyName',
         align: 'center'
-      },
-      {
-        text: '备注',
-        value: 'remarks',
-        width: 140,
-        align: 'center'
       }
+      // ,
+      // {
+      //   text: '备注',
+      //   value: 'remarks',
+      //   width: 140,
+      //   align: 'center'
+      // }
     ]
     if (attendanceEnable === true) {
       this.columns.push(
@@ -155,30 +174,30 @@
       this.columns.push(
         {
           text: '统计加班',
-          value: 'isOt',
+          value: 'isOtName',
           align: 'center'
         })
       this.columns.push(
         {
           text: '专务',
-          value: 'isZhuanwu',
+          value: 'isZhuanwuName',
           align: 'center'
         })
       this.columns.push(
         {
           text: '部门正职领导',
-          value: 'idLeader',
+          value: 'isLeaderName',
           align: 'center'
         })
       this.columns.push(
         {
-          text: '年假（天）',
+          text: '年假/天',
           value: 'initAnnualLeave',
           align: 'center'
         })
       this.columns.push(
         {
-          text: '剩余年假（天）',
+          text: '剩余年假/天',
           value: 'annualLeave',
           align: 'center'
         })
@@ -234,24 +253,11 @@
         this.$message.error('至少选中一项')
       }
     },
-    registerIris(row) {
-      // const token = getToken()
-      // const id = row.id
-      // const idCardNo = row.idCardNo
-      // const baseUrl = getProject().register_url
-      // if (isIE()) {
-      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-      //   window.open(url, '_blank')
-      // } else {
-      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-      //   window.location.href = url
-      // }
-      this.$router.push({
-        path: '/addIris',
-        query: {
-          personId: row.id,
-          idCardNo: row.idCardNo,
-          type: 'staff'
+    initAnnualLeave() {
+      initAnnualLeave().then(response => {
+        if (response.code === 200) {
+          this.$message.success('重置成功')
+          this.fetchData()
         }
       })
     },
@@ -271,6 +277,35 @@
         loading.close()
       })
     },
+    // 批量导入
+    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)'
+      })
+      // 发起导入请求
+      batchImportPerson(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData(false)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+      this.fileList = []
+    },
     // 查询数据
     search() {
       this.fetchData(false)