diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index e06dc18..bf42e07 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -85,6 +85,7 @@
 import EditStaff from './editStaff'
 import { getDictByType } from '@/api/common'
 import { getStaffListPage, delStaff, batchImportStaff, batchExportStaff } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'StaffList',
@@ -301,14 +302,8 @@
       batchExportStaff(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `人员列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index e06dc18..bf42e07 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -85,6 +85,7 @@
 import EditStaff from './editStaff'
 import { getDictByType } from '@/api/common'
 import { getStaffListPage, delStaff, batchImportStaff, batchExportStaff } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'StaffList',
@@ -301,14 +302,8 @@
       batchExportStaff(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `人员列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index acfcc9b..5540486 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -175,12 +175,11 @@
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
       this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index e06dc18..bf42e07 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -85,6 +85,7 @@
 import EditStaff from './editStaff'
 import { getDictByType } from '@/api/common'
 import { getStaffListPage, delStaff, batchImportStaff, batchExportStaff } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'StaffList',
@@ -301,14 +302,8 @@
       batchExportStaff(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `人员列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index acfcc9b..5540486 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -175,12 +175,11 @@
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
       this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 329168b..cfa3469 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -46,6 +46,7 @@
 <script>
 import { getToiletListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
 import EditToilet from './editToilet'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'ToiletList',
   components: { EditToilet },
@@ -242,14 +243,8 @@
       batchExportToilet(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `公厕列表.xlsx`
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -268,11 +263,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index e06dc18..bf42e07 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -85,6 +85,7 @@
 import EditStaff from './editStaff'
 import { getDictByType } from '@/api/common'
 import { getStaffListPage, delStaff, batchImportStaff, batchExportStaff } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'StaffList',
@@ -301,14 +302,8 @@
       batchExportStaff(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `人员列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index acfcc9b..5540486 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -175,12 +175,11 @@
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
       this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 329168b..cfa3469 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -46,6 +46,7 @@
 <script>
 import { getToiletListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
 import EditToilet from './editToilet'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'ToiletList',
   components: { EditToilet },
@@ -242,14 +243,8 @@
       batchExportToilet(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `公厕列表.xlsx`
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -268,11 +263,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 56bbe5c..232fd47 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -274,11 +274,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 垃圾中转站类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index e06dc18..bf42e07 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -85,6 +85,7 @@
 import EditStaff from './editStaff'
 import { getDictByType } from '@/api/common'
 import { getStaffListPage, delStaff, batchImportStaff, batchExportStaff } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'StaffList',
@@ -301,14 +302,8 @@
       batchExportStaff(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `人员列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index acfcc9b..5540486 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -175,12 +175,11 @@
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
       this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 329168b..cfa3469 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -46,6 +46,7 @@
 <script>
 import { getToiletListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
 import EditToilet from './editToilet'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'ToiletList',
   components: { EditToilet },
@@ -242,14 +243,8 @@
       batchExportToilet(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `公厕列表.xlsx`
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -268,11 +263,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 56bbe5c..232fd47 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -274,11 +274,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 垃圾中转站类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/wastebinManage/wastebinList.vue b/src/views/wastebinManage/wastebinList.vue
index 10fa86f..a2c05bf 100644
--- a/src/views/wastebinManage/wastebinList.vue
+++ b/src/views/wastebinManage/wastebinList.vue
@@ -16,7 +16,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="社区/道路" clearable/>
+        <el-input v-model.trim="listQuery.position" size="small" 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">
@@ -55,6 +55,7 @@
 import { getWastebinListPage, delWastebin, batchImportWastebin, batchExportWastebin } from '@/api/sanitation/wastebin'
 import EditWastebin from './editWastebin'
 import { getDictByType } from '@/api/common'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'WastebinList',
   components: { EditWastebin },
@@ -254,14 +255,8 @@
       batchExportWastebin(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `垃圾桶列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `垃圾桶列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -287,10 +282,7 @@
       this.listQuery = {
         keywords: '', // 关键字
         type: '', // 垃圾桶类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',

diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 0133751..07636ea 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -84,7 +84,7 @@
   })
 }
 
-// 车辆查询
+// 车辆作业查询
 export function getCarJobRecords(params) {
   return request({
     url: '/sanitation/carJobRecord/listPage',
@@ -92,3 +92,11 @@
     params
   })
 }
+// 车辆作业查询
+export function exportCarJobRecords(params) {
+  return request({
+    url: '/sanitation/carJobRecord/export',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/staff.js b/src/api/sanitation/staff.js
index f215ea6..2e127c2 100644
--- a/src/api/sanitation/staff.js
+++ b/src/api/sanitation/staff.js
@@ -87,3 +87,15 @@
     params
   })
 }
+
+// 人员出勤记录查询
+export function exportAttendanceList(params, config) {
+  return request({
+    url: '/sanitation/staff/attendance/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 6dc667f..788a697 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -6,7 +6,7 @@
 // 人员出勤统计
 export function getAttendancePercent(params) {
   return request({
-    url: '/sanitation/stuff/attendancePercent',
+    url: '/sanitation/statistic/attendancePercent',
     method: 'get',
     params
   })
diff --git a/src/assets/font/DS-DigitalBold.TTF b/src/assets/font/DS-DigitalBold.TTF
new file mode 100644
index 0000000..064ad47
--- /dev/null
+++ b/src/assets/font/DS-DigitalBold.TTF
Binary files differ
diff --git a/src/assets/font/DS-DigitalBoldItalic.TTF b/src/assets/font/DS-DigitalBoldItalic.TTF
new file mode 100644
index 0000000..65642f9
--- /dev/null
+++ b/src/assets/font/DS-DigitalBoldItalic.TTF
Binary files differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..99e3d81
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,12 @@
+@font-face {  
+    font-family: 'DS-DigitalBoldItalic';  
+    src: url('DS-DigitalBoldItalic.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
+@font-face {  
+    font-family: 'DS-DigitalBold';  
+    src: url('DS-DigitalBold.ttf');
+    font-weight: normal;  
+    font-style: normal;  
+} 
\ No newline at end of file
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
new file mode 100644
index 0000000..1aa7105
--- /dev/null
+++ b/src/assets/overview/banner.png
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
index 14840b8..75bfcda 100644
--- a/src/assets/overview/car.png
+++ b/src/assets/overview/car.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
new file mode 100644
index 0000000..59a9b46
--- /dev/null
+++ b/src/assets/overview/frame.png
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
new file mode 100644
index 0000000..90bf755
--- /dev/null
+++ b/src/assets/overview/highlight.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
index 9ce21a4..434137e 100644
--- a/src/assets/overview/staff-yellow.png
+++ b/src/assets/overview/staff-yellow.png
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
index 060be6f..6d9fc05 100644
--- a/src/assets/overview/toilet.png
+++ b/src/assets/overview/toilet.png
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
index d54155f..04027b7 100644
--- a/src/assets/overview/transferstation.png
+++ b/src/assets/overview/transferstation.png
Binary files differ
diff --git a/src/assets/overview/wastebin.png b/src/assets/overview/wastebin.png
index fd0275a..9d1746f 100644
--- a/src/assets/overview/wastebin.png
+++ b/src/assets/overview/wastebin.png
Binary files differ
diff --git a/src/components/BigData/Block/imageBlock.vue b/src/components/BigData/Block/imageBlock.vue
index db0b14d..0a69054 100644
--- a/src/components/BigData/Block/imageBlock.vue
+++ b/src/components/BigData/Block/imageBlock.vue
@@ -12,11 +12,11 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }} </div>
+        <div :style="{'color':color,'font-size':size=='small'?'0.6rem':'0.09rem'}" class="data-right">
           {{ data.unit }}
         </div>
       </div>
@@ -36,7 +36,7 @@
       } else if (status === 'warning') {
         return { color: '#ffd43f' }
       } else {
-        return { color: 'black' }
+        return { color: '#ffffff' }
       }
     }
 
@@ -61,7 +61,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '#ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +76,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +90,7 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
+    border:1px solid #4ddde6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -110,7 +110,7 @@
       .index-name{
         color:white;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
       }
       .index-data{
@@ -127,6 +127,8 @@
           display: flex;
           justify-content: start;
           font-size:0.1rem;
+          margin-left:0.1rem;
+          margin-bottom: 0.1rem;
         }
       }
 
diff --git a/src/components/BigData/Block/simpleBlock.vue b/src/components/BigData/Block/simpleBlock.vue
index e74a37f..e0ff867 100644
--- a/src/components/BigData/Block/simpleBlock.vue
+++ b/src/components/BigData/Block/simpleBlock.vue
@@ -12,13 +12,10 @@
     <!--右边内容-->
     <div class="index-right">
       <!--标题-->
-      <div :style="{'color':titleColor,'font-size':size=='small'?'0.1rem':'0.11rem'}" class="index-name">{{ data.name }}</div>
+      <div :style="{'color':titleColor,'font-size':size=='small'?'0.8rem':'0.15rem'}" class="index-name">{{ data.name }}</div>
       <!--数值 & 单位-->
       <div class="index-data">
-        <div :style="{'color':color,'font-size':size=='small'?'0.17rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
-        <div :style="{'color':color,'font-size':size=='small'?'0.07rem':'0.09rem'}" class="data-right">
-          {{ data.unit }}
-        </div>
+        <div :style="{'color':color,'font-size':size=='small'?'1.2rem':'0.22rem','font-family':fontFamily}" class="index-value">{{ data.value }}</div>
       </div>
     </div>
   </div>
@@ -61,7 +58,7 @@
     }, // 大小
     color: {
       type: String,
-      default: 'black'
+      default: '@ffffff'
     },
     data: {
       type: Object,
@@ -76,7 +73,7 @@
   },
   data() {
     return {
-      titleColor: '#3893ff'
+      titleColor: '#ffffff'
     }
   }
 }
@@ -90,7 +87,6 @@
     display:flex;
     justify-content: space-between;
     align-items: center;
-    border:1px solid #3a8ee6;
     .index-left{
       /*width:2rem;*/
       width:0.47rem;
@@ -107,27 +103,34 @@
     .index-right{
       color:white;
       flex:1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height:100%;
+      border-left: 2px solid #03EFFF;
       .index-name{
         color:white;
+        padding-left: 0.2rem;
         font-size:0.12rem;
-        font-weight: bold;
+        /*font-weight: bold;*/
         margin-bottom: 0.1rem;
+        width:6rem;
+        vertical-align: center;
+
       }
       .index-data{
-        width: 100%;
+        background-color:#66b2ff;
+        padding-right: 0.4rem;
+        flex:1;
         display: flex;
-        justify-content: start;
-        align-items: flex-end;
+        justify-content: flex-end;
+        align-items: center;
         text-align: right;
+        height: 100%;
         .index-value{
           font-size:0.27rem;
           font-weight: bolder;
-        }
-        .data-right{
-          display: flex;
-          justify-content: start;
-          font-size:0.1rem;
-          margin-bottom: 0.02rem;
+          text-align: right;
         }
       }
 
diff --git a/src/components/BigData/Layout/chartLayout.vue b/src/components/BigData/Layout/chartLayout.vue
index 43d0751..1b35f3b 100644
--- a/src/components/BigData/Layout/chartLayout.vue
+++ b/src/components/BigData/Layout/chartLayout.vue
@@ -7,7 +7,7 @@
   <div class="chart-layout" @click="refreshData">
     <Title2 class="title">{{ title }}</Title2>
     <!--title 占高0.18rem-->
-    <div class="module-corner" style="height:calc(100% - 2rem); position:relative">
+    <div class="module-corner" style="height:calc(100% - 2rem - 1px); position:relative">
       <div style="width: 100%; height: 100%;padding:0rem;position:absolute;z-index:1">
         <slot/>
       </div>
@@ -42,7 +42,17 @@
 .chart-layout{
   height: 100%;
   width: 100%;
-  border: 1px solid #4b5ff7;
+  background-image: url('../../../assets/overview/frame.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  padding:5px;
+  .title{
+    color: white;
+  }
+  .highlight{
+    height: 1px;
+    width:100%;
+  }
 }
 .chart-layout:hover .title
 {
diff --git a/src/components/BigData/Title/Title2.vue b/src/components/BigData/Title/Title2.vue
index 83c9467..056ca86 100644
--- a/src/components/BigData/Title/Title2.vue
+++ b/src/components/BigData/Title/Title2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="title2">
-    <span v-show="$slots.default" :style="bgStyle" class="title2_bg">
+    <div v-show="$slots.default" :style="bgStyle" class="title2_bg">
       <span :style="textStyle"><slot/></span>
-    </span>
+    </div>
+    <img :src="require('@/assets/overview/highlight.png')" class="highlight"/>
   </div>
 </template>
 <script>
@@ -17,8 +18,8 @@
   data() {
     return {
       defaultOptions: {
-        colors: ['#0921a1', '#4b5ff7'],
-        bgColors: ['rgba(2, 8, 54, 0.1)', '#0a1a7b', 'rgba(2, 8, 54, 0.1)']
+        colors: ['#ffffff', '#ffffff'],
+        bgColors: ['#ffffff', '#ffffff', '#ffffff']
       },
       mergedOptions: {}
     }
@@ -75,20 +76,27 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .title2 {
     height: 2rem;
-    border-bottom: 1px solid #4b5ff7;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /*border-bottom: 1px solid #4b5ff7;*/
     .title2_bg {
       /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-      padding: 0rem 3rem 0rem 0.5rem;
-      display: inline-block;
+      padding: 0px;
+      display: block;
+      text-align: center;
       span {
-        /*background: linear-gradient(to right, #00f5ff, #4b5ff7);*/
-        background: linear-gradient(to right, #0921a1, #4b5ff7);
-        -webkit-background-clip: text;
-        color: transparent;
+        color: #ffffff;
+        text-align: center;
         font-size: 1rem;
         font-weight: bolder;
         line-height: 2rem;
       }
     }
+    .highlight{
+      width:100%;
+      height:1px;
+    }
   }
 </style>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 012137f..f7dc765 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -2,7 +2,7 @@
   <el-header class="app-header">
     <h3>{{ title }}</h3>
     <!--子系统选项-->
-    <el-dropdown class="systemSelect" @command="handleCommand">
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
       <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
       </span>
       <el-dropdown-menu slot="dropdown">
@@ -41,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -54,7 +55,9 @@
     ])
   },
   created() {
-    this.getSystems()
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
   },
   methods: {
     toggleSideBar() {
@@ -69,17 +72,22 @@
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
     },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
     // 切换子系统
     handleCommand(command) {
       console.log('切换子系统:' + command.name)
-      const params = '?token=' + this.$store.getters.token
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
       // 判断系统是不是http的，如果是则打开新窗口
       if (command.url.indexOf('http') > -1) {
         // 取token
         if (this.baseConfig.sameWindow) {
-          window.location.href = command.url + params
+          window.location.href = command.url + params1
         } else {
-          window.open(command.url + params, '_blank')
+          window.open(command.url + params1, '_blank')
         }
       } else {
         // 取token
diff --git a/src/main.js b/src/main.js
index ba1de8a..974ac86 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,9 @@
 
 import '@/styles/index.scss' // global css
 
+import '@/assets/font/font.css'
+import '@/utils/rem.js'
+
 import App from './App'
 import store from './store'
 import router from './router'
diff --git a/src/permission.js b/src/permission.js
index 8f998b3..9cb1bde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,9 +5,8 @@
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // getToken from cookie
 import Vue from 'vue'
-
 NProgress.configure({ showSpinner: false })// NProgress configuration
-
+let baseConfig = Vue.prototype.baseConfig
 const whiteList = ['/login', '/404', '/401'] // 不重定向白名单
 // 全局钩子
 router.beforeEach((to, from, next) => {
@@ -25,15 +24,10 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为环卫子系统
           const currentSys = {
+            // code: baseConfig.sysCode,
+            // name: baseConfig.subTitle
             code: 'sanitation',
-            id: '1189107859077373282',
-            ismenu: '0',
-            levels: 1,
-            name: '智慧环卫系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/sanitation'
+            name: '智慧环卫系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/modules/sanitation.js b/src/router/modules/sanitation.js
index 4395dde..24708e0 100644
--- a/src/router/modules/sanitation.js
+++ b/src/router/modules/sanitation.js
@@ -49,7 +49,8 @@
     meta: {
       sys: '/sanitation',
       title: '环卫设施台账',
-      icon: 'icon-wastebin' // 图标
+      icon: 'icon-wastebin', // 图标
+      permission: ['/sanitation/device']
     },
     children: [
       {
@@ -88,7 +89,8 @@
     meta: {
       sys: '/sanitation',
       title: '路线管理',
-      icon: 'icon-route' // 图标
+      icon: 'icon-route', // 图标
+      permission: ['/sanitation/route']
     },
     children: [
       {
@@ -186,11 +188,11 @@
     redirect: '/staff/assessment',
     name: 'Assessment',
     alwaysShow: true,
-    permission: ['/sanitation/assessment'],
     meta: {
       sys: '/sanitation',
       title: '考核统计',
-      icon: 'icon-config' // 图标
+      icon: 'icon-config', // 图标
+      permission: ['/sanitation/assessment']
     },
     children: [
       {
diff --git a/src/utils/exportutils.js b/src/utils/exportutils.js
new file mode 100644
index 0000000..b5d0bcf
--- /dev/null
+++ b/src/utils/exportutils.js
@@ -0,0 +1,19 @@
+/**
+ * 导出文件工具
+ * @param blob 文件
+ * @param fileName 导出文件名
+ */
+export function exportFile(blob, fileName) {
+  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, fileName)
+  } else {
+    const downloadElement = document.createElement('a')
+    const href = window.URL.createObjectURL(blob) // 创建下载的链接
+    downloadElement.href = href
+    downloadElement.download = fileName
+    document.body.appendChild(downloadElement)
+    downloadElement.click() // 点击下载
+    document.body.removeChild(downloadElement) // 下载完成移除元素
+    window.URL.revokeObjectURL(href) // 释放blob对象
+  }
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index c135034..f88bc22 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -4,7 +4,7 @@
   const htmlHeight = document.documentElement.clientHeight || document.body.clientHeight
   const htmlDom = document.getElementsByTagName('html')[0]
   console.log('height')
-  htmlDom.style.fontSize = htmlHeight / 5 + 'px'
+  htmlDom.style.fontSize = htmlHeight / 48 + 'px'
 }
 setRem()
 window.onresize = function() {
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..200dbec 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    if (config.method === 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
     return config
   },
   error => {
diff --git a/src/views/carManage/carList.vue b/src/views/carManage/carList.vue
index c80a69f..b113ca5 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,7 +18,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptId" :dept-show="true" placeholder="请选择使用单位" />
+        <dept-select v-model="listQuery.deptId" size="small" :dept-show="true" placeholder="请选择使用单位" />
       </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">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 590bc21..5fecfb3 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -174,10 +174,11 @@
 
 <style lang="scss" scoped>
   .panel-group {
-    margin-top: 18px;
+    margin-top: 5px;
+    margin-bottom: 15px;
 
     .card-panel-col {
-      margin-bottom: 32px;
+      margin-bottom: 15px;
     }
 
     .card-panel {
@@ -188,8 +189,6 @@
       overflow: hidden;
       color: #666;
       background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
 
       &:hover {
         .card-panel-icon-wrapper {
diff --git a/src/views/dashboard/components/quickFunction.vue b/src/views/dashboard/components/quickFunction.vue
index 0827ba2..469d136 100644
--- a/src/views/dashboard/components/quickFunction.vue
+++ b/src/views/dashboard/components/quickFunction.vue
@@ -12,9 +12,11 @@
             <span>常用功能</span>
           </div>
           <div class="box-body">
-            <div v-for="item of funcs" class="box-item">
-              <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
-              {{ item.name }}
+            <div v-for="item of funcs">
+              <div v-if="hasPerm(item.permission)" class="box-item">
+                <svg-icon :icon-class="item.icon" class-name="card-panel-icon" />
+                {{ item.name }}
+              </div>
             </div>
           </div>
         </el-card>
@@ -30,11 +32,11 @@
   data() {
     return {
       funcs: [
-        { name: '人员管理', icon: 'icon-user', path: '/' },
-        { name: '出勤统计', icon: 'icon-attendance', path: '/' },
-        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/' },
-        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/' },
-        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/' }
+        { name: '人员管理', icon: 'icon-user', path: '/stafflist', permisson: '/sanitation/staff' },
+        { name: '出勤统计', icon: 'icon-attendance', path: '/assessment/staff', permission: '/sanitation/assessment/staff' },
+        { name: '垃圾转运作业统计', icon: 'icon-transfer2', path: '/assesment/wastebin', permission: '/sanitation/assesment/wastebin' },
+        { name: '路面清扫作业统计', icon: 'attendance-analyse', path: '/assesment/clean', permission: '/sanitation/assesment/clean' },
+        { name: '公厕保洁作业统计', icon: 'icon-clean2', path: '/assesment/toilet', permission: '/sanitation/assesment/toilet' }
       ]
     }
   }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0c38d31..3d21092 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -30,7 +30,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin: 0px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index 3260a83..d07dcc3 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getCarJobRecords, batchExportToilet } from '@/api/sanitation/car'
+import { getCarJobRecords, exportCarJobRecords } from '@/api/sanitation/car'
 export default {
   name: 'JobRecords',
   data() {
@@ -148,7 +148,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportToilet(this.listQuery).then(res => {
+      exportCarJobRecords(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
         const downloadElement = document.createElement('a')
@@ -175,18 +175,12 @@
     },
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
-      this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: 'desc'
-      }
+      this.listQuery.carCode = ''
+      this.listQuery.routName = ''
+      this.listQuery.startTime = ''
+      this.listQuery.endTime = ''
+      this.listQuery.offset = 1
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/overview/components/blockContainer.vue b/src/views/overview/components/blockContainer.vue
new file mode 100644
index 0000000..560da82
--- /dev/null
+++ b/src/views/overview/components/blockContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description:
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="chart-div">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BlockContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-div{
+    background-image: url('../../../assets/overview/frame.png');
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 7f08699..07379b4 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -41,22 +41,22 @@
       color: '',
       toiletCount: {
         name: '公厕', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       wastebinCount: {
         name: '垃圾桶', // 标题
-        value: '587', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       transferCount: {
         name: '垃圾中转站', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '个'
       },
       car: {
         name: '环卫车', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '辆'
       }
     }
@@ -110,7 +110,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #03EFFF
       }
     }
   }
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index f085b3e..d10f03d 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -40,20 +40,22 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .fixTopBox {
+    position: absolute;
+    z-index:500;
+    top:0;
+    left:0;
     width: 100%;
-    height: 4.2rem;
+    height: 5.2rem;
     overflow: auto;
     font-size: .7rem;
     /*文字下的线*/
     .topContainer{
       width: 100%;
-      min-width: 100%;
       height: 100%;
       /*padding-bottom: 1.2rem;*/
       overflow: hidden;
-      background: url("../../../assets/overview/titleBg.png") no-repeat;
-      background-size: contain;
-      background-position: top center;
+      background: url("../../../assets/overview/banner.png") no-repeat;
+      background-size: 100% 100%;
       .topBox{
         width: 100%;
         height: 100%;
@@ -69,12 +71,13 @@
     }
   }
   .topTitle{
-    height: 100%;
+    height: 90%;
     padding: 0 .6rem;
     display: flex;
     align-items: center;
     text-align: center;
     position: relative;
+    padding-bottom: 0.4rem;
     img{
       width: 5rem;
       height: 2rem;
@@ -92,10 +95,10 @@
       font-size: 2rem;
       letter-spacing: .3rem;
       margin-top:0.4rem;
-      background: #0072ff;
+      /*background: #0072ff;*/
       /*background: linear-gradient(to right, #0072ff, #00eaff, #01aaff);*/
-      -webkit-background-clip: text;
-      color: transparent;
+      /*-webkit-background-clip: text;*/
+      color: #ffffff;
     }
   }
   .back-button{
@@ -103,10 +106,10 @@
     top:10px;
     left:20px;
     font-size:20px;
-    color:#0072ff
+    color:#ffffff
   }
   .back-button:hover{
-    color:#01aaff;
+    color: #cae2e3;
     cursor: pointer;
   }
 </style>
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index fd6cb63..7f7b6b6 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -33,9 +33,7 @@
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
 import { getToday } from '@/utils/dateutils'
-import { getTransferJobCount } from '@/api/sanitation/statistics'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount, getAttendancePercent, getToiletJobCount, getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
   components: { ImageBlock },
@@ -49,30 +47,31 @@
       },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
-        value: '3', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '4', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       toiletCleanCount: {
         name: '公厕保洁作业次数', // 标题
-        value: '5', // 数值
+        value: '--', // 数值
         unit: '次'
       },
       staff: {
         name: '出勤人数', // 标题
-        value: '23', // 数值
+        value: '--', // 数值
         unit: '人'
       }
     }
   },
   created() {
-    // this.getWasteBinJobCount()
-    // this.fetchCleanJobCount()
-    // this.fetchToiletJobCount()
+    this.getWasteBinJobCount()
+    this.fetchCleanJobCount()
+    this.fetchToiletJobCount()
+    this.fetchAttendance()
   },
   methods: {
     getWasteBinJobCount() {
@@ -95,6 +94,15 @@
           this.toiletCleanCount.value = response.data[0].count
         }
       })
+    },
+    fetchAttendance() {
+      getAttendancePercent(this.commonParams).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.staff.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
     }
   }
 }
@@ -118,7 +126,7 @@
       padding:3px;
       .device-icon{
         font-size:1.5rem;
-        color: #4b5ff7
+        color: #91f2ff
       }
     }
   }
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 32a0cba..ee2241c 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -64,7 +64,7 @@
     <!--设施图例-->
     <div v-show="type=='device'" class="legend-group">
       <div class="legend-div" @click="toiletShow=!toiletShow">
-        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet3d.png"></div>
+        <div class="legend-icon"><img :class="{'grey-img':toiletShow?false:true}" src="../../../assets/overview/toilet.png"></div>
         <div class="legend-text">公厕</div>
       </div>
       <div class="legend-div" @click="transferStationShow=!transferStationShow">
@@ -111,17 +111,17 @@
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 人员图标
       toiletIcon: L.icon({
-        iconUrl: require('../../../assets/overview/toilet3d.png'),
+        iconUrl: require('../../../assets/overview/toilet.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
-        iconAnchor: [16, 16]
+        iconAnchor: [16, 32]
       }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
@@ -138,7 +138,7 @@
       transferStationShow: true, // 转运站是否显示
       toiletShow: true, // 公厕是否显示
       carShow: true, // 车辆是否显示
-      currentData: null // 当前弹窗数据
+      currentData: {} // 当前弹窗数据
     }
   },
   created() {
@@ -322,6 +322,7 @@
     },
     // 获取人员详情
     fetchCarDetail(car) {
+      this.currentData = car
       getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
@@ -340,8 +341,8 @@
   position: relative;
   .top-btn-group{
     position: absolute;
-    z-index:3000;
-    top:20px;
+    z-index:500;
+    top:50px;
     left:50%;
     transform: translateX(-50%);
   }
diff --git a/src/views/overview/components/staffStatistic.vue b/src/views/overview/components/staffStatistic.vue
index 4c30ad4..e587c50 100644
--- a/src/views/overview/components/staffStatistic.vue
+++ b/src/views/overview/components/staffStatistic.vue
@@ -22,15 +22,19 @@
         </simple-block>
       </div>
     </div>
-    <div class="chart-child" style="flex:3">
-      <!--<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>-->
-      <dv-active-ring-chart :config="config" style="width:100%;height:100%" />
-    </div>
+    <!--<div class="chart-child" style="flex:1">-->
+    <!--&lt;!&ndash;<ve-pie :data="chartData" style="width:100%;height:100%;"></ve-pie>&ndash;&gt;-->
+    <!--<dv-active-ring-chart :config="config" style="width:100%;height:100%" />-->
+    <!--</div>-->
   </div>
 </template>
 
 <script>
 import SimpleBlock from '@/components/BigData/Block/simpleBlock'
+import { getAttendancePercent } from '@/api/sanitation/statistics'
+import { getSingleCount } from '@/api/sanitation/statistics'
+import { getToday } from '@/utils/dateutils'
+
 export default {
   name: 'StaffStatistic',
   components: { SimpleBlock },
@@ -39,17 +43,17 @@
       color: '',
       staffCount: {
         name: '人员总数', // 标题
-        value: '341', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendanceCount: {
         name: '出勤总人数', // 标题
-        value: '284', // 数值
+        value: '--', // 数值
         unit: ''
       },
       attendancePercent: {
         name: '出勤率', // 标题
-        value: '85%', // 数值
+        value: '--', // 数值
         unit: ''
       },
       chartData: {
@@ -79,6 +83,35 @@
         }
       }
     }
+  },
+  created() {
+    this.getStaffCount()
+    this.fetchAttendance()
+  },
+  methods: {
+    getStaffCount() {
+      getSingleCount('staff').then(response => {
+        if (response.code === 200) {
+          this.staffCount.value = response.data
+        }
+      })
+    },
+    fetchAttendance() {
+      const params = {
+        type: 'day',
+        staffType: '',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      }
+      getAttendancePercent(params).then(response => {
+        if (response.code === 200) {
+          // this.staffCount.value = response.data.total
+          this.attendanceCount.value = response.data[0].count
+          // this.attendanceCount.attendancePercent = response.data.percent
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -95,8 +128,9 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .block-div{
-      flex:1;
+      min-height: 27%;
       padding:3px;
     }
   }
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index 70e4634..8f93514 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -29,8 +29,14 @@
         bottom: 0,
         top: 20
       },
+      itemStyle:{
+        borderRadius: [5, 5, 0, 0]
+      },
       extend: {
-        'xAxis.0.axisLabel.rotate': 45
+        'xAxis.0.axisLabel.rotate': 45,
+        'xAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.0.axisLabel.color': '#ffffff',
+        'yAxis.axisLine.lineStyle.color': '#3b51f0'
       },
       chartSettings: {
         labelMap: {
@@ -57,7 +63,7 @@
       }
     }
   },
-  created(){
+  created() {
     this.fetchData()
   },
   methods: {
@@ -79,6 +85,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchWasteData() {
@@ -90,6 +97,7 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
     },
     fetchToiletData() {
@@ -101,7 +109,17 @@
             value: item.count
           }
         })
+        this.resetChart(data)
       })
+    },
+    // 格式化轴最大值
+    resetChart(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return parseInt(item.count) }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = {}
+      }
     }
   }
 }
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 53262d2..a473a88 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -96,19 +96,21 @@
     /*background: url("../../assets/overview/background2.jpg") no-repeat;*/
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
-    background-color: #faf7ee;
+    background-color: #66b2ff;
     display: flex;
     justify-content: space-between;
     flex-direction: column;
   }
   .body{
     position:relative;
+    margin-top:3rem;
     flex:1;
     width:100%;
     display: flex;
     justify-content: space-between;
   }
   .body-left, .body-right{
+    width:280px;
     height:95%;
     flex:1;
     display:flex;
@@ -120,11 +122,11 @@
     }
   }
   .map-body{
-    width: 60%;
+    /*width: 70%;*/
     height:95%;
     display: flex;
     justify-content: center;
-    top: 0;
+    flex:3;
     .middle{
       width:100%;
       height:100%;
diff --git a/src/views/routeManage/detailRoute.vue b/src/views/routeManage/detailRoute.vue
index a47b772..ba9ce76 100644
--- a/src/views/routeManage/detailRoute.vue
+++ b/src/views/routeManage/detailRoute.vue
@@ -72,7 +72,7 @@
         <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">
+        <div v-else class="infinite-list-wrapper" style="overflow:auto;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>
@@ -237,4 +237,23 @@
   #detailroute .el-form-item {
     margin-bottom: 10px;
   }
+  .el-input.is-disabled .el-input__inner {
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-textarea.is-disabled .el-textarea__inner{
+    background-color: #f8fafd;
+    border-color: #E4E7ED;
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled + span.el-checkbox__label{
+    color: #696b6f;
+    cursor: default;
+  }
+  .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+    border-color: #696b6f;
+  }
 </style>
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 03d30cb..e3f8c53 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -20,7 +20,7 @@
     </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 v-if="hasPerm('/sanitation/staff/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/staff/attendance/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <!--<template slot="columns">-->
       <!--<el-table-column label="操作" align="center" width="60">-->
@@ -37,8 +37,8 @@
 
 <script>
 import EditStaff from './editStaff'
-import { getAttendanceList, batchExportStaff } from '@/api/sanitation/staff'
-
+import { getAttendanceList, exportAttendanceList } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'AttendanceList',
   components: { EditStaff },
@@ -129,12 +129,6 @@
       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 => {
         if (response.code === 200) {
           this.list = response.data.rows
@@ -157,19 +151,14 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportStaff(this.listQuery).then(res => {
+      exportAttendanceList(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `出勤记录.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
+        this.$message.error('导出发生错误')
       })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -186,16 +175,14 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 人员类型
-        post: '', // 岗位
-        hiredate: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        startTime: '', // 查询开始日期
+        endTime: '', // 查询截止日志
         offset: 1,
         limit: 20,
         sort: '',
         order: 'desc'
       }
+      this.timeRange = []
     }
   }
 }
diff --git a/src/views/staffManage/staffList.vue b/src/views/staffManage/staffList.vue
index e06dc18..bf42e07 100644
--- a/src/views/staffManage/staffList.vue
+++ b/src/views/staffManage/staffList.vue
@@ -85,6 +85,7 @@
 import EditStaff from './editStaff'
 import { getDictByType } from '@/api/common'
 import { getStaffListPage, delStaff, batchImportStaff, batchExportStaff } from '@/api/sanitation/staff'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'StaffList',
@@ -301,14 +302,8 @@
       batchExportStaff(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `人员列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `人员列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index acfcc9b..5540486 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -175,12 +175,11 @@
     // 重置后的操作， 若不需要显示重置按钮则不需要写
     clearInput() {
       this.listQuery = {
-        name: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 329168b..cfa3469 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -46,6 +46,7 @@
 <script>
 import { getToiletListPage, delToilet, batchImportToilet, batchExportToilet } from '@/api/sanitation/toilet'
 import EditToilet from './editToilet'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'ToiletList',
   components: { EditToilet },
@@ -242,14 +243,8 @@
       batchExportToilet(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `公厕列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `公厕列表.xlsx`
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -268,11 +263,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 公厕类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/transferstationManage/transferstationList.vue b/src/views/transferstationManage/transferstationList.vue
index 56bbe5c..232fd47 100644
--- a/src/views/transferstationManage/transferstationList.vue
+++ b/src/views/transferstationManage/transferstationList.vue
@@ -274,11 +274,8 @@
     clearInput() {
       this.listQuery = {
         keywords: '', // 关键字
-        type: '', // 垃圾中转站类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        owner: '', // 建设单位
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/wastebinManage/wastebinList.vue b/src/views/wastebinManage/wastebinList.vue
index 10fa86f..a2c05bf 100644
--- a/src/views/wastebinManage/wastebinList.vue
+++ b/src/views/wastebinManage/wastebinList.vue
@@ -16,7 +16,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="社区/道路" clearable/>
+        <el-input v-model.trim="listQuery.position" size="small" 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">
@@ -55,6 +55,7 @@
 import { getWastebinListPage, delWastebin, batchImportWastebin, batchExportWastebin } from '@/api/sanitation/wastebin'
 import EditWastebin from './editWastebin'
 import { getDictByType } from '@/api/common'
+import { exportFile } from '@/utils/exportutils'
 export default {
   name: 'WastebinList',
   components: { EditWastebin },
@@ -254,14 +255,8 @@
       batchExportWastebin(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `垃圾桶列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        const fileName = `垃圾桶列表.xlsx` // 下载后文件名
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -287,10 +282,7 @@
       this.listQuery = {
         keywords: '', // 关键字
         type: '', // 垃圾桶类型
-        post: '', // 岗位
-        ts: '', // 入职年月时间
-        jobCode: '', // 作业内容
-        responseArea: '', // 负责片区
+        position: '', // 位置
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/static/project.config.json b/static/project.config.json
index d578a84..2d3a87b 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -3,7 +3,7 @@
   "sameWindow": false,
   "baseUrl": "http://111.198.10.15:11409/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
-  "singleSys": true,
+  "singleSys": false,
   "city":"崇仁县",
   "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",
   "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",