diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 70b9edd..4c8d87b 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 70b9edd..4c8d87b 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/transferstationManage/editTransferstation.vue b/src/views/transferstationManage/editTransferstation.vue
index e92e9e3..f8e2334 100644
--- a/src/views/transferstationManage/editTransferstation.vue
+++ b/src/views/transferstationManage/editTransferstation.vue
@@ -62,8 +62,8 @@
                 <el-date-picker
                   v-model.trim="transferstationForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -88,6 +88,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -98,6 +99,8 @@
               accept=".jpg,.jpeg,.png">
               <el-button type="primary">点击上传照片</el-button>
             </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
           </el-row>
         </div>
       </div>
@@ -107,6 +110,7 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
@@ -114,14 +118,16 @@
 import { addTransferstation, updateTransferstation } from '@/api/sanitation/transferstation'
 import { Uploadimg } from '@/api/common'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 
 export default {
   name: 'EditTransferstation',
+  components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/transferStationPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       transferstationForm: {
@@ -195,6 +201,7 @@
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -213,6 +220,7 @@
           area: row.area, // 占地面积
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -344,14 +352,18 @@
         this.$message.warning(response.message)
       }
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.transferstationForm.lng && this.transferstationForm.lat) {
+        position = { lng: this.transferstationForm.lng, lat: this.transferstationForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.transferstationForm, 'lng', marker.lng)
+      this.$set(this.transferstationForm, 'lat', marker.lat)
     },
     cancel: function() {
       this.dialogFormVisible = false

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 70b9edd..4c8d87b 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/transferstationManage/editTransferstation.vue b/src/views/transferstationManage/editTransferstation.vue
index e92e9e3..f8e2334 100644
--- a/src/views/transferstationManage/editTransferstation.vue
+++ b/src/views/transferstationManage/editTransferstation.vue
@@ -62,8 +62,8 @@
                 <el-date-picker
                   v-model.trim="transferstationForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -88,6 +88,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -98,6 +99,8 @@
               accept=".jpg,.jpeg,.png">
               <el-button type="primary">点击上传照片</el-button>
             </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
           </el-row>
         </div>
       </div>
@@ -107,6 +110,7 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
@@ -114,14 +118,16 @@
 import { addTransferstation, updateTransferstation } from '@/api/sanitation/transferstation'
 import { Uploadimg } from '@/api/common'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 
 export default {
   name: 'EditTransferstation',
+  components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/transferStationPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       transferstationForm: {
@@ -195,6 +201,7 @@
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -213,6 +220,7 @@
           area: row.area, // 占地面积
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -344,14 +352,18 @@
         this.$message.warning(response.message)
       }
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.transferstationForm.lng && this.transferstationForm.lat) {
+        position = { lng: this.transferstationForm.lng, lat: this.transferstationForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.transferstationForm, 'lng', marker.lng)
+      this.$set(this.transferstationForm, 'lat', marker.lat)
     },
     cancel: function() {
       this.dialogFormVisible = false
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 6e4658c..8993f53 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/transferstation/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/transferstation/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/transferstation/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 70b9edd..4c8d87b 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/transferstationManage/editTransferstation.vue b/src/views/transferstationManage/editTransferstation.vue
index e92e9e3..f8e2334 100644
--- a/src/views/transferstationManage/editTransferstation.vue
+++ b/src/views/transferstationManage/editTransferstation.vue
@@ -62,8 +62,8 @@
                 <el-date-picker
                   v-model.trim="transferstationForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -88,6 +88,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -98,6 +99,8 @@
               accept=".jpg,.jpeg,.png">
               <el-button type="primary">点击上传照片</el-button>
             </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
           </el-row>
         </div>
       </div>
@@ -107,6 +110,7 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
@@ -114,14 +118,16 @@
 import { addTransferstation, updateTransferstation } from '@/api/sanitation/transferstation'
 import { Uploadimg } from '@/api/common'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 
 export default {
   name: 'EditTransferstation',
+  components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/transferStationPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       transferstationForm: {
@@ -195,6 +201,7 @@
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -213,6 +220,7 @@
           area: row.area, // 占地面积
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -344,14 +352,18 @@
         this.$message.warning(response.message)
       }
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.transferstationForm.lng && this.transferstationForm.lat) {
+        position = { lng: this.transferstationForm.lng, lat: this.transferstationForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.transferstationForm, 'lng', marker.lng)
+      this.$set(this.transferstationForm, 'lat', marker.lat)
     },
     cancel: function() {
       this.dialogFormVisible = false
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 6e4658c..8993f53 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/transferstation/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/transferstation/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/transferstation/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index bf0c78d..24b2bd5 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -36,7 +36,10 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="经度" prop="lng">
-                <el-input v-model.trim="wastebinForm.lng" :disabled="isDetailMode" type="text" placeholder="经度，如：116.4"/>
+                <el-input v-model.trim="wastebinForm.lng" :disabled="isDetailMode" type="text" placeholder="经度，如：116.4">
+                  <el-button v-if="!isDetailMode" slot="append" icon="el-icon-map-location" @click="choosePoint('edit')"/>
+                  <el-button v-if="isDetailMode" slot="append" icon="el-icon-map-location" @click="choosePoint('readonly')"/>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -81,14 +84,18 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <!--地图选点-->
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
 <script>
 import { addWastebin, updateWastebin } from '@/api/sanitation/wastebin'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 export default {
   name: 'EditWastebin',
+  components: { ChoosePointDialog },
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
@@ -204,16 +211,6 @@
     },
     // 保存数据
     saveData: function() {
-      // 照片不为空则对照片进行处理
-      if (this.photo !== '') {
-        if (this.photo.startsWith('http')) { // 上传的普通图片
-          let index = this.photo.indexOf('/static/')
-          if (index !== -1) {
-            index += 8
-          }
-          this.wastebinForm.photo = this.photo.substring(index)
-        }
-      }
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -270,6 +267,19 @@
         }
       })
     },
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.wastebinForm.lng && this.wastebinForm.lat) {
+        position = { lng: this.wastebinForm.lng, lat: this.wastebinForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.wastebinForm, 'lng', marker.lng)
+      this.$set(this.wastebinForm, 'lat', marker.lat)
+    },
     // 获取垃圾桶类别
     fetchWastebinType() {
       getDictByType('wastebinType').then(response => {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 70b9edd..4c8d87b 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/transferstationManage/editTransferstation.vue b/src/views/transferstationManage/editTransferstation.vue
index e92e9e3..f8e2334 100644
--- a/src/views/transferstationManage/editTransferstation.vue
+++ b/src/views/transferstationManage/editTransferstation.vue
@@ -62,8 +62,8 @@
                 <el-date-picker
                   v-model.trim="transferstationForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -88,6 +88,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -98,6 +99,8 @@
               accept=".jpg,.jpeg,.png">
               <el-button type="primary">点击上传照片</el-button>
             </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
           </el-row>
         </div>
       </div>
@@ -107,6 +110,7 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
@@ -114,14 +118,16 @@
 import { addTransferstation, updateTransferstation } from '@/api/sanitation/transferstation'
 import { Uploadimg } from '@/api/common'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 
 export default {
   name: 'EditTransferstation',
+  components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/transferStationPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       transferstationForm: {
@@ -195,6 +201,7 @@
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -213,6 +220,7 @@
           area: row.area, // 占地面积
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -344,14 +352,18 @@
         this.$message.warning(response.message)
       }
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.transferstationForm.lng && this.transferstationForm.lat) {
+        position = { lng: this.transferstationForm.lng, lat: this.transferstationForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.transferstationForm, 'lng', marker.lng)
+      this.$set(this.transferstationForm, 'lat', marker.lat)
     },
     cancel: function() {
       this.dialogFormVisible = false
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 6e4658c..8993f53 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/transferstation/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/transferstation/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/transferstation/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index bf0c78d..24b2bd5 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -36,7 +36,10 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="经度" prop="lng">
-                <el-input v-model.trim="wastebinForm.lng" :disabled="isDetailMode" type="text" placeholder="经度，如：116.4"/>
+                <el-input v-model.trim="wastebinForm.lng" :disabled="isDetailMode" type="text" placeholder="经度，如：116.4">
+                  <el-button v-if="!isDetailMode" slot="append" icon="el-icon-map-location" @click="choosePoint('edit')"/>
+                  <el-button v-if="isDetailMode" slot="append" icon="el-icon-map-location" @click="choosePoint('readonly')"/>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -81,14 +84,18 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <!--地图选点-->
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
 <script>
 import { addWastebin, updateWastebin } from '@/api/sanitation/wastebin'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 export default {
   name: 'EditWastebin',
+  components: { ChoosePointDialog },
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
@@ -204,16 +211,6 @@
     },
     // 保存数据
     saveData: function() {
-      // 照片不为空则对照片进行处理
-      if (this.photo !== '') {
-        if (this.photo.startsWith('http')) { // 上传的普通图片
-          let index = this.photo.indexOf('/static/')
-          if (index !== -1) {
-            index += 8
-          }
-          this.wastebinForm.photo = this.photo.substring(index)
-        }
-      }
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -270,6 +267,19 @@
         }
       })
     },
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.wastebinForm.lng && this.wastebinForm.lat) {
+        position = { lng: this.wastebinForm.lng, lat: this.wastebinForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.wastebinForm, 'lng', marker.lng)
+      this.$set(this.wastebinForm, 'lat', marker.lat)
+    },
     // 获取垃圾桶类别
     fetchWastebinType() {
       getDictByType('wastebinType').then(response => {
diff --git a/src/views/wastebinManage/wastebinList.vue b/src/views/wastebinManage/wastebinList.vue
index 0ba1511..1e1d936 100644
--- a/src/views/wastebinManage/wastebinList.vue
+++ b/src/views/wastebinManage/wastebinList.vue
@@ -21,9 +21,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/wastebin/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/wastebin/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -33,14 +34,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/wastebin/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/wastebin/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/wastebin/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -86,12 +87,13 @@
         {
           text: '类别',
           value: 'typeName',
-          width: 165,
+          width: 100,
           align: 'center'
         },
         {
           text: '位置',
           value: 'position',
+          width: 190,
           align: 'center'
         },
         {

diff --git a/config/index.js b/config/index.js
index 8abd37a..40fc3b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/sanitation',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a0dc3de..f44a651 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
-  BASE_API: '"http://192.168.8.201:8083"'
+  BASE_API: '"http://111.198.10.15:11409"'
 }
diff --git a/src/api/common.js b/src/api/common.js
index 0d04929..76caba7 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 8abcfec..0133751 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -16,13 +16,11 @@
   })
 }
 // 车辆查询
-export function getCarList(pid) {
+export function getCarList(params) {
   return request({
-    url: '/car/busCarInfo/list',
+    url: '/car/busCarPosition/list',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 // 车辆详情
@@ -52,10 +50,10 @@
 // 删除车辆机构
 export function delCar(ids) {
   return request({
-    url: '/car/busCarInfo/delete',
+    url: '/car/busCarInfo/batchDelete',
     method: 'post',
     params: {
-      ids
+      busCarInfoIds: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
@@ -85,3 +83,12 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 车辆查询
+export function getCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/listPage',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index 46fa8f0..f215ea6 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -82,7 +82,7 @@
 // 人员出勤记录查询
 export function getAttendanceList(params) {
   return request({
-    url: '/sanitation/stuff/attendanceList',
+    url: '/sanitation/staff/attendanceList',
     method: 'get',
     params
   })
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..6dc667f
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,44 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 人员出勤统计
+export function getAttendancePercent(params) {
+  return request({
+    url: '/sanitation/stuff/attendancePercent',
+    method: 'get',
+    params
+  })
+}
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getTransferJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/transfer/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 垃圾清运次数统计
+export function getCleanJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/clean/jobCount',
+    method: 'get',
+    params
+  })
+}
+// 人员/设施统计
+export function getSingleCount(type) {
+  return request({
+    url: '/sanitation/statistic/' + type,
+    method: 'get'
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 0828bb4..04bc9dd 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -83,3 +83,24 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/wastebin.js b/src/api/sanitation/wastebin.js
index f4bc6bc..ce32cbe 100644
--- a/src/api/sanitation/wastebin.js
+++ b/src/api/sanitation/wastebin.js
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/area/update',
+    url: '/sanitation/wastebin/update',
     method: 'post',
     params
   })
diff --git a/src/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/assets/global_images/transferStationPhoto.png b/src/assets/global_images/transferStationPhoto.png
new file mode 100644
index 0000000..9967c96
--- /dev/null
+++ b/src/assets/global_images/transferStationPhoto.png
Binary files differ
diff --git a/src/assets/icons/icon-position.png b/src/assets/icons/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/icons/icon-position.png
Binary files differ
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 87f58c4..8a01533 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-    <svg-icon icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
+    <svg-icon v-if="hasPerm('/sanitation/overview')" icon-class="icon-overview" class-name="icon-overview" @click="goOverview"/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
diff --git a/src/main.js b/src/main.js
index b0ac18e..e14f3c2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,9 +8,6 @@
 
 import '@/styles/index.scss' // global css
 
-// 重置rem
-// import '@/utils/rem.js'
-
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 7db5a13..4395dde 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -21,20 +21,21 @@
     meta: {
       title: '人员管理',
       icon: 'icon-config', // 图标
-      sys: '/sanitation'
+      sys: '/sanitation',
+      permission: ['/sanitation/staff']
     },
     children: [
       {
         path: '/stafflist',
         name: 'StaffList',
         component: () => import('@/views/staffManage/staffList'),
-        meta: { title: '人员列表', icon: '' }
+        meta: { title: '人员列表', icon: '', permission: ['/sanitation/staff/listPage'] }
       },
       {
         path: '/attendancelist',
         name: 'AttendanceList',
         component: () => import('@/views/staffManage/attendanceList'),
-        meta: { title: '出勤记录', icon: '' }
+        meta: { title: '出勤记录', icon: '', permission: ['/sanitation/staff/attendanceList'] }
       }
     ]
   },
@@ -44,103 +45,105 @@
     redirect: '/wastbinlist',
     name: 'Device',
     alwaysShow: true,
+    permission: ['/sanitation/device'],
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-config' // 图标
+      icon: 'icon-wastebin' // 图标
     },
     children: [
       {
         path: '/wastbinlist',
         name: 'WastebinList',
         component: () => import('@/views/wastebinManage/wastebinList'),
-        meta: { title: '垃圾桶管理', icon: '' }
+        meta: { title: '垃圾桶管理', icon: '', permission: ['/sanitation/wastebin/list'] }
       },
       {
         path: '/toiletlist',
         name: 'ToiletList',
         component: () => import('@/views/toiletManage/toiletList'),
-        meta: { title: '公厕管理', icon: '' }
+        meta: { title: '公厕管理', icon: '', permission: ['/sanitation/toilet/list'] }
       },
       {
         path: '/transferstation',
         name: 'TransferstationList',
         component: () => import('@/views/transferstationManage/transferstationList'),
-        meta: { title: '垃圾中转站管理', icon: '' }
+        meta: { title: '垃圾中转站管理', icon: '', permission: ['/sanitation/transferstation/list'] }
       },
       {
         path: '/carlist',
         name: 'CarList',
         component: () => import('@/views/carManage/carList'),
-        meta: { title: '环卫车辆管理', icon: '' }
+        meta: { title: '环卫车辆管理', icon: '', permission: ['/sanitation/car/list'] }
       }
     ]
   },
   {
     path: '/route',
     component: Layout,
-    redirect: '/route/wastebin',
+    redirect: '/route/waste',
     name: 'Route',
     alwaysShow: true,
+    permission: ['/sanitation/route'],
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-config' // 图标
+      icon: 'icon-route' // 图标
     },
     children: [
       {
-        path: '/route/wastebin',
+        path: '/route/waste',
         name: 'WastebinJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '垃圾转运作业路线', icon: '' }
+        meta: { title: '垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste'] }
       },
       {
         path: '/route/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/routeManage/listRoute'),
-        meta: { title: '路面清扫作业路线', icon: '' }
+        meta: { title: '路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean'] }
       },
       {
-        path: '/route/add/wastebin',
+        path: '/route/add/waste',
         name: 'AddWasteBinRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增垃圾转运作业路线', icon: '' }
+        meta: { title: '新增垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/add'] }
       },
       {
         path: '/route/add/clean',
         name: 'AddCleanRoute',
         component: () => import('@/views/routeManage/addRoute'),
         hidden: true,
-        meta: { title: '新增路面清扫作业路线', icon: '' }
+        meta: { title: '新增路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/add'] }
       },
       {
         path: '/route/edit/waste',
         name: 'EditWasteBinRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑垃圾转运作业路线', icon: '' }
+        meta: { title: '编辑垃圾转运作业路线', icon: '', permission: ['/sanitation/route/waste/update'] }
       },
       {
         path: '/route/edit/clean',
         name: 'EditCleanRoute',
         component: () => import('@/views/routeManage/editRoute'),
         hidden: true,
-        meta: { title: '编辑路面清扫作业路线', icon: '' }
+        meta: { title: '编辑路面清扫作业路线', icon: '', permission: ['/sanitation/route/clean/update'] }
       },
       {
         path: '/route/detail/waste',
         name: 'DetailWasteBinRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '垃圾转运作业路线详情', icon: '' }
+        meta: { title: '垃圾转运作业路线详情', icon: '', permission: ['/sanitation/route/detail/waste'] }
       },
       {
         path: '/route/detail/clean',
         name: 'DetailCleanRoute',
         component: () => import('@/views/routeManage/detailRoute'),
         hidden: true,
-        meta: { title: '路面清扫作业路线详情', icon: '' }
+        meta: { title: '路面清扫作业路线详情', icon: '', permission: ['/sanitation/route/detail/clean'] }
       }
     ]
   },
@@ -150,29 +153,30 @@
     redirect: '/jobRecord/wastebin',
     name: 'Job',
     alwaysShow: true,
+    permission: ['/sanitation/job'],
     meta: {
       sys: '/sanitation',
       title: '作业管理',
-      icon: 'icon-config' // 图标
+      icon: 'task' // 图标
     },
     children: [
       {
         path: '/jobRecord/wastebin',
         name: 'WastebinJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '垃圾转运作业记录', icon: '' }
+        meta: { title: '垃圾转运作业记录', icon: '', permission: ['/sanitation/job/wastebin'] }
       },
       {
         path: '/jobRecord/clean',
         name: 'CleanJob',
         component: () => import('@/views/jobRecords/jobRecords'),
-        meta: { title: '路面清扫作业记录', icon: '' }
+        meta: { title: '路面清扫作业记录', icon: '', permission: ['/sanitation/job/clean'] }
       },
       {
-        path: '/toiletclean',
+        path: '/toiletJob/clean',
         name: 'ToiletClean',
         component: () => import('@/views/toiletClean/toiletCleanList'),
-        meta: { title: '公厕保洁作业记录', icon: '' }
+        meta: { title: '公厕保洁作业记录', icon: '', permission: ['/sanitation/toiletJob/clean'] }
       }
     ]
   },
@@ -182,6 +186,7 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
+    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
@@ -192,36 +197,45 @@
         path: '/assessment/staff',
         name: 'StaffAssessment',
         component: () => import('@/views/assessment/staffAssessment'),
-        meta: { title: '人员出勤统计', icon: '' }
+        meta: { title: '人员出勤统计', icon: '', permission: ['/sanitation/assessment/staff'] }
       },
       {
         path: '/assesment/wastebin',
         name: 'WastebinJo',
         component: () => import('@/views/assessment/wasteAssessment'),
-        meta: { title: '垃圾转运作业统计', icon: '' }
+        meta: { title: '垃圾转运作业统计', icon: '', permission: ['/sanitation/assesment/wastebin'] }
       },
       {
         path: '/assesment/clean',
         name: 'CleanJobRoute',
         component: () => import('@/views/assessment/cleanAssessment'),
-        meta: { title: '路面清扫作业统计', icon: '' }
+        meta: { title: '路面清扫作业统计', icon: '', permission: ['/sanitation/assesment/clean'] }
       },
       {
         path: '/assesment/toilet',
         name: 'ToiletJobRoute',
         component: () => import('@/views/assessment/toiletAssessment'),
-        meta: { title: '公厕保洁作业统计', icon: '' }
+        meta: { title: '公厕保洁作业统计', icon: '', permission: ['/sanitation/assesment/toilet'] }
       }
     ]
   },
   {
-    path: '/overview',
+    path: '/view',
     component: () => import('@/views/overview/overview'),
-    name: 'Overview',
-    alwaysShow: true,
+    name: 'view',
+    redirect: '/overview',
+    permission: ['/sanitation/overview'],
     meta: {
       sys: '/sanitation',
       title: '总览',
       icon: 'icon-config' // 图标
-    }
+    },
+    children: [
+      {
+        path: '/overview',
+        name: 'Overview',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '总览', icon: 'dashboard', permission: ['/sanitation/overview'] }
+      }
+    ]
   }]
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..4a986e3 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -9,21 +9,21 @@
   return new Date().Format(fmt)
 }
 
-export function getYesterDay() { // 默认显示昨天
+export function getYesterDay(fmt) { // 默认显示昨天
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index b2dbb49..97a1dc7 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'CleanAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getCleanJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '路面清扫作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日路面清扫作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月路面清扫作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index 8b0bc7c..b31811f 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -74,9 +74,8 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'StaffAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -84,7 +83,7 @@
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         staffType: '', // 人员类型
@@ -159,10 +158,11 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
+      // this.fetchData()
       this.listLoading = true
       this.list = [
         { name: '1月', total: 15, real: 5, percent: '32.23%' },
@@ -185,7 +185,8 @@
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
+      // this.fetchData()
+      // this.listLoading = true
       this.list = [
         { name: '1.1', total: 15, real: 5, percent: '32.23%' },
         { name: '1.2', total: 15, real: 5, percent: '32.23%' },
@@ -198,17 +199,19 @@
         { name: '1.9', total: 15, real: 5, percent: '32.23%' },
         { name: '1.10', total: 15, real: 5, percent: '32.23%' },
         { name: '1.11', total: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', total: 15, real: 5, percent: '32.23%' }
+        { name: '1.12', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.13', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.14', total: 15, real: 5, percent: '32.23%' },
+        { name: '1.15', total: 15, real: 5, percent: '32.23%' }
       ]
       this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getAttendancePercent(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
       })
     },
     // 批量导出
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index 673f626..9a4a872 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -62,18 +62,16 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'ToiletAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         toiletCode: '', // 公厕编号
@@ -132,7 +130,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +143,66 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '公厕保洁作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
@@ -215,12 +213,6 @@
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
-    // 获取人员类别
-    fetchPersonType(val) {
-      getDictByType('staffType').then(response => {
-        this.typeList = response.data
-      })
-    },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
       if (val && val.size) {
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index b2dbb49..cb8674e 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -63,17 +63,16 @@
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
 import { getDictByType } from '@/api/common'
-import { getStaffListPage, batchExportStaff } from '@/api/sanitation/staff'
-const start = new Date()
-start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
-  name: 'StaffAssessment',
+  name: 'WasteAssessment',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
   data() {
     return {
       activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
       year: '2021', // 按月统计面板中的查询年份
-      timeRange: [start, new Date()], // 按日统计面板中的日期范围
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
       listQuery: {
         type: '', // 统计方式，day按天，month按月
         carCode: '', // 车牌号
@@ -132,7 +131,6 @@
   },
   created() {
     this.searchByDay()
-    this.fetchPersonType()
   },
   methods: {
     // 切换面板
@@ -146,65 +144,65 @@
     // 按月统计
     searchByMonth() {
       const startTime = this.year + '-01-01'
-      const endTime = this.year + '12-31'
+      const endTime = this.year + '-12-31'
       this.listQuery.type = 'month'
       this.listQuery.startTime = startTime
       this.listQuery.endTime = endTime
-      this.listLoading = true
-      this.list = [
-        { name: '1月', count: 15, real: 5, percent: '32.23%' },
-        { name: '2月', count: 15, real: 5, percent: '32.23%' },
-        { name: '3月', count: 15, real: 5, percent: '32.23%' },
-        { name: '4月', count: 15, real: 5, percent: '32.23%' },
-        { name: '5月', count: 15, real: 5, percent: '32.23%' },
-        { name: '6月', count: 15, real: 5, percent: '32.23%' },
-        { name: '7月', count: 15, real: 5, percent: '32.23%' },
-        { name: '8月', count: 15, real: 5, percent: '32.23%' },
-        { name: '9月', count: 15, real: 5, percent: '32.23%' },
-        { name: '10月', count: 15, real: 5, percent: '32.23%' },
-        { name: '11月', count: 15, real: 5, percent: '32.23%' },
-        { name: '12月', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
       this.listQuery.startTime = this.timeRange[0]
       this.listQuery.endTime = this.timeRange[1]
-      this.listLoading = true
-      this.list = [
-        { name: '1.1', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.2', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.3', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.4', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.5', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.6', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.7', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.8', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.9', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.10', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.11', count: 15, real: 5, percent: '32.23%' },
-        { name: '1.12', count: 15, real: 5, percent: '32.23%' }
-      ]
-      this.listLoading = false
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
     },
     fetchData() {
       this.listLoading = true
-      const that = this
-      getStaffListPage(this.listQuery).then(response => {
-        that.list = response.data.rows
-        that.total = response.data.total
-        that.listLoading = false
+      getTransferJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
       })
     },
     // 批量导出
     batchExport() {
-      let tableName = '出勤统计.xlsx'
+      let tableName = '垃圾转运作业统计.xlsx'
       if (this.listQuery.type === 'day') {
-        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日出勤统计.xlsx'
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日垃圾转运作业统计.xlsx'
       } else if (this.listQuery.type === 'month') {
-        tableName = this.year + '年按月出勤统计.xlsx'
+        tableName = this.year + '年按月垃圾转运作业统计.xlsx'
       }
       /* generate workbook object from table */
       var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c0ae8df..9c5d759 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -23,9 +23,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/car/busCarInfo/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -35,14 +36,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/car/busCarInfo/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/car/busCarInfo/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/car/busCarInfo/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button carType="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -176,7 +177,7 @@
         }
       ).then(() => {
         delCar(staffIds).then(response => {
-          if (response.carCode === 200) {
+          if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()
           }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7e1ca38..590bc21 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -11,6 +11,11 @@
 
 <script>
 import Card from '@/components/BigData/Card'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   components: {
     Card
@@ -92,50 +97,76 @@
     this.getTransferStationCount()
     this.getCarCount()
     this.getWasteBinJobCount()
-    this.getCleanJobCount()
-    this.getToiletJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
   },
   methods: {
     goPage(path) {
       this.$router.push(path)
     },
     getStaffCount() {
-      this.dataGroup[4].context = 75
-      // wellCountByBfzt().then(response => {
-      //   this.dataGroup[0].context = response.data.total
-      // })
+      getSingleCount('staff').then(response => {
+        this.dataGroup[4].context = response.data
+      })
     },
     getToiletCount() {
-      this.dataGroup[0].context = 25
-      // deviceStaticByStatus().then(response => {
-      //   this.dataGroup[1].context = response.data.total
-      // })
+      getSingleCount('toilet').then(response => {
+        this.dataGroup[0].context = response.data
+      })
     },
     getWasteBinCount() {
-      this.dataGroup[1].context = 587
-      // alarmNowStatic().then(response => {
-      //   this.dataGroup[2].context = response.data.total
-      // })
+      getSingleCount('wastebin').then(response => {
+        this.dataGroup[1].context = response.data
+      })
     },
     getTransferStationCount() {
-      this.dataGroup[2].context = 3
-      // jobCountByStatus().then(response => {
-      //   const data = response.data
-      //   const total = data.beforeGet + data.beforeConfirm + data.inHandle
-      //   this.dataGroup[3].context = total
-      // })
+      getSingleCount('transferstation').then(response => {
+        this.dataGroup[2].context = response.data
+      })
     },
     getCarCount() {
-      this.dataGroup[3].context = 8
+      getSingleCount('car').then(response => {
+        this.dataGroup[3].context = response.data
+      })
     },
     getWasteBinJobCount() {
-      this.dataGroup[5].context = 8
+      this.dataGroup[5].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getTransferJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[5].context = response.data[0].count
+        }
+      })
     },
-    getCleanJobCount() {
-      this.dataGroup[6].context = 8
+    fetchCleanJobCount() {
+      this.dataGroup[6].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getCleanJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[6].context = response.data[0].count
+        }
+      })
     },
-    getToiletJobCount() {
-      this.dataGroup[7].context = 8
+    fetchToiletJobCount() {
+      this.dataGroup[7].context = '--'
+      const params = {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getToday('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }
+      getToiletJobCount(params).then(response => {
+        if (response.data.length > 0) {
+          this.dataGroup[7].context = response.data[0].count
+        }
+      })
     }
   }
 }
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 73ca945..f8f7cd2 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -21,15 +21,15 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/transfer')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+        <!--<el-table-column label="操作" align="center" width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
   </app-container>
 </template>
@@ -39,7 +39,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, batchExportToilet } from '@/api/sanitation/toilet'
+import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -74,7 +74,7 @@
         },
         {
           text: '车辆使用人',
-          value: 'userPersonTel',
+          value: 'userPersonPhone',
           align: 'center'
         },
         {
@@ -123,21 +123,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      console.log(this.listQuery)
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
+      // const that = this
+      // that.list = [
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { carCode: '赣F1541', userPerson: '张三', routeName: '路线1', toiletName: '1号公厕', userPersonTel: '13015483547', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // that.listLoading = false
+      // console.log(this.listQuery)
+      getCarJobRecords(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
     },
     // 点击详情
     goDetail(row) {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
index c197a74..6bf1803 100644
--- a/src/views/mapViews/choosePointDialog.vue
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -31,7 +31,7 @@
       canEdit: true, // 保存按钮是否可以点击
       marker: null, // 图标坐标点，LatLng格式
       iconOptions: icon({
-        iconUrl: require('../../assets/icons/toilet.png'), // 图片路径
+        iconUrl: require('../../assets/icons/icon-position.png'), // 图片路径
         iconSize: [32], // 图片大小
         iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
       }) // 图标配置
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 2c815da..3915aff 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,8 +14,8 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng">
-          <l-popup @ready="getStaffDetail">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+          <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
         </l-marker>
@@ -24,21 +24,21 @@
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
-            <l-popup @ready="getWastebinDetail">
+            <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
           <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
-            <l-popup @ready="getTransferStationDetail">
+            <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
           <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
-            <l-popup @ready="getToiletDetail">
+            <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
           </l-marker>
@@ -47,8 +47,8 @@
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
         <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
-          <l-popup @ready="getCarDetail">
-            <popwindow :data="currentData" type="car"/>
+          <l-popup>
+            <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
         </l-marker>
       </div>
@@ -91,6 +91,12 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
+import { getStaffListPage } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getCarList, getCarDetail } from '@/api/sanitation/car'
+
 export default {
   name: 'MapOverview',
   components: { Popwindow, MapView, LMarker, LIcon, LPopup },
@@ -115,7 +121,7 @@
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -125,7 +131,7 @@
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 32]
+        iconAnchor: [16, 16]
       }),
       staffShow: true,
       wastebinShow: true,
@@ -161,30 +167,68 @@
     },
     // 获取人员列表
     getStaffs() {
-      this.staffs = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.staffs = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getStaffListPage(params).then(response => {
+        if (response.code === 200) {
+          this.staffs = response.data.rows.map(item => {
+            return {
+              id: item.id,
+              name: item.name,
+              sexName: item.sexName,
+              idcard: item.idCard,
+              tel: item.tel,
+              type: item.type,
+              typeName: item.type,
+              post: item.post,
+              postName: item.postName,
+              jobs: item.jobs,
+              responseArea: item.responseArea,
+              responseAreaName: item.responseAreaName,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getStaffDetail() {
-      this.currentData = {
-        id: '12345',
-        name: '张三',
-        sexName: '男',
-        idcard: '130827098484123',
-        tel: '13382739123',
-        type: '0',
-        typeName: '普通职工',
-        post: '1',
-        postName: '保洁员',
-        jobs: '0;1',
-        responseArea: '崇仁县',
-        responseAreaName: '崇仁县'
-      }
+    fetchStaffDetail(event, staff) {
+      this.currentData = staff
+      // setTimeout(() => {
+      //   this.$nextTick(() => {
+      //     // event.target.openPopup()
+      //     this.$emit('marker-click')
+      //   })
+      //   // this.$emit('marker-click')
+      // }, 3000)
+
+      // this.currentData = {
+      //   id: '12345',
+      //   name: '张三',
+      //   sexName: '男',
+      //   idcard: '130827098484123',
+      //   tel: '13382739123',
+      //   type: '0',
+      //   typeName: '普通职工',
+      //   post: '1',
+      //   postName: '保洁员',
+      //   jobs: '0;1',
+      //   responseArea: '崇仁县',
+      //   responseAreaName: '崇仁县'
+      // }
     },
     // 获取公厕列表
     getToilets() {
@@ -193,7 +237,7 @@
       ]
     },
     // 获取公厕详情
-    getToiletDetail() {
+    fetchToiletDetail() {
       this.currentData = {
         code: '12345',
         name: '1号公厕',
@@ -214,7 +258,7 @@
       ]
     },
     // 获取人员详情
-    getTransferStationDetail() {
+    fetchTransferStationDetail() {
       this.currentData = {
         code: '12345',
         name: '1号中转站',
@@ -235,7 +279,7 @@
       ]
     },
     // 获取人员详情
-    getWastebinDetail() {
+    fetchWastebinDetail() {
       this.currentData = {
         code: '12345',
         name: '1号垃圾桶',
@@ -246,22 +290,50 @@
     },
     // 获取人员列表
     getCars() {
-      this.cars = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.cars = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      // const params = { sys: '1' }
+      const params = {}
+      getCarList(params).then(response => {
+        if (response.code === 200) {
+          // 过滤数组
+          this.cars = response.data.map(item => {
+            return {
+              carId: item.carId,
+              carCode: item.carCode,
+              carType: item.carType,
+              carTypeName: item.carTypeName,
+              deptId: item.deptId,
+              deptName: item.deptName,
+              description: item.description,
+              lat: parseFloat(item.lat),
+              lng: parseFloat(item.lng),
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)],
+              status: item.status,
+              speed: item.speed
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    getCarDetail() {
-      this.currentData = {
-        id: '12345',
-        carCode: '赣F25445S',
-        name: '环卫车',
-        carTypeName: '高级车',
-        brandModel: '奥迪',
-        deptName: '环卫所',
-        chargePerson: '张三'
-      }
+    fetchCarDetail(carId) {
+      getCarDetail(carId).then(response => {
+        if (response.code === 200) {
+          this.currentData = response.data
+        }
+      })
+      // this.currentData = {
+      //   id: '12345',
+      //   carCode: '赣F25445S',
+      //   name: '环卫车',
+      //   carTypeName: '高级车',
+      //   brandModel: '奥迪',
+      //   deptName: '环卫所',
+      //   chargePerson: '张三'
+      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 46b9c0a..0abb9cd 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -7,7 +7,7 @@
   <div class="info-window">
     <!--人员详情-->
     <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'" class="info-body">
+    <div v-if="type=='staff'&&data!=null" class="info-body">
       <div>姓名：{{ data.name }}</div>
       <div>性别：{{ data.sexName }}</div>
       <div>身份证号：{{ data.idcard }}</div>
@@ -15,7 +15,7 @@
       <div>负责片区：{{ data.responseArea }}</div>
     </div>
     <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'" class="info-body">
+    <div v-if="type=='toilet'&&data!=null" class="info-body">
       <div>公厕编号：{{ data.code }}</div>
       <div>公厕名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -25,7 +25,7 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
-    <div v-if="type=='wastebin'" class="info-body">
+    <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -33,7 +33,7 @@
       <div>启用时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'" class="info-body">
+    <div v-if="type=='transferStation'&&data!=null" class="info-body">
       <div>中转站编号：{{ data.code }}</div>
       <div>中转站名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
@@ -44,13 +44,12 @@
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'" class="info-body">
+    <div v-if="type=='car'&&data!=null" class="info-body">
       <div>车牌号：{{ data.carCode }}</div>
-      <div>车联描述：{{ data.name }}</div>
+      <div>车联描述：{{ data.description }}</div>
       <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>品牌型号：{{ data.brandModel }}</div>
       <div>使用单位：{{ data.deptName }} </div>
-      <div>责任人：{{ data.chargePerson }}</div>
+      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
@@ -80,6 +79,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .info-window{
     max-width: 250px;
+    width:230px;
     /*background-color: lightcyan;*/
     .info-header{
       padding: 0px 0px 5px 0px;
diff --git a/src/views/routeManage/addRoute.vue b/src/views/routeManage/addRoute.vue
index 1f490da..5e97a52 100644
--- a/src/views/routeManage/addRoute.vue
+++ b/src/views/routeManage/addRoute.vue
@@ -118,11 +118,11 @@
         <div v-if="!canclick3" id="map">
           <map-view ref="map" @ready="initMap2">
             <l-control position="topleft" >
-              <el-button v-if="canclick3==false" class="remove_btn" @click="removeall"/>
+              <el-button v-if="!canclick3" class="remove_btn" @click="removeall"/>
             </l-control>
           </map-view>
         </div>
-        <div v-if="canclick3==false" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
+        <div v-if="!canclick3" style="text-align:center;padding-top: 10px;padding-bottom: 50px">
           <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="saveRoute">提交规划路线</el-button>
         </div>
       </el-collapse-item>
@@ -214,7 +214,7 @@
   mounted() {
     // 1. 根据路由判断routeForm中type的参数
     const path = this.$route.path
-    if (path.includes('wastebin')) {
+    if (path.includes('waste')) {
       this.routeForm.type = 'waste'
     } else {
       this.routeForm.type = 'clean'
@@ -342,6 +342,7 @@
         bindCar(this.carForm).then(response => {
           if (response.code === 200) {
             this.$message.success('绑定车辆信息成功！')
+            this.activeNames = ['3']
             this.canclick3 = false
           }
         })
@@ -374,7 +375,7 @@
                 this.carForm.routeId = response.data
                 this.listQuery.routeId = response.data
                 this.pointForm.routeId = response.data
-                this.activeNames.push('2')
+                this.activeNames = ['2']
                 this.fetchData()
               }
             })
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index 42086bf..a47b772 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div id="detailroute" class="app-container">
+  <div v-loading="loading" id="detailroute" class="app-container">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="（一）基本信息" name="1" >
         <el-form ref="dataForm" :model="routeForm" label-position="right" label-width="130px" style="padding-top:20px;padding-right: 40px">
@@ -69,7 +69,10 @@
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="（二）关联车辆" name="2">
-        <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+        <div v-if="carlist.length==0" style="margin-left: 40px;padding-top: 10px">
+          暂无关联车辆
+        </div>
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 10px">
           <el-checkbox-group v-model="removelist" class="checkbox" disabled>
             <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
           </el-checkbox-group>
@@ -102,6 +105,7 @@
   data() {
     const routeConstant = getConstant()
     return {
+      loading: true, // 加载状态
       dialogStatus: 'detail', // 对话框类型：create,update
       activeNames: ['1', '2', '3'], // 可以展开的面板
       deptShow: true,
@@ -178,6 +182,7 @@
       }
       // 获取路线详情
       getRouteInfo(this.routeId).then(response => {
+        this.loading = false
         this.carlist = response.data.carList // 车辆列表
         this.removelist = []
         for (var i = 0; i < this.carlist.length; i++) {
diff --git a/src/views/routeManage/editRoute.vue b/src/views/routeManage/editRoute.vue
index 95501ff..f91518d 100644
--- a/src/views/routeManage/editRoute.vue
+++ b/src/views/routeManage/editRoute.vue
@@ -73,12 +73,15 @@
       <el-collapse-item title="（二）关联车辆" name="2">
         <el-tabs v-model="activeTab" style="padding-top: 10px;padding-left: 10px;padding-right: 10px" @tab-click="handleClick">
           <el-tab-pane label="解绑当前车辆" name="first">
-            <div class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
+            <div v-if="carlist.length>0" class="infinite-list-wrapper" style="overflow:auto;height: 100px;padding-left: 40px;padding-top: 20px">
               <el-checkbox-group v-model="removelist" class="checkbox">
                 <el-checkbox v-for="item in carlist" :label="item.id" :key="item.id" style="width: 150px">{{ item.description }}</el-checkbox>
               </el-checkbox-group>
             </div>
-            <div style="text-align:center;padding-top: 10px">
+            <div v-else style="margin-left: 40px;padding-top: 10px">
+              暂无关联车辆
+            </div>
+            <div v-if="carlist.length>0" style="text-align:center;padding-top: 10px">
               <el-button type="primary" style="width: 200px;font-size: 15px;font-weight: bold" @click="removeCar">解绑车辆</el-button>
             </div>
           </el-tab-pane>
diff --git a/src/views/routeManage/listRoute.vue b/src/views/routeManage/listRoute.vue
index 80898d4..ac98b7d 100644
--- a/src/views/routeManage/listRoute.vue
+++ b/src/views/routeManage/listRoute.vue
@@ -23,14 +23,14 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/route/waste/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/route/waste/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/route/delete/waste')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index a53fc3f..e4cfb3e 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -9,9 +9,9 @@
       <search-item/>
       <search-item>
         <el-date-picker
-          v-model="listQuery.hiredate"
+          v-model="timeRange"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -20,16 +20,16 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
-      <template slot="columns">
-        <el-table-column label="操作" align="center" width="60">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
-          </template>
-        </el-table-column>
-      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="60">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
     </normal-table>
     <edit-staff v-show="editShow" ref="editstaff" @watchChild="fetchData"/>
   </app-container>
@@ -50,11 +50,8 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
@@ -89,32 +86,23 @@
           align: 'center'
         },
         {
-          text: '上班打卡时间',
+          text: '打卡时间',
           value: 'onJobTime',
           align: 'center'
-        },
-        {
-          text: '下班打卡时间',
-          value: 'offJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '下班打卡时间',
+        //   value: 'offJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       timeRange: [], // 时间范围
       list: [], // 列表数据
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '清扫', value: '0' },
-        { name: '保洁', value: '1' }
-      ], // 作业内容
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -129,7 +117,7 @@
         }
       }, // 表格属性
       editShow: false, // 编辑页面是否显示
-      fileList:[] // 文件列表,上传用
+      fileList: [] // 文件列表,上传用
     }
   },
   created() {
@@ -138,10 +126,20 @@
   methods: {
     fetchData() {
       this.listLoading = true
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      // todo: 联调后台
+      // this.list = [
+      //   { id: '12345', name: '张三', sex: '0', sexName: '男', idcard: '110107199301012321', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', postName: '保洁员', hiredate: '2020-01', onJobTime: '08:00', offJobTime: '18:00', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      // ]
+      // this.total = 0
+      // this.listLoading = false
       getAttendanceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = response.data.total
-        this.listLoading = false
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
       })
     },
     // 点击详情
diff --git a/src/views/staffManage/editStaff.vue b/src/views/staffManage/editStaff.vue
index 6824461..99ef4ae 100644
--- a/src/views/staffManage/editStaff.vue
+++ b/src/views/staffManage/editStaff.vue
@@ -105,6 +105,7 @@
           <!--</el-row>-->
           <!--<el-row>-->
           <el-upload
+            v-show="!isDetailMode"
             ref="upload"
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"
@@ -118,7 +119,6 @@
           <!--</el-row>-->
         </div>
       </div>
-
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
@@ -147,7 +147,7 @@
       }
     }
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
       defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
@@ -161,7 +161,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -171,22 +171,10 @@
         create: '新增',
         detail: '详情'
       }, // 表头显示标题
-      sexList: [
-        { name: '男', value: '0' },
-        { name: '女', value: '1' }
-      ], // 性别列表
-      typeList: [
-        { name: '正式职工', value: '0' },
-        { name: '外聘', value: '1' }
-      ],
-      postList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 岗位
-      jobList: [
-        { name: '保洁员', value: '0' },
-        { name: '司机', value: '1' }
-      ], // 作业内容
+      sexList: [], // 性别列表
+      typeList: [],
+      postList: [], // 岗位
+      jobList: [], // 作业内容
       rules: {
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         sex: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
@@ -235,12 +223,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -253,12 +241,12 @@
           id: row.id, // id
           name: row.name, // 姓名
           sex: row.sex, // 性别
-          idcard: row.idcard, // 身份证号
+          idcard: row.idCard, // 身份证号
           tel: row.tel, // 手机号
           photo: row.photo, // 照片地址
           type: row.type, // 类型
           post: row.post, // 岗位
-          hiredate: row.hiredate, // 入职年月
+          hireDate: row.hireDate, // 入职年月
           jobs: row.jobs ? row.jobs.split(',') : [], // 作业内容
           responseArea: row.responseArea, // 负责片区
           notes: row.notes // 备注
@@ -281,7 +269,7 @@
         photo: '', // 照片地址
         type: '', // 类型
         post: '', // 岗位
-        hiredate: '', // 入职年月
+        hireDate: '', // 入职年月
         jobs: '', // 作业内容
         responseArea: '', // 负责片区
         notes: '' // 备注
@@ -393,10 +381,9 @@
     // 获取性别列表
     fetchSexList() {
       getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
+        if (response.code === 200) {
+          this.sexList = response.data
+        }
       })
     },
     // 获取人员类别
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index 053eca9..51d4578 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -40,9 +40,9 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.hiredate"
+            v-model="listQuery.hireDate"
             type="month"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM"
             placeholder="入职年月"
             clearable/>
         </search-item>
@@ -50,9 +50,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/staff/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -62,14 +63,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">花名册导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/staff/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/staff/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -97,7 +98,7 @@
         keywords: '', // 关键字
         type: '', // 人员类型
         post: '', // 岗位
-        hiredate: '', // 入职年月时间
+        hireDate: '', // 入职年月时间
         jobCode: '', // 作业内容
         responseArea: '', // 负责片区
         offset: 1,
@@ -119,7 +120,7 @@
         },
         {
           text: '身份证号',
-          value: 'idcard',
+          value: 'idCard',
           width: 165,
           align: 'center'
         },
@@ -141,7 +142,7 @@
         },
         {
           text: '入职年月',
-          value: 'hiredate',
+          value: 'hireDate',
           align: 'center'
         },
         {
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index a643296..23eb3f2 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -1,6 +1,6 @@
 <template>
   <app-container>
-    <search-area :need-clear="false" :need-search-more="false" type="default" search-more-type="default" @search="fetchData" @clear="clearInput">
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
       <!--一般查询条件-->
       <search-item>
         <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
@@ -12,21 +12,19 @@
         <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
       </search-item>
       <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="dateRange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable/>
-        </search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
       </search-item>
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="80">-->
@@ -46,7 +44,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletCleanListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ToiletCleanList',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
@@ -129,113 +127,26 @@
   methods: {
     fetchData() {
       this.listLoading = true
-      const that = this
-      that.list = [
-        { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
-        { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: 'XXX', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
-      ]
-      this.total = this.list.length
-      that.listLoading = false
-      // TODO: 待调试
-      // getToiletCleanListPage(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
-      // })
-    },
-    // 点击编辑
-    edit(row) {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('update', true, row)
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
     },
     // 点击详情
     goDetail(row) {
       this.editShow = true
       this.$refs.edittoilet.initDialog('detail', true, row)
     },
-    // 点击新增
-    add() {
-      this.editShow = true
-      this.$refs.edittoilet.initDialog('create', true)
-    },
-    // 删除单个公厕
-    del(row) {
-      const staffIds = [row.id]
-      this.$confirm(
-        '确定要删除该公厕吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delToilet(staffIds).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 删除多个公厕
-    batchDel() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选公厕吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          delToilet(staffIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
-    },
-    // 批量导入
-    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)'
-      })
-      // 发起导入请求
-      batchImportToilet(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
-    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
@@ -245,13 +156,13 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      batchExportToiletJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
index a1c247c..17522c8 100644
--- a/src/views/toiletManage/editToilet.vue
+++ b/src/views/toiletManage/editToilet.vue
@@ -69,8 +69,9 @@
                 <el-date-picker
                   v-model.trim="toiletForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -95,6 +96,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -132,9 +134,9 @@
   components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       toiletForm: {
@@ -205,6 +207,7 @@
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -221,6 +224,7 @@
           area: row.area, // 占地面积
           responsiblePerson: row.responsiblePerson, // 责任人
           responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -364,15 +368,6 @@
       this.$set(this.toiletForm, 'lng', marker.lng)
       this.$set(this.toiletForm, 'lat', marker.lat)
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
-    },
     cancel: function() {
       this.dialogFormVisible = false
       this.$emit('watchChild')
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 70b9edd..4c8d87b 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/transferstationManage/editTransferstation.vue b/src/views/transferstationManage/editTransferstation.vue
index e92e9e3..f8e2334 100644
--- a/src/views/transferstationManage/editTransferstation.vue
+++ b/src/views/transferstationManage/editTransferstation.vue
@@ -62,8 +62,8 @@
                 <el-date-picker
                   v-model.trim="transferstationForm.ts"
                   :disabled="isDetailMode"
-                  type="month"
-                  value-format="yyyy-MM"
+                  type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择建设时间"/>
               </el-form-item>
             </el-col>
@@ -88,6 +88,7 @@
           </el-row>
           <el-row>
             <el-upload
+              v-show="!isDetailMode"
               ref="upload"
               :before-upload="handleBeforeUpload"
               :on-success="handleSuccess"
@@ -98,6 +99,8 @@
               accept=".jpg,.jpeg,.png">
               <el-button type="primary">点击上传照片</el-button>
             </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
           </el-row>
         </div>
       </div>
@@ -107,6 +110,7 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
@@ -114,14 +118,16 @@
 import { addTransferstation, updateTransferstation } from '@/api/sanitation/transferstation'
 import { Uploadimg } from '@/api/common'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 
 export default {
   name: 'EditTransferstation',
+  components: { ChoosePointDialog },
   data() {
     return {
-      baseUrl: process.env.BASE_API + '/static/',
+      baseUrl: this.baseConfig.baseUrl + '/static/',
       photo: '', // 图片路径
-      defaultPhoto: require('../../assets/global_images/photo.png'), // 默认图片路径
+      defaultPhoto: require('../../assets/global_images/transferStationPhoto.png'), // 默认图片路径
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update,detail
       transferstationForm: {
@@ -195,6 +201,7 @@
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
           ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
           notes: row.notes // 备注
         }
         this.isEditMode = true
@@ -213,6 +220,7 @@
           area: row.area, // 占地面积
           owner: row.owner, // 建设单位
           capacity: row.capacity, // 最新垃圾量
+          photo: row.photo, // 照片
           ts: row.ts, // 启用时间
           notes: row.notes // 备注
         }
@@ -344,14 +352,18 @@
         this.$message.warning(response.message)
       }
     },
-    // 获取性别列表
-    fetchSexList() {
-      getDictByType('sex').then(response => {
-        this.sexList = [
-          { name: '男', value: '0' },
-          { name: '女', value: '1' }
-        ]
-      })
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.transferstationForm.lng && this.transferstationForm.lat) {
+        position = { lng: this.transferstationForm.lng, lat: this.transferstationForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.transferstationForm, 'lng', marker.lng)
+      this.$set(this.transferstationForm, 'lat', marker.lat)
     },
     cancel: function() {
       this.dialogFormVisible = false
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 6e4658c..8993f53 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -15,9 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/transferstation/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -27,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/transferstation/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/transferstation/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/transferstation/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index bf0c78d..24b2bd5 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -36,7 +36,10 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="经度" prop="lng">
-                <el-input v-model.trim="wastebinForm.lng" :disabled="isDetailMode" type="text" placeholder="经度，如：116.4"/>
+                <el-input v-model.trim="wastebinForm.lng" :disabled="isDetailMode" type="text" placeholder="经度，如：116.4">
+                  <el-button v-if="!isDetailMode" slot="append" icon="el-icon-map-location" @click="choosePoint('edit')"/>
+                  <el-button v-if="isDetailMode" slot="append" icon="el-icon-map-location" @click="choosePoint('readonly')"/>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -81,14 +84,18 @@
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
+    <!--地图选点-->
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
   </el-dialog>
 </template>
 
 <script>
 import { addWastebin, updateWastebin } from '@/api/sanitation/wastebin'
 import { getDictByType } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
 export default {
   name: 'EditWastebin',
+  components: { ChoosePointDialog },
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示
@@ -204,16 +211,6 @@
     },
     // 保存数据
     saveData: function() {
-      // 照片不为空则对照片进行处理
-      if (this.photo !== '') {
-        if (this.photo.startsWith('http')) { // 上传的普通图片
-          let index = this.photo.indexOf('/static/')
-          if (index !== -1) {
-            index += 8
-          }
-          this.wastebinForm.photo = this.photo.substring(index)
-        }
-      }
       if (this.dialogStatus === 'update') {
         this.updateData()
       } else if (this.dialogStatus === 'create') {
@@ -270,6 +267,19 @@
         }
       })
     },
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.wastebinForm.lng && this.wastebinForm.lat) {
+        position = { lng: this.wastebinForm.lng, lat: this.wastebinForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.wastebinForm, 'lng', marker.lng)
+      this.$set(this.wastebinForm, 'lat', marker.lat)
+    },
     // 获取垃圾桶类别
     fetchWastebinType() {
       getDictByType('wastebinType').then(response => {
diff --git a/src/views/wastebinManage/wastebinList.vue b/src/views/wastebinManage/wastebinList.vue
index 0ba1511..1e1d936 100644
--- a/src/views/wastebinManage/wastebinList.vue
+++ b/src/views/wastebinManage/wastebinList.vue
@@ -21,9 +21,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/sanitation/wastebin/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
+          v-if="hasPerm('/sanitation/wastebin/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -33,14 +34,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/sanitation/wastebin/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <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>
+            <el-button v-if="hasPerm('/sanitation/wastebin/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/wastebin/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
             <!--<el-button type="text" size="small" @click.stop="registerIris(scope.row)">岗位调整</el-button>-->
           </template>
         </el-table-column>
@@ -86,12 +87,13 @@
         {
           text: '类别',
           value: 'typeName',
-          width: 165,
+          width: 100,
           align: 'center'
         },
         {
           text: '位置',
           value: 'position',
+          width: 190,
           align: 'center'
         },
         {
diff --git a/static/project.config.json b/static/project.config.json
index 84dfd82..ab38d73 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,5 +1,5 @@
 {
   "title": "智慧环卫系统",
   "baseUrl": "http://111.198.10.15:11409/",
-  "mainPage": "http://localhost:8081/"
+  "mainPage": "http://111.198.10.15:11404/dcms/"
 }